Automatic date update in version.in

[thirdparty/binutils-gdb.git] / Makefile.in
diff --git a/Makefile.in b/Makefile.in

index 9536afffbca2fe92b3da5497720282af841677f6..3acb83b8def4f75b5c2fc2057d25b80dd96e1ebe 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,7 +3,8 @@
  #
  # Makefile for directory with subdirs to build.
  #   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-#   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+#   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012, 2013, 2014, 2015, 2016, 2017
  #   Free Software Foundation
  #
  # This file is free software; you can redistribute it and/or modify
@@ -153,7 +154,6 @@ BUILD_EXPORTS = \
         CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX_FOR_BUILD)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
-       GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \
         GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
         GOC="$(GOC_FOR_BUILD)"; export GOC; \
         GOCFLAGS="$(GOCFLAGS_FOR_BUILD)"; export GOCFLAGS; \
@@ -166,7 +166,7 @@ BUILD_EXPORTS = \
         WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC;
  
  # These variables must be set on the make command line for directories
-# built for the build system to override those in BASE_FLAGS_TO_PASSS.
+# built for the build system to override those in BASE_FLAGS_TO_PASS.
  EXTRA_BUILD_FLAGS = \
         CFLAGS="$(CFLAGS_FOR_BUILD)" \
         LDFLAGS="$(LDFLAGS_FOR_BUILD)"
@@ -191,7 +191,6 @@ HOST_EXPORTS = \
         CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       GCJ="$(GCJ)"; export GCJ; \
         GFORTRAN="$(GFORTRAN)"; export GFORTRAN; \
         GOC="$(GOC)"; export GOC; \
         AR="$(AR)"; export AR; \
@@ -213,17 +212,19 @@ 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; \
         HOST_LIBS="$(STAGE1_LIBS)"; export HOST_LIBS; \
         GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
         GMPINC="$(HOST_GMPINC)"; export GMPINC; \
+       ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \
         ISLINC="$(HOST_ISLINC)"; export ISLINC; \
-       CLOOGLIBS="$(HOST_CLOOGLIBS)"; export CLOOGLIBS; \
-       CLOOGINC="$(HOST_CLOOGINC)"; export CLOOGINC; \
-       LIBELFLIBS="$(HOST_LIBELFLIBS)" ; export LIBELFLIBS; \
-       LIBELFINC="$(HOST_LIBELFINC)" ; export LIBELFINC; \
+       ISLVER="$(HOST_ISLVER)"; export ISLVER; \
+       LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \
+       LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \
+       XGCC_FLAGS_FOR_TARGET="$(XGCC_FLAGS_FOR_TARGET)"; export XGCC_FLAGS_FOR_TARGET; \
  @if gcc-bootstrap
         $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
  @endif gcc-bootstrap
@@ -235,13 +236,13 @@ POSTSTAGE1_CXX_EXPORT = \
  @if target-libstdc++-v3-bootstrap
  # Override the above if we're bootstrapping C++.
  POSTSTAGE1_CXX_EXPORT = \
-       CXX="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/g++$(exeext) \
+       CXX="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xg++$(exeext) \
           -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ -nostdinc++ \
           -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
           -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
-         -I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include/$(TARGET_SUBDIR) \
-         -I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include \
-         -I$$s/libstdc++-v3/libsupc++ \
+         `if $(LEAN); then echo ' -isystem '; else echo ' -I'; fi`$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include/$(TARGET_SUBDIR) \
+         `if $(LEAN); then echo ' -isystem '; else echo ' -I'; fi`$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include \
+         `if $(LEAN); then echo ' -isystem '; else echo ' -I'; fi`$$s/libstdc++-v3/libsupc++ \
           -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
           -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs"; \
           export CXX; \
@@ -256,6 +257,7 @@ POSTSTAGE1_HOST_EXPORTS = \
           $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
         CC_FOR_BUILD="$$CC"; export CC_FOR_BUILD; \
         $(POSTSTAGE1_CXX_EXPORT) \
+       $(LTO_EXPORTS) \
         GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND; \
         LDFLAGS="$(POSTSTAGE1_LDFLAGS) $(BOOT_LDFLAGS)"; export LDFLAGS; \
         HOST_LIBS="$(POSTSTAGE1_LIBS)"; export HOST_LIBS;
@@ -276,7 +278,6 @@ BASE_TARGET_EXPORTS = \
         CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
         CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       GCJ="$(GCJ_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GCJ; \
         GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \
         GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \
         DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
@@ -285,6 +286,7 @@ BASE_TARGET_EXPORTS = \
         LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \
         NM="$(COMPILER_NM_FOR_TARGET)"; export NM; \
         OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \
+       OBJCOPY="$(OBJCOPY_FOR_TARGET)"; export OBJCOPY; \
         RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
         READELF="$(READELF_FOR_TARGET)"; export READELF; \
         STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
@@ -309,19 +311,15 @@ NORMAL_TARGET_EXPORTS = \
  HOST_GMPLIBS = @gmplibs@
  HOST_GMPINC = @gmpinc@
  
-# Where to find ISL
+# Where to find isl
+HOST_ISLLIBS = @isllibs@
  HOST_ISLINC = @islinc@
-
-# Where to find CLOOG
-HOST_CLOOGLIBS = @clooglibs@
-HOST_CLOOGINC = @clooginc@
+HOST_ISLVER = @islver@
  
  # Where to find libelf
  HOST_LIBELFLIBS = @libelflibs@
  HOST_LIBELFINC = @libelfinc@
  
-EXTRA_CONFIGARGS_LIBJAVA = @EXTRA_CONFIGARGS_LIBJAVA@
-
  # ----------------------------------------------
  # Programs producing files for the BUILD machine
  # ----------------------------------------------
@@ -345,7 +343,6 @@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
  CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
  CXX_FOR_BUILD = @CXX_FOR_BUILD@
  DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
-GCJ_FOR_BUILD = @GCJ_FOR_BUILD@
  GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@
  GOC_FOR_BUILD = @GOC_FOR_BUILD@
  LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
@@ -364,7 +361,7 @@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@
  # here so that they can be overridden by Makefile fragments.
  BOOT_CFLAGS= -g -O2
  BOOT_LDFLAGS=
-BOOT_ADAFLAGS=-gnatpg -gnata
+BOOT_ADAFLAGS= -gnatpg
  
  AWK = @AWK@
  SED = @SED@
@@ -377,6 +374,8 @@ MAKEINFO = @MAKEINFO@
  EXPECT = @EXPECT@
  RUNTEST = @RUNTEST@
  
+AUTO_PROFILE = gcc-auto-profile -c 1000000
+
  # This just becomes part of the MAKEINFO definition passed down to
  # sub-makes.  It lets flags be given on the command line while still
  # using the makeinfo from the object tree.
@@ -413,6 +412,8 @@ CXXFLAGS = @CXXFLAGS@
  LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
  GOCFLAGS = $(CFLAGS)
  
+CREATE_GCOV = create_gcov
+
  TFLAGS =
  
  # Defaults for all stages; some are overridden below.
@@ -483,11 +484,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@
@@ -498,8 +497,10 @@ STAGE1_LANGUAGES = @stage1_languages@
  #   the last argument when conflicting --enable arguments are passed.
  # * Likewise, we force-disable coverage flags, since the installed
  #   compiler probably has never heard of them.
+# * We also disable -Wformat, since older GCCs don't understand newer %s.
  STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \
-         --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"
+         --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" \
+         --disable-build-format-warnings
  
  STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate
  STAGEprofile_TFLAGS = $(STAGE2_TFLAGS)
@@ -507,6 +508,12 @@ STAGEprofile_TFLAGS = $(STAGE2_TFLAGS)
  STAGEfeedback_CFLAGS = $(STAGE3_CFLAGS) -fprofile-use
  STAGEfeedback_TFLAGS = $(STAGE3_TFLAGS)
  
+STAGEautoprofile_CFLAGS = $(STAGE2_CFLAGS) -g
+STAGEautoprofile_TFLAGS = $(STAGE2_TFLAGS)
+
+STAGEautofeedback_CFLAGS = $(STAGE3_CFLAGS)
+STAGEautofeedback_TFLAGS = $(STAGE3_TFLAGS)
+
  do-compare = @do_compare@
  do-compare3 = $(do-compare)
  
@@ -525,7 +532,6 @@ CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@
  GCC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCC_FOR_TARGET@
  CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@
  RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@
-GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@
  GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@
  GOC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GOC_FOR_TARGET@
  DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
@@ -534,6 +540,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@
@@ -575,15 +582,31 @@ all:
  
  # This is the list of directories that may be needed in RPATH_ENVVAR
  # so that programs built for the target machine work.
-TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libmudflap)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(TARGET_LIB_PATH_libitm)$(TARGET_LIB_PATH_libatomic)$(HOST_LIB_PATH_gcc)
+TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libsanitizer)$(TARGET_LIB_PATH_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:
  @endif target-libstdc++-v3
  
-@if target-libmudflap
-TARGET_LIB_PATH_libmudflap = $$r/$(TARGET_SUBDIR)/libmudflap/.libs:
-@endif target-libmudflap
+@if target-libsanitizer
+TARGET_LIB_PATH_libsanitizer = $$r/$(TARGET_SUBDIR)/libsanitizer/.libs:
+@endif target-libsanitizer
+
+@if target-libmpx
+TARGET_LIB_PATH_libmpx = $$r/$(TARGET_SUBDIR)/libmpx/.libs:
+@endif target-libmpx
+
+@if target-libvtv
+TARGET_LIB_PATH_libvtv = $$r/$(TARGET_SUBDIR)/libvtv/.libs:
+@endif target-libvtv
+
+@if target-libcilkrts
+TARGET_LIB_PATH_libcilkrts = $$r/$(TARGET_SUBDIR)/libcilkrts/.libs:
+@endif target-libcilkrts
+
+@if target-liboffloadmic
+TARGET_LIB_PATH_liboffloadmic = $$r/$(TARGET_SUBDIR)/liboffloadmic/.libs:
+@endif target-liboffloadmic
  
  @if target-libssp
  TARGET_LIB_PATH_libssp = $$r/$(TARGET_SUBDIR)/libssp/.libs:
@@ -605,7 +628,7 @@ TARGET_LIB_PATH_libatomic = $$r/$(TARGET_SUBDIR)/libatomic/.libs:
  
  # This is the list of directories that may be needed in RPATH_ENVVAR
  # so that programs built for the host machine work.
-HOST_LIB_PATH = $(HOST_LIB_PATH_gmp)$(HOST_LIB_PATH_mpfr)$(HOST_LIB_PATH_mpc)$(HOST_LIB_PATH_isl)$(HOST_LIB_PATH_cloog)$(HOST_LIB_PATH_libelf)
+HOST_LIB_PATH = $(HOST_LIB_PATH_gmp)$(HOST_LIB_PATH_mpfr)$(HOST_LIB_PATH_mpc)$(HOST_LIB_PATH_isl)$(HOST_LIB_PATH_libelf)
  
  # Define HOST_LIB_PATH_gcc here, for the sake of TARGET_LIB_PATH, ouch
  @if gcc
@@ -620,12 +643,12 @@ HOST_LIB_PATH_gmp = \
  
  @if mpfr
  HOST_LIB_PATH_mpfr = \
-  $$r/$(HOST_SUBDIR)/mpfr/.libs:$$r/$(HOST_SUBDIR)/prev-mpfr/.libs:
+  $$r/$(HOST_SUBDIR)/mpfr/src/.libs:$$r/$(HOST_SUBDIR)/prev-mpfr/src/.libs:
  @endif mpfr
  
  @if mpc
  HOST_LIB_PATH_mpc = \
-  $$r/$(HOST_SUBDIR)/mpc/.libs:$$r/$(HOST_SUBDIR)/prev-mpc/.libs:
+  $$r/$(HOST_SUBDIR)/mpc/src/.libs:$$r/$(HOST_SUBDIR)/prev-mpc/src/.libs:
  @endif mpc
  
  @if isl
@@ -633,11 +656,6 @@ HOST_LIB_PATH_isl = \
    $$r/$(HOST_SUBDIR)/isl/.libs:$$r/$(HOST_SUBDIR)/prev-isl/.libs:
  @endif isl
  
-@if cloog
-HOST_LIB_PATH_cloog = \
-  $$r/$(HOST_SUBDIR)/cloog/.libs:$$r/$(HOST_SUBDIR)/prev-cloog/.libs:
-@endif cloog
-
  @if libelf
  HOST_LIB_PATH_libelf = \
    $$r/$(HOST_SUBDIR)/libelf/.libs:$$r/$(HOST_SUBDIR)/prev-libelf/.libs:
@@ -664,7 +682,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)" \
@@ -734,7 +754,6 @@ BASE_FLAGS_TO_PASS = \
         "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
         "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
         "FLAGS_FOR_TARGET=$(FLAGS_FOR_TARGET)" \
-       "GCJ_FOR_TARGET=$(GCJ_FOR_TARGET)" \
         "GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \
         "GOC_FOR_TARGET=$(GOC_FOR_TARGET)" \
         "GOCFLAGS_FOR_TARGET=$(GOCFLAGS_FOR_TARGET)" \
@@ -745,6 +764,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)" \
@@ -774,7 +794,8 @@ BASE_FLAGS_TO_PASS = \
         $(CXX_FOR_TARGET_FLAG_TO_PASS) \
         "TFLAGS=$(TFLAGS)" \
         "CONFIG_SHELL=$(SHELL)" \
-       "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 
+       "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
+       $(if $(LSAN_OPTIONS),"LSAN_OPTIONS=$(LSAN_OPTIONS)")
  
  # We leave this in just in case, but it is not needed anymore.
  RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS)
@@ -787,7 +808,6 @@ EXTRA_HOST_FLAGS = \
         'CC=$(CC)' \
         'CXX=$(CXX)' \
         'DLLTOOL=$(DLLTOOL)' \
-       'GCJ=$(GCJ)' \
         'GFORTRAN=$(GFORTRAN)' \
         'GOC=$(GOC)' \
         'LD=$(LD)' \
@@ -798,10 +818,17 @@ EXTRA_HOST_FLAGS = \
         'READELF=$(READELF)' \
         'STRIP=$(STRIP)' \
         'WINDRES=$(WINDRES)' \
-       'WINDMC=$(WINDMC)'
+       'WINDMC=$(WINDMC)' \
+       'CREATE_GCOV=$(CREATE_GCOV)'
  
  FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
  
+# Flags to pass to stage1 or when not bootstrapping.
+
+STAGE1_FLAGS_TO_PASS = \
+       LDFLAGS="$${LDFLAGS}" \
+       HOST_LIBS="$${HOST_LIBS}"
+
  # Flags to pass to stage2 and later makes.
  
  POSTSTAGE1_FLAGS_TO_PASS = \
@@ -810,8 +837,17 @@ POSTSTAGE1_FLAGS_TO_PASS = \
         GNATBIND="$${GNATBIND}" \
         LDFLAGS="$${LDFLAGS}" \
         HOST_LIBS="$${HOST_LIBS}" \
+       $(LTO_FLAGS_TO_PASS) \
         "`echo 'ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
  
+@if gcc-bootstrap
+EXTRA_HOST_EXPORTS = if [ $(current_stage) != stage1 ]; then \
+                      $(POSTSTAGE1_HOST_EXPORTS) \
+                    fi;
+
+EXTRA_BOOTSTRAP_FLAGS = CC="$$CC" CXX="$$CXX" LDFLAGS="$$LDFLAGS"
+@endif gcc-bootstrap
+
  # Flags to pass down to makes which are built with the target environment.
  # The double $ decreases the length of the command line; those variables
  # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.  The
@@ -822,10 +858,11 @@ 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)' \
         'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
         'GOC=$$(GOC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
         'GOCFLAGS=$$(GOCFLAGS_FOR_TARGET)' \
@@ -835,11 +872,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)
@@ -882,7 +922,6 @@ configure-host:  \
      maybe-configure-mpfr \
      maybe-configure-mpc \
      maybe-configure-isl \
-    maybe-configure-cloog \
      maybe-configure-libelf \
      maybe-configure-gold \
      maybe-configure-gprof \
@@ -895,6 +934,7 @@ configure-host:  \
      maybe-configure-libdecnumber \
      maybe-configure-libgui \
      maybe-configure-libiberty \
+    maybe-configure-libiberty-linker-plugin \
      maybe-configure-libiconv \
      maybe-configure-m4 \
      maybe-configure-readline \
@@ -909,11 +949,17 @@ configure-host:  \
      maybe-configure-libtermcap \
      maybe-configure-utils \
      maybe-configure-gnattools \
-    maybe-configure-lto-plugin
+    maybe-configure-lto-plugin \
+    maybe-configure-libcc1 \
+    maybe-configure-gotools
  .PHONY: configure-target
  configure-target:  \
      maybe-configure-target-libstdc++-v3 \
-    maybe-configure-target-libmudflap \
+    maybe-configure-target-libsanitizer \
+    maybe-configure-target-libmpx \
+    maybe-configure-target-libvtv \
+    maybe-configure-target-libcilkrts \
+    maybe-configure-target-liboffloadmic \
      maybe-configure-target-libssp \
      maybe-configure-target-newlib \
      maybe-configure-target-libgcc \
@@ -926,9 +972,7 @@ configure-target:  \
      maybe-configure-target-winsup \
      maybe-configure-target-libgloss \
      maybe-configure-target-libffi \
-    maybe-configure-target-libjava \
      maybe-configure-target-zlib \
-    maybe-configure-target-boehm-gc \
      maybe-configure-target-rda \
      maybe-configure-target-libada \
      maybe-configure-target-libgomp \
@@ -968,6 +1012,7 @@ all-build: maybe-all-build-flex
  all-build: maybe-all-build-m4
  all-build: maybe-all-build-texinfo
  all-build: maybe-all-build-fixincludes
+all-build: maybe-all-build-libcpp
  
  .PHONY: all-host
  
@@ -985,7 +1030,9 @@ all-host: maybe-all-cgen
  all-host: maybe-all-dejagnu
  all-host: maybe-all-etc
  all-host: maybe-all-fastjar
+@if fixincludes-no-bootstrap
  all-host: maybe-all-fixincludes
+@endif fixincludes-no-bootstrap
  all-host: maybe-all-flex
  @if gas-no-bootstrap
  all-host: maybe-all-gas
@@ -1005,9 +1052,6 @@ all-host: maybe-all-mpc
  @if isl-no-bootstrap
  all-host: maybe-all-isl
  @endif isl-no-bootstrap
-@if cloog-no-bootstrap
-all-host: maybe-all-cloog
-@endif cloog-no-bootstrap
  @if libelf-no-bootstrap
  all-host: maybe-all-libelf
  @endif libelf-no-bootstrap
@@ -1036,7 +1080,12 @@ all-host: maybe-all-libgui
  @if libiberty-no-bootstrap
  all-host: maybe-all-libiberty
  @endif libiberty-no-bootstrap
+@if libiberty-linker-plugin-no-bootstrap
+all-host: maybe-all-libiberty-linker-plugin
+@endif libiberty-linker-plugin-no-bootstrap
+@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
@@ -1055,13 +1104,25 @@ all-host: maybe-all-gnattools
  @if lto-plugin-no-bootstrap
  all-host: maybe-all-lto-plugin
  @endif lto-plugin-no-bootstrap
+all-host: maybe-all-libcc1
+all-host: maybe-all-gotools
  
  .PHONY: all-target
  
  @if target-libstdc++-v3-no-bootstrap
  all-target: maybe-all-target-libstdc++-v3
  @endif target-libstdc++-v3-no-bootstrap
-all-target: maybe-all-target-libmudflap
+@if target-libsanitizer-no-bootstrap
+all-target: maybe-all-target-libsanitizer
+@endif target-libsanitizer-no-bootstrap
+@if target-libmpx-no-bootstrap
+all-target: maybe-all-target-libmpx
+@endif target-libmpx-no-bootstrap
+@if target-libvtv-no-bootstrap
+all-target: maybe-all-target-libvtv
+@endif target-libvtv-no-bootstrap
+all-target: maybe-all-target-libcilkrts
+all-target: maybe-all-target-liboffloadmic
  all-target: maybe-all-target-libssp
  all-target: maybe-all-target-newlib
  @if target-libgcc-no-bootstrap
@@ -1076,9 +1137,7 @@ all-target: maybe-all-target-libtermcap
  all-target: maybe-all-target-winsup
  all-target: maybe-all-target-libgloss
  all-target: maybe-all-target-libffi
-all-target: maybe-all-target-libjava
  all-target: maybe-all-target-zlib
-all-target: maybe-all-target-boehm-gc
  all-target: maybe-all-target-rda
  all-target: maybe-all-target-libada
  @if target-libgomp-no-bootstrap
@@ -1119,7 +1178,6 @@ info-host: maybe-info-gmp
  info-host: maybe-info-mpfr
  info-host: maybe-info-mpc
  info-host: maybe-info-isl
-info-host: maybe-info-cloog
  info-host: maybe-info-libelf
  info-host: maybe-info-gold
  info-host: maybe-info-gprof
@@ -1132,6 +1190,7 @@ info-host: maybe-info-libcpp
  info-host: maybe-info-libdecnumber
  info-host: maybe-info-libgui
  info-host: maybe-info-libiberty
+info-host: maybe-info-libiberty-linker-plugin
  info-host: maybe-info-libiconv
  info-host: maybe-info-m4
  info-host: maybe-info-readline
@@ -1147,11 +1206,17 @@ info-host: maybe-info-libtermcap
  info-host: maybe-info-utils
  info-host: maybe-info-gnattools
  info-host: maybe-info-lto-plugin
+info-host: maybe-info-libcc1
+info-host: maybe-info-gotools
  
  .PHONY: info-target
  
  info-target: maybe-info-target-libstdc++-v3
-info-target: maybe-info-target-libmudflap
+info-target: maybe-info-target-libsanitizer
+info-target: maybe-info-target-libmpx
+info-target: maybe-info-target-libvtv
+info-target: maybe-info-target-libcilkrts
+info-target: maybe-info-target-liboffloadmic
  info-target: maybe-info-target-libssp
  info-target: maybe-info-target-newlib
  info-target: maybe-info-target-libgcc
@@ -1164,9 +1229,7 @@ info-target: maybe-info-target-libtermcap
  info-target: maybe-info-target-winsup
  info-target: maybe-info-target-libgloss
  info-target: maybe-info-target-libffi
-info-target: maybe-info-target-libjava
  info-target: maybe-info-target-zlib
-info-target: maybe-info-target-boehm-gc
  info-target: maybe-info-target-rda
  info-target: maybe-info-target-libada
  info-target: maybe-info-target-libgomp
@@ -1200,7 +1263,6 @@ dvi-host: maybe-dvi-gmp
  dvi-host: maybe-dvi-mpfr
  dvi-host: maybe-dvi-mpc
  dvi-host: maybe-dvi-isl
-dvi-host: maybe-dvi-cloog
  dvi-host: maybe-dvi-libelf
  dvi-host: maybe-dvi-gold
  dvi-host: maybe-dvi-gprof
@@ -1213,6 +1275,7 @@ dvi-host: maybe-dvi-libcpp
  dvi-host: maybe-dvi-libdecnumber
  dvi-host: maybe-dvi-libgui
  dvi-host: maybe-dvi-libiberty
+dvi-host: maybe-dvi-libiberty-linker-plugin
  dvi-host: maybe-dvi-libiconv
  dvi-host: maybe-dvi-m4
  dvi-host: maybe-dvi-readline
@@ -1228,11 +1291,17 @@ dvi-host: maybe-dvi-libtermcap
  dvi-host: maybe-dvi-utils
  dvi-host: maybe-dvi-gnattools
  dvi-host: maybe-dvi-lto-plugin
+dvi-host: maybe-dvi-libcc1
+dvi-host: maybe-dvi-gotools
  
  .PHONY: dvi-target
  
  dvi-target: maybe-dvi-target-libstdc++-v3
-dvi-target: maybe-dvi-target-libmudflap
+dvi-target: maybe-dvi-target-libsanitizer
+dvi-target: maybe-dvi-target-libmpx
+dvi-target: maybe-dvi-target-libvtv
+dvi-target: maybe-dvi-target-libcilkrts
+dvi-target: maybe-dvi-target-liboffloadmic
  dvi-target: maybe-dvi-target-libssp
  dvi-target: maybe-dvi-target-newlib
  dvi-target: maybe-dvi-target-libgcc
@@ -1245,9 +1314,7 @@ dvi-target: maybe-dvi-target-libtermcap
  dvi-target: maybe-dvi-target-winsup
  dvi-target: maybe-dvi-target-libgloss
  dvi-target: maybe-dvi-target-libffi
-dvi-target: maybe-dvi-target-libjava
  dvi-target: maybe-dvi-target-zlib
-dvi-target: maybe-dvi-target-boehm-gc
  dvi-target: maybe-dvi-target-rda
  dvi-target: maybe-dvi-target-libada
  dvi-target: maybe-dvi-target-libgomp
@@ -1281,7 +1348,6 @@ pdf-host: maybe-pdf-gmp
  pdf-host: maybe-pdf-mpfr
  pdf-host: maybe-pdf-mpc
  pdf-host: maybe-pdf-isl
-pdf-host: maybe-pdf-cloog
  pdf-host: maybe-pdf-libelf
  pdf-host: maybe-pdf-gold
  pdf-host: maybe-pdf-gprof
@@ -1294,6 +1360,7 @@ pdf-host: maybe-pdf-libcpp
  pdf-host: maybe-pdf-libdecnumber
  pdf-host: maybe-pdf-libgui
  pdf-host: maybe-pdf-libiberty
+pdf-host: maybe-pdf-libiberty-linker-plugin
  pdf-host: maybe-pdf-libiconv
  pdf-host: maybe-pdf-m4
  pdf-host: maybe-pdf-readline
@@ -1309,11 +1376,17 @@ pdf-host: maybe-pdf-libtermcap
  pdf-host: maybe-pdf-utils
  pdf-host: maybe-pdf-gnattools
  pdf-host: maybe-pdf-lto-plugin
+pdf-host: maybe-pdf-libcc1
+pdf-host: maybe-pdf-gotools
  
  .PHONY: pdf-target
  
  pdf-target: maybe-pdf-target-libstdc++-v3
-pdf-target: maybe-pdf-target-libmudflap
+pdf-target: maybe-pdf-target-libsanitizer
+pdf-target: maybe-pdf-target-libmpx
+pdf-target: maybe-pdf-target-libvtv
+pdf-target: maybe-pdf-target-libcilkrts
+pdf-target: maybe-pdf-target-liboffloadmic
  pdf-target: maybe-pdf-target-libssp
  pdf-target: maybe-pdf-target-newlib
  pdf-target: maybe-pdf-target-libgcc
@@ -1326,9 +1399,7 @@ pdf-target: maybe-pdf-target-libtermcap
  pdf-target: maybe-pdf-target-winsup
  pdf-target: maybe-pdf-target-libgloss
  pdf-target: maybe-pdf-target-libffi
-pdf-target: maybe-pdf-target-libjava
  pdf-target: maybe-pdf-target-zlib
-pdf-target: maybe-pdf-target-boehm-gc
  pdf-target: maybe-pdf-target-rda
  pdf-target: maybe-pdf-target-libada
  pdf-target: maybe-pdf-target-libgomp
@@ -1362,7 +1433,6 @@ html-host: maybe-html-gmp
  html-host: maybe-html-mpfr
  html-host: maybe-html-mpc
  html-host: maybe-html-isl
-html-host: maybe-html-cloog
  html-host: maybe-html-libelf
  html-host: maybe-html-gold
  html-host: maybe-html-gprof
@@ -1375,6 +1445,7 @@ html-host: maybe-html-libcpp
  html-host: maybe-html-libdecnumber
  html-host: maybe-html-libgui
  html-host: maybe-html-libiberty
+html-host: maybe-html-libiberty-linker-plugin
  html-host: maybe-html-libiconv
  html-host: maybe-html-m4
  html-host: maybe-html-readline
@@ -1390,11 +1461,17 @@ html-host: maybe-html-libtermcap
  html-host: maybe-html-utils
  html-host: maybe-html-gnattools
  html-host: maybe-html-lto-plugin
+html-host: maybe-html-libcc1
+html-host: maybe-html-gotools
  
  .PHONY: html-target
  
  html-target: maybe-html-target-libstdc++-v3
-html-target: maybe-html-target-libmudflap
+html-target: maybe-html-target-libsanitizer
+html-target: maybe-html-target-libmpx
+html-target: maybe-html-target-libvtv
+html-target: maybe-html-target-libcilkrts
+html-target: maybe-html-target-liboffloadmic
  html-target: maybe-html-target-libssp
  html-target: maybe-html-target-newlib
  html-target: maybe-html-target-libgcc
@@ -1407,9 +1484,7 @@ html-target: maybe-html-target-libtermcap
  html-target: maybe-html-target-winsup
  html-target: maybe-html-target-libgloss
  html-target: maybe-html-target-libffi
-html-target: maybe-html-target-libjava
  html-target: maybe-html-target-zlib
-html-target: maybe-html-target-boehm-gc
  html-target: maybe-html-target-rda
  html-target: maybe-html-target-libada
  html-target: maybe-html-target-libgomp
@@ -1443,7 +1518,6 @@ TAGS-host: maybe-TAGS-gmp
  TAGS-host: maybe-TAGS-mpfr
  TAGS-host: maybe-TAGS-mpc
  TAGS-host: maybe-TAGS-isl
-TAGS-host: maybe-TAGS-cloog
  TAGS-host: maybe-TAGS-libelf
  TAGS-host: maybe-TAGS-gold
  TAGS-host: maybe-TAGS-gprof
@@ -1456,6 +1530,7 @@ TAGS-host: maybe-TAGS-libcpp
  TAGS-host: maybe-TAGS-libdecnumber
  TAGS-host: maybe-TAGS-libgui
  TAGS-host: maybe-TAGS-libiberty
+TAGS-host: maybe-TAGS-libiberty-linker-plugin
  TAGS-host: maybe-TAGS-libiconv
  TAGS-host: maybe-TAGS-m4
  TAGS-host: maybe-TAGS-readline
@@ -1471,11 +1546,17 @@ TAGS-host: maybe-TAGS-libtermcap
  TAGS-host: maybe-TAGS-utils
  TAGS-host: maybe-TAGS-gnattools
  TAGS-host: maybe-TAGS-lto-plugin
+TAGS-host: maybe-TAGS-libcc1
+TAGS-host: maybe-TAGS-gotools
  
  .PHONY: TAGS-target
  
  TAGS-target: maybe-TAGS-target-libstdc++-v3
-TAGS-target: maybe-TAGS-target-libmudflap
+TAGS-target: maybe-TAGS-target-libsanitizer
+TAGS-target: maybe-TAGS-target-libmpx
+TAGS-target: maybe-TAGS-target-libvtv
+TAGS-target: maybe-TAGS-target-libcilkrts
+TAGS-target: maybe-TAGS-target-liboffloadmic
  TAGS-target: maybe-TAGS-target-libssp
  TAGS-target: maybe-TAGS-target-newlib
  TAGS-target: maybe-TAGS-target-libgcc
@@ -1488,9 +1569,7 @@ TAGS-target: maybe-TAGS-target-libtermcap
  TAGS-target: maybe-TAGS-target-winsup
  TAGS-target: maybe-TAGS-target-libgloss
  TAGS-target: maybe-TAGS-target-libffi
-TAGS-target: maybe-TAGS-target-libjava
  TAGS-target: maybe-TAGS-target-zlib
-TAGS-target: maybe-TAGS-target-boehm-gc
  TAGS-target: maybe-TAGS-target-rda
  TAGS-target: maybe-TAGS-target-libada
  TAGS-target: maybe-TAGS-target-libgomp
@@ -1524,7 +1603,6 @@ install-info-host: maybe-install-info-gmp
  install-info-host: maybe-install-info-mpfr
  install-info-host: maybe-install-info-mpc
  install-info-host: maybe-install-info-isl
-install-info-host: maybe-install-info-cloog
  install-info-host: maybe-install-info-libelf
  install-info-host: maybe-install-info-gold
  install-info-host: maybe-install-info-gprof
@@ -1537,6 +1615,7 @@ install-info-host: maybe-install-info-libcpp
  install-info-host: maybe-install-info-libdecnumber
  install-info-host: maybe-install-info-libgui
  install-info-host: maybe-install-info-libiberty
+install-info-host: maybe-install-info-libiberty-linker-plugin
  install-info-host: maybe-install-info-libiconv
  install-info-host: maybe-install-info-m4
  install-info-host: maybe-install-info-readline
@@ -1552,11 +1631,17 @@ install-info-host: maybe-install-info-libtermcap
  install-info-host: maybe-install-info-utils
  install-info-host: maybe-install-info-gnattools
  install-info-host: maybe-install-info-lto-plugin
+install-info-host: maybe-install-info-libcc1
+install-info-host: maybe-install-info-gotools
  
  .PHONY: install-info-target
  
  install-info-target: maybe-install-info-target-libstdc++-v3
-install-info-target: maybe-install-info-target-libmudflap
+install-info-target: maybe-install-info-target-libsanitizer
+install-info-target: maybe-install-info-target-libmpx
+install-info-target: maybe-install-info-target-libvtv
+install-info-target: maybe-install-info-target-libcilkrts
+install-info-target: maybe-install-info-target-liboffloadmic
  install-info-target: maybe-install-info-target-libssp
  install-info-target: maybe-install-info-target-newlib
  install-info-target: maybe-install-info-target-libgcc
@@ -1569,9 +1654,7 @@ install-info-target: maybe-install-info-target-libtermcap
  install-info-target: maybe-install-info-target-winsup
  install-info-target: maybe-install-info-target-libgloss
  install-info-target: maybe-install-info-target-libffi
-install-info-target: maybe-install-info-target-libjava
  install-info-target: maybe-install-info-target-zlib
-install-info-target: maybe-install-info-target-boehm-gc
  install-info-target: maybe-install-info-target-rda
  install-info-target: maybe-install-info-target-libada
  install-info-target: maybe-install-info-target-libgomp
@@ -1605,7 +1688,6 @@ install-pdf-host: maybe-install-pdf-gmp
  install-pdf-host: maybe-install-pdf-mpfr
  install-pdf-host: maybe-install-pdf-mpc
  install-pdf-host: maybe-install-pdf-isl
-install-pdf-host: maybe-install-pdf-cloog
  install-pdf-host: maybe-install-pdf-libelf
  install-pdf-host: maybe-install-pdf-gold
  install-pdf-host: maybe-install-pdf-gprof
@@ -1618,6 +1700,7 @@ install-pdf-host: maybe-install-pdf-libcpp
  install-pdf-host: maybe-install-pdf-libdecnumber
  install-pdf-host: maybe-install-pdf-libgui
  install-pdf-host: maybe-install-pdf-libiberty
+install-pdf-host: maybe-install-pdf-libiberty-linker-plugin
  install-pdf-host: maybe-install-pdf-libiconv
  install-pdf-host: maybe-install-pdf-m4
  install-pdf-host: maybe-install-pdf-readline
@@ -1633,11 +1716,17 @@ install-pdf-host: maybe-install-pdf-libtermcap
  install-pdf-host: maybe-install-pdf-utils
  install-pdf-host: maybe-install-pdf-gnattools
  install-pdf-host: maybe-install-pdf-lto-plugin
+install-pdf-host: maybe-install-pdf-libcc1
+install-pdf-host: maybe-install-pdf-gotools
  
  .PHONY: install-pdf-target
  
  install-pdf-target: maybe-install-pdf-target-libstdc++-v3
-install-pdf-target: maybe-install-pdf-target-libmudflap
+install-pdf-target: maybe-install-pdf-target-libsanitizer
+install-pdf-target: maybe-install-pdf-target-libmpx
+install-pdf-target: maybe-install-pdf-target-libvtv
+install-pdf-target: maybe-install-pdf-target-libcilkrts
+install-pdf-target: maybe-install-pdf-target-liboffloadmic
  install-pdf-target: maybe-install-pdf-target-libssp
  install-pdf-target: maybe-install-pdf-target-newlib
  install-pdf-target: maybe-install-pdf-target-libgcc
@@ -1650,9 +1739,7 @@ install-pdf-target: maybe-install-pdf-target-libtermcap
  install-pdf-target: maybe-install-pdf-target-winsup
  install-pdf-target: maybe-install-pdf-target-libgloss
  install-pdf-target: maybe-install-pdf-target-libffi
-install-pdf-target: maybe-install-pdf-target-libjava
  install-pdf-target: maybe-install-pdf-target-zlib
-install-pdf-target: maybe-install-pdf-target-boehm-gc
  install-pdf-target: maybe-install-pdf-target-rda
  install-pdf-target: maybe-install-pdf-target-libada
  install-pdf-target: maybe-install-pdf-target-libgomp
@@ -1686,7 +1773,6 @@ install-html-host: maybe-install-html-gmp
  install-html-host: maybe-install-html-mpfr
  install-html-host: maybe-install-html-mpc
  install-html-host: maybe-install-html-isl
-install-html-host: maybe-install-html-cloog
  install-html-host: maybe-install-html-libelf
  install-html-host: maybe-install-html-gold
  install-html-host: maybe-install-html-gprof
@@ -1699,6 +1785,7 @@ install-html-host: maybe-install-html-libcpp
  install-html-host: maybe-install-html-libdecnumber
  install-html-host: maybe-install-html-libgui
  install-html-host: maybe-install-html-libiberty
+install-html-host: maybe-install-html-libiberty-linker-plugin
  install-html-host: maybe-install-html-libiconv
  install-html-host: maybe-install-html-m4
  install-html-host: maybe-install-html-readline
@@ -1714,11 +1801,17 @@ install-html-host: maybe-install-html-libtermcap
  install-html-host: maybe-install-html-utils
  install-html-host: maybe-install-html-gnattools
  install-html-host: maybe-install-html-lto-plugin
+install-html-host: maybe-install-html-libcc1
+install-html-host: maybe-install-html-gotools
  
  .PHONY: install-html-target
  
  install-html-target: maybe-install-html-target-libstdc++-v3
-install-html-target: maybe-install-html-target-libmudflap
+install-html-target: maybe-install-html-target-libsanitizer
+install-html-target: maybe-install-html-target-libmpx
+install-html-target: maybe-install-html-target-libvtv
+install-html-target: maybe-install-html-target-libcilkrts
+install-html-target: maybe-install-html-target-liboffloadmic
  install-html-target: maybe-install-html-target-libssp
  install-html-target: maybe-install-html-target-newlib
  install-html-target: maybe-install-html-target-libgcc
@@ -1731,9 +1824,7 @@ install-html-target: maybe-install-html-target-libtermcap
  install-html-target: maybe-install-html-target-winsup
  install-html-target: maybe-install-html-target-libgloss
  install-html-target: maybe-install-html-target-libffi
-install-html-target: maybe-install-html-target-libjava
  install-html-target: maybe-install-html-target-zlib
-install-html-target: maybe-install-html-target-boehm-gc
  install-html-target: maybe-install-html-target-rda
  install-html-target: maybe-install-html-target-libada
  install-html-target: maybe-install-html-target-libgomp
@@ -1767,7 +1858,6 @@ installcheck-host: maybe-installcheck-gmp
  installcheck-host: maybe-installcheck-mpfr
  installcheck-host: maybe-installcheck-mpc
  installcheck-host: maybe-installcheck-isl
-installcheck-host: maybe-installcheck-cloog
  installcheck-host: maybe-installcheck-libelf
  installcheck-host: maybe-installcheck-gold
  installcheck-host: maybe-installcheck-gprof
@@ -1780,6 +1870,7 @@ installcheck-host: maybe-installcheck-libcpp
  installcheck-host: maybe-installcheck-libdecnumber
  installcheck-host: maybe-installcheck-libgui
  installcheck-host: maybe-installcheck-libiberty
+installcheck-host: maybe-installcheck-libiberty-linker-plugin
  installcheck-host: maybe-installcheck-libiconv
  installcheck-host: maybe-installcheck-m4
  installcheck-host: maybe-installcheck-readline
@@ -1795,11 +1886,17 @@ installcheck-host: maybe-installcheck-libtermcap
  installcheck-host: maybe-installcheck-utils
  installcheck-host: maybe-installcheck-gnattools
  installcheck-host: maybe-installcheck-lto-plugin
+installcheck-host: maybe-installcheck-libcc1
+installcheck-host: maybe-installcheck-gotools
  
  .PHONY: installcheck-target
  
  installcheck-target: maybe-installcheck-target-libstdc++-v3
-installcheck-target: maybe-installcheck-target-libmudflap
+installcheck-target: maybe-installcheck-target-libsanitizer
+installcheck-target: maybe-installcheck-target-libmpx
+installcheck-target: maybe-installcheck-target-libvtv
+installcheck-target: maybe-installcheck-target-libcilkrts
+installcheck-target: maybe-installcheck-target-liboffloadmic
  installcheck-target: maybe-installcheck-target-libssp
  installcheck-target: maybe-installcheck-target-newlib
  installcheck-target: maybe-installcheck-target-libgcc
@@ -1812,9 +1909,7 @@ installcheck-target: maybe-installcheck-target-libtermcap
  installcheck-target: maybe-installcheck-target-winsup
  installcheck-target: maybe-installcheck-target-libgloss
  installcheck-target: maybe-installcheck-target-libffi
-installcheck-target: maybe-installcheck-target-libjava
  installcheck-target: maybe-installcheck-target-zlib
-installcheck-target: maybe-installcheck-target-boehm-gc
  installcheck-target: maybe-installcheck-target-rda
  installcheck-target: maybe-installcheck-target-libada
  installcheck-target: maybe-installcheck-target-libgomp
@@ -1848,7 +1943,6 @@ mostlyclean-host: maybe-mostlyclean-gmp
  mostlyclean-host: maybe-mostlyclean-mpfr
  mostlyclean-host: maybe-mostlyclean-mpc
  mostlyclean-host: maybe-mostlyclean-isl
-mostlyclean-host: maybe-mostlyclean-cloog
  mostlyclean-host: maybe-mostlyclean-libelf
  mostlyclean-host: maybe-mostlyclean-gold
  mostlyclean-host: maybe-mostlyclean-gprof
@@ -1861,6 +1955,7 @@ mostlyclean-host: maybe-mostlyclean-libcpp
  mostlyclean-host: maybe-mostlyclean-libdecnumber
  mostlyclean-host: maybe-mostlyclean-libgui
  mostlyclean-host: maybe-mostlyclean-libiberty
+mostlyclean-host: maybe-mostlyclean-libiberty-linker-plugin
  mostlyclean-host: maybe-mostlyclean-libiconv
  mostlyclean-host: maybe-mostlyclean-m4
  mostlyclean-host: maybe-mostlyclean-readline
@@ -1876,11 +1971,17 @@ mostlyclean-host: maybe-mostlyclean-libtermcap
  mostlyclean-host: maybe-mostlyclean-utils
  mostlyclean-host: maybe-mostlyclean-gnattools
  mostlyclean-host: maybe-mostlyclean-lto-plugin
+mostlyclean-host: maybe-mostlyclean-libcc1
+mostlyclean-host: maybe-mostlyclean-gotools
  
  .PHONY: mostlyclean-target
  
  mostlyclean-target: maybe-mostlyclean-target-libstdc++-v3
-mostlyclean-target: maybe-mostlyclean-target-libmudflap
+mostlyclean-target: maybe-mostlyclean-target-libsanitizer
+mostlyclean-target: maybe-mostlyclean-target-libmpx
+mostlyclean-target: maybe-mostlyclean-target-libvtv
+mostlyclean-target: maybe-mostlyclean-target-libcilkrts
+mostlyclean-target: maybe-mostlyclean-target-liboffloadmic
  mostlyclean-target: maybe-mostlyclean-target-libssp
  mostlyclean-target: maybe-mostlyclean-target-newlib
  mostlyclean-target: maybe-mostlyclean-target-libgcc
@@ -1893,9 +1994,7 @@ mostlyclean-target: maybe-mostlyclean-target-libtermcap
  mostlyclean-target: maybe-mostlyclean-target-winsup
  mostlyclean-target: maybe-mostlyclean-target-libgloss
  mostlyclean-target: maybe-mostlyclean-target-libffi
-mostlyclean-target: maybe-mostlyclean-target-libjava
  mostlyclean-target: maybe-mostlyclean-target-zlib
-mostlyclean-target: maybe-mostlyclean-target-boehm-gc
  mostlyclean-target: maybe-mostlyclean-target-rda
  mostlyclean-target: maybe-mostlyclean-target-libada
  mostlyclean-target: maybe-mostlyclean-target-libgomp
@@ -1929,7 +2028,6 @@ clean-host: maybe-clean-gmp
  clean-host: maybe-clean-mpfr
  clean-host: maybe-clean-mpc
  clean-host: maybe-clean-isl
-clean-host: maybe-clean-cloog
  clean-host: maybe-clean-libelf
  clean-host: maybe-clean-gold
  clean-host: maybe-clean-gprof
@@ -1942,6 +2040,7 @@ clean-host: maybe-clean-libcpp
  clean-host: maybe-clean-libdecnumber
  clean-host: maybe-clean-libgui
  clean-host: maybe-clean-libiberty
+clean-host: maybe-clean-libiberty-linker-plugin
  clean-host: maybe-clean-libiconv
  clean-host: maybe-clean-m4
  clean-host: maybe-clean-readline
@@ -1957,11 +2056,17 @@ clean-host: maybe-clean-libtermcap
  clean-host: maybe-clean-utils
  clean-host: maybe-clean-gnattools
  clean-host: maybe-clean-lto-plugin
+clean-host: maybe-clean-libcc1
+clean-host: maybe-clean-gotools
  
  .PHONY: clean-target
  
  clean-target: maybe-clean-target-libstdc++-v3
-clean-target: maybe-clean-target-libmudflap
+clean-target: maybe-clean-target-libsanitizer
+clean-target: maybe-clean-target-libmpx
+clean-target: maybe-clean-target-libvtv
+clean-target: maybe-clean-target-libcilkrts
+clean-target: maybe-clean-target-liboffloadmic
  clean-target: maybe-clean-target-libssp
  clean-target: maybe-clean-target-newlib
  clean-target: maybe-clean-target-libgcc
@@ -1974,9 +2079,7 @@ clean-target: maybe-clean-target-libtermcap
  clean-target: maybe-clean-target-winsup
  clean-target: maybe-clean-target-libgloss
  clean-target: maybe-clean-target-libffi
-clean-target: maybe-clean-target-libjava
  clean-target: maybe-clean-target-zlib
-clean-target: maybe-clean-target-boehm-gc
  clean-target: maybe-clean-target-rda
  clean-target: maybe-clean-target-libada
  clean-target: maybe-clean-target-libgomp
@@ -2010,7 +2113,6 @@ distclean-host: maybe-distclean-gmp
  distclean-host: maybe-distclean-mpfr
  distclean-host: maybe-distclean-mpc
  distclean-host: maybe-distclean-isl
-distclean-host: maybe-distclean-cloog
  distclean-host: maybe-distclean-libelf
  distclean-host: maybe-distclean-gold
  distclean-host: maybe-distclean-gprof
@@ -2023,6 +2125,7 @@ distclean-host: maybe-distclean-libcpp
  distclean-host: maybe-distclean-libdecnumber
  distclean-host: maybe-distclean-libgui
  distclean-host: maybe-distclean-libiberty
+distclean-host: maybe-distclean-libiberty-linker-plugin
  distclean-host: maybe-distclean-libiconv
  distclean-host: maybe-distclean-m4
  distclean-host: maybe-distclean-readline
@@ -2038,11 +2141,17 @@ distclean-host: maybe-distclean-libtermcap
  distclean-host: maybe-distclean-utils
  distclean-host: maybe-distclean-gnattools
  distclean-host: maybe-distclean-lto-plugin
+distclean-host: maybe-distclean-libcc1
+distclean-host: maybe-distclean-gotools
  
  .PHONY: distclean-target
  
  distclean-target: maybe-distclean-target-libstdc++-v3
-distclean-target: maybe-distclean-target-libmudflap
+distclean-target: maybe-distclean-target-libsanitizer
+distclean-target: maybe-distclean-target-libmpx
+distclean-target: maybe-distclean-target-libvtv
+distclean-target: maybe-distclean-target-libcilkrts
+distclean-target: maybe-distclean-target-liboffloadmic
  distclean-target: maybe-distclean-target-libssp
  distclean-target: maybe-distclean-target-newlib
  distclean-target: maybe-distclean-target-libgcc
@@ -2055,9 +2164,7 @@ distclean-target: maybe-distclean-target-libtermcap
  distclean-target: maybe-distclean-target-winsup
  distclean-target: maybe-distclean-target-libgloss
  distclean-target: maybe-distclean-target-libffi
-distclean-target: maybe-distclean-target-libjava
  distclean-target: maybe-distclean-target-zlib
-distclean-target: maybe-distclean-target-boehm-gc
  distclean-target: maybe-distclean-target-rda
  distclean-target: maybe-distclean-target-libada
  distclean-target: maybe-distclean-target-libgomp
@@ -2091,7 +2198,6 @@ maintainer-clean-host: maybe-maintainer-clean-gmp
  maintainer-clean-host: maybe-maintainer-clean-mpfr
  maintainer-clean-host: maybe-maintainer-clean-mpc
  maintainer-clean-host: maybe-maintainer-clean-isl
-maintainer-clean-host: maybe-maintainer-clean-cloog
  maintainer-clean-host: maybe-maintainer-clean-libelf
  maintainer-clean-host: maybe-maintainer-clean-gold
  maintainer-clean-host: maybe-maintainer-clean-gprof
@@ -2104,6 +2210,7 @@ maintainer-clean-host: maybe-maintainer-clean-libcpp
  maintainer-clean-host: maybe-maintainer-clean-libdecnumber
  maintainer-clean-host: maybe-maintainer-clean-libgui
  maintainer-clean-host: maybe-maintainer-clean-libiberty
+maintainer-clean-host: maybe-maintainer-clean-libiberty-linker-plugin
  maintainer-clean-host: maybe-maintainer-clean-libiconv
  maintainer-clean-host: maybe-maintainer-clean-m4
  maintainer-clean-host: maybe-maintainer-clean-readline
@@ -2119,11 +2226,17 @@ maintainer-clean-host: maybe-maintainer-clean-libtermcap
  maintainer-clean-host: maybe-maintainer-clean-utils
  maintainer-clean-host: maybe-maintainer-clean-gnattools
  maintainer-clean-host: maybe-maintainer-clean-lto-plugin
+maintainer-clean-host: maybe-maintainer-clean-libcc1
+maintainer-clean-host: maybe-maintainer-clean-gotools
  
  .PHONY: maintainer-clean-target
  
  maintainer-clean-target: maybe-maintainer-clean-target-libstdc++-v3
-maintainer-clean-target: maybe-maintainer-clean-target-libmudflap
+maintainer-clean-target: maybe-maintainer-clean-target-libsanitizer
+maintainer-clean-target: maybe-maintainer-clean-target-libmpx
+maintainer-clean-target: maybe-maintainer-clean-target-libvtv
+maintainer-clean-target: maybe-maintainer-clean-target-libcilkrts
+maintainer-clean-target: maybe-maintainer-clean-target-liboffloadmic
  maintainer-clean-target: maybe-maintainer-clean-target-libssp
  maintainer-clean-target: maybe-maintainer-clean-target-newlib
  maintainer-clean-target: maybe-maintainer-clean-target-libgcc
@@ -2136,9 +2249,7 @@ maintainer-clean-target: maybe-maintainer-clean-target-libtermcap
  maintainer-clean-target: maybe-maintainer-clean-target-winsup
  maintainer-clean-target: maybe-maintainer-clean-target-libgloss
  maintainer-clean-target: maybe-maintainer-clean-target-libffi
-maintainer-clean-target: maybe-maintainer-clean-target-libjava
  maintainer-clean-target: maybe-maintainer-clean-target-zlib
-maintainer-clean-target: maybe-maintainer-clean-target-boehm-gc
  maintainer-clean-target: maybe-maintainer-clean-target-rda
  maintainer-clean-target: maybe-maintainer-clean-target-libada
  maintainer-clean-target: maybe-maintainer-clean-target-libgomp
@@ -2164,9 +2275,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
  
@@ -2177,7 +2288,7 @@ local-clean:
  
  local-distclean:
         -rm -f Makefile config.status config.cache mh-frag mt-frag
-       -rm -f maybedep.tmp serdep.tmp
+       -rm -f maybedep.tmp serdep.tmp stage_final
         -if [ "$(TARGET_SUBDIR)" != "." ]; then \
           rm -rf $(TARGET_SUBDIR); \
         else true; fi
@@ -2189,7 +2300,8 @@ local-distclean:
         -rm -f texinfo/doc/Makefile texinfo/po/POTFILES
         -rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
         -rmdir texinfo/makeinfo texinfo/po texinfo/util 2>/dev/null
-       -rmdir fastjar gcc libiberty texinfo zlib 2>/dev/null
+       -rmdir fastjar gcc gnattools gotools libcc1 libiberty 2>/dev/null
+       -rmdir texinfo zlib 2>/dev/null
         -find . -name config.cache -exec rm -f {} \; \; 2>/dev/null
  
  local-maintainer-clean:
@@ -2227,7 +2339,6 @@ check-host:  \
      maybe-check-mpfr \
      maybe-check-mpc \
      maybe-check-isl \
-    maybe-check-cloog \
      maybe-check-libelf \
      maybe-check-gold \
      maybe-check-gprof \
@@ -2240,6 +2351,7 @@ check-host:  \
      maybe-check-libdecnumber \
      maybe-check-libgui \
      maybe-check-libiberty \
+    maybe-check-libiberty-linker-plugin \
      maybe-check-libiconv \
      maybe-check-m4 \
      maybe-check-readline \
@@ -2254,12 +2366,18 @@ check-host:  \
      maybe-check-libtermcap \
      maybe-check-utils \
      maybe-check-gnattools \
-    maybe-check-lto-plugin
+    maybe-check-lto-plugin \
+    maybe-check-libcc1 \
+    maybe-check-gotools
  
  .PHONY: check-target
  check-target:  \
      maybe-check-target-libstdc++-v3 \
-    maybe-check-target-libmudflap \
+    maybe-check-target-libsanitizer \
+    maybe-check-target-libmpx \
+    maybe-check-target-libvtv \
+    maybe-check-target-libcilkrts \
+    maybe-check-target-liboffloadmic \
      maybe-check-target-libssp \
      maybe-check-target-newlib \
      maybe-check-target-libgcc \
@@ -2272,9 +2390,7 @@ check-target:  \
      maybe-check-target-winsup \
      maybe-check-target-libgloss \
      maybe-check-target-libffi \
-    maybe-check-target-libjava \
      maybe-check-target-zlib \
-    maybe-check-target-boehm-gc \
      maybe-check-target-rda \
      maybe-check-target-libada \
      maybe-check-target-libgomp \
@@ -2308,6 +2424,27 @@ mail-report-with-warnings.log: warning.log
         chmod +x $@
         echo If you really want to send e-mail, run ./$@ now
  
+# Local Vim config
+
+$(srcdir)/.local.vimrc:
+       $(LN_S) contrib/vimrc $@
+
+$(srcdir)/.lvimrc:
+       $(LN_S) contrib/vimrc $@
+
+vimrc: $(srcdir)/.local.vimrc $(srcdir)/.lvimrc
+
+.PHONY: vimrc
+
+# clang-format config
+
+$(srcdir)/.clang-format:
+       $(LN_S) contrib/clang-format $@
+
+clang-format: $(srcdir)/.clang-format
+
+.PHONY: clang-format
+
  # Installation targets.
  
  .PHONY: install uninstall
@@ -2334,7 +2471,6 @@ install-host-nogcc:  \
      maybe-install-mpfr \
      maybe-install-mpc \
      maybe-install-isl \
-    maybe-install-cloog \
      maybe-install-libelf \
      maybe-install-gold \
      maybe-install-gprof \
@@ -2347,6 +2483,7 @@ install-host-nogcc:  \
      maybe-install-libdecnumber \
      maybe-install-libgui \
      maybe-install-libiberty \
+    maybe-install-libiberty-linker-plugin \
      maybe-install-libiconv \
      maybe-install-m4 \
      maybe-install-readline \
@@ -2361,7 +2498,9 @@ install-host-nogcc:  \
      maybe-install-libtermcap \
      maybe-install-utils \
      maybe-install-gnattools \
-    maybe-install-lto-plugin
+    maybe-install-lto-plugin \
+    maybe-install-libcc1 \
+    maybe-install-gotools
  
  .PHONY: install-host
  install-host:  \
@@ -2381,7 +2520,6 @@ install-host:  \
      maybe-install-mpfr \
      maybe-install-mpc \
      maybe-install-isl \
-    maybe-install-cloog \
      maybe-install-libelf \
      maybe-install-gold \
      maybe-install-gprof \
@@ -2394,6 +2532,7 @@ install-host:  \
      maybe-install-libdecnumber \
      maybe-install-libgui \
      maybe-install-libiberty \
+    maybe-install-libiberty-linker-plugin \
      maybe-install-libiconv \
      maybe-install-m4 \
      maybe-install-readline \
@@ -2408,12 +2547,18 @@ install-host:  \
      maybe-install-libtermcap \
      maybe-install-utils \
      maybe-install-gnattools \
-    maybe-install-lto-plugin
+    maybe-install-lto-plugin \
+    maybe-install-libcc1 \
+    maybe-install-gotools
  
  .PHONY: install-target
  install-target:  \
      maybe-install-target-libstdc++-v3 \
-    maybe-install-target-libmudflap \
+    maybe-install-target-libsanitizer \
+    maybe-install-target-libmpx \
+    maybe-install-target-libvtv \
+    maybe-install-target-libcilkrts \
+    maybe-install-target-liboffloadmic \
      maybe-install-target-libssp \
      maybe-install-target-newlib \
      maybe-install-target-libgcc \
@@ -2426,9 +2571,7 @@ install-target:  \
      maybe-install-target-winsup \
      maybe-install-target-libgloss \
      maybe-install-target-libffi \
-    maybe-install-target-libjava \
      maybe-install-target-zlib \
-    maybe-install-target-boehm-gc \
      maybe-install-target-rda \
      maybe-install-target-libada \
      maybe-install-target-libgomp \
@@ -2440,14 +2583,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
@@ -2482,7 +2625,6 @@ install-strip-host:  \
      maybe-install-strip-mpfr \
      maybe-install-strip-mpc \
      maybe-install-strip-isl \
-    maybe-install-strip-cloog \
      maybe-install-strip-libelf \
      maybe-install-strip-gold \
      maybe-install-strip-gprof \
@@ -2495,6 +2637,7 @@ install-strip-host:  \
      maybe-install-strip-libdecnumber \
      maybe-install-strip-libgui \
      maybe-install-strip-libiberty \
+    maybe-install-strip-libiberty-linker-plugin \
      maybe-install-strip-libiconv \
      maybe-install-strip-m4 \
      maybe-install-strip-readline \
@@ -2509,12 +2652,18 @@ install-strip-host:  \
      maybe-install-strip-libtermcap \
      maybe-install-strip-utils \
      maybe-install-strip-gnattools \
-    maybe-install-strip-lto-plugin
+    maybe-install-strip-lto-plugin \
+    maybe-install-strip-libcc1 \
+    maybe-install-strip-gotools
  
  .PHONY: install-strip-target
  install-strip-target:  \
      maybe-install-strip-target-libstdc++-v3 \
-    maybe-install-strip-target-libmudflap \
+    maybe-install-strip-target-libsanitizer \
+    maybe-install-strip-target-libmpx \
+    maybe-install-strip-target-libvtv \
+    maybe-install-strip-target-libcilkrts \
+    maybe-install-strip-target-liboffloadmic \
      maybe-install-strip-target-libssp \
      maybe-install-strip-target-newlib \
      maybe-install-strip-target-libgcc \
@@ -2527,9 +2676,7 @@ install-strip-target:  \
      maybe-install-strip-target-winsup \
      maybe-install-strip-target-libgloss \
      maybe-install-strip-target-libffi \
-    maybe-install-strip-target-libjava \
      maybe-install-strip-target-zlib \
-    maybe-install-strip-target-boehm-gc \
      maybe-install-strip-target-rda \
      maybe-install-strip-target-libada \
      maybe-install-strip-target-libgomp \
@@ -2547,10 +2694,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:
@@ -2592,7 +2739,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; \
@@ -2601,12 +2748,13 @@ configure-build-libiberty:
           *) topdir=`echo $(BUILD_SUBDIR)/libiberty/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
+       module_srcdir=libiberty; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif build-libiberty
  
@@ -2628,7 +2776,7 @@ all-build-libiberty: configure-build-libiberty
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS)  \
         (cd $(BUILD_SUBDIR)/libiberty && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)   \
                 $(TARGET-build-libiberty))
  @endif build-libiberty
  
@@ -2648,7 +2796,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; \
@@ -2657,12 +2805,13 @@ configure-build-bison:
           *) topdir=`echo $(BUILD_SUBDIR)/bison/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/bison"; \
-       libsrcdir="$$s/bison"; \
+       module_srcdir=bison; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif build-bison
  
@@ -2684,7 +2833,7 @@ all-build-bison: configure-build-bison
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS)  \
         (cd $(BUILD_SUBDIR)/bison && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)   \
                 $(TARGET-build-bison))
  @endif build-bison
  
@@ -2704,7 +2853,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; \
@@ -2713,12 +2862,13 @@ configure-build-flex:
           *) topdir=`echo $(BUILD_SUBDIR)/flex/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/flex"; \
-       libsrcdir="$$s/flex"; \
+       module_srcdir=flex; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif build-flex
  
@@ -2740,7 +2890,7 @@ all-build-flex: configure-build-flex
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS)  \
         (cd $(BUILD_SUBDIR)/flex && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)   \
                 $(TARGET-build-flex))
  @endif build-flex
  
@@ -2760,7 +2910,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; \
@@ -2769,12 +2919,13 @@ configure-build-m4:
           *) topdir=`echo $(BUILD_SUBDIR)/m4/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/m4"; \
-       libsrcdir="$$s/m4"; \
+       module_srcdir=m4; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif build-m4
  
@@ -2796,7 +2947,7 @@ all-build-m4: configure-build-m4
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS)  \
         (cd $(BUILD_SUBDIR)/m4 && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)   \
                 $(TARGET-build-m4))
  @endif build-m4
  
@@ -2816,7 +2967,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; \
@@ -2825,12 +2976,13 @@ configure-build-texinfo:
           *) topdir=`echo $(BUILD_SUBDIR)/texinfo/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/texinfo"; \
-       libsrcdir="$$s/texinfo"; \
+       module_srcdir=texinfo; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif build-texinfo
  
@@ -2852,7 +3004,7 @@ all-build-texinfo: configure-build-texinfo
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS)  \
         (cd $(BUILD_SUBDIR)/texinfo && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)   \
                 $(TARGET-build-texinfo))
  @endif build-texinfo
  
@@ -2872,7 +3024,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; \
@@ -2881,12 +3033,13 @@ configure-build-fixincludes:
           *) topdir=`echo $(BUILD_SUBDIR)/fixincludes/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/fixincludes"; \
-       libsrcdir="$$s/fixincludes"; \
+       module_srcdir=fixincludes; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif build-fixincludes
  
@@ -2908,7 +3061,7 @@ all-build-fixincludes: configure-build-fixincludes
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(BUILD_EXPORTS)  \
         (cd $(BUILD_SUBDIR)/fixincludes && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)   \
                 $(TARGET-build-fixincludes))
  @endif build-fixincludes
  
@@ -2916,6 +3069,63 @@ all-build-fixincludes: configure-build-fixincludes
  
  
  
+.PHONY: configure-build-libcpp maybe-configure-build-libcpp
+maybe-configure-build-libcpp:
+@if gcc-bootstrap
+configure-build-libcpp: stage_current
+@endif gcc-bootstrap
+@if build-libcpp
+maybe-configure-build-libcpp: configure-build-libcpp
+configure-build-libcpp: 
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       test ! -f $(BUILD_SUBDIR)/libcpp/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libcpp; \
+       $(BUILD_EXPORTS)  \
+       echo Configuring in $(BUILD_SUBDIR)/libcpp; \
+       cd "$(BUILD_SUBDIR)/libcpp" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(BUILD_SUBDIR)/libcpp/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libcpp; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
+         --target=${target_alias} --disable-nls am_cv_func_iconv=no \
+         || exit 1
+@endif build-libcpp
+
+
+
+
+
+.PHONY: all-build-libcpp maybe-all-build-libcpp
+maybe-all-build-libcpp:
+@if gcc-bootstrap
+all-build-libcpp: stage_current
+@endif gcc-bootstrap
+@if build-libcpp
+TARGET-build-libcpp=all
+maybe-all-build-libcpp: all-build-libcpp
+all-build-libcpp: configure-build-libcpp
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS)  \
+       (cd $(BUILD_SUBDIR)/libcpp && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)   \
+               $(TARGET-build-libcpp))
+@endif build-libcpp
+
+
+
+
+
  # --------------------------------------
  # Modules which run on the host machine
  # --------------------------------------
@@ -2932,7 +3142,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; \
@@ -2941,11 +3151,12 @@ configure-bfd:
           *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bfd; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif bfd
  
@@ -2966,19 +3177,20 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bfd; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
           $(STAGE1_CONFIGURE_FLAGS)
  @endif bfd-bootstrap
  
@@ -2998,19 +3210,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bfd; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE2_CONFIGURE_FLAGS)
  @endif bfd-bootstrap
@@ -3031,19 +3243,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bfd; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE3_CONFIGURE_FLAGS)
  @endif bfd-bootstrap
@@ -3064,19 +3276,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bfd; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE4_CONFIGURE_FLAGS)
  @endif bfd-bootstrap
@@ -3097,19 +3309,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bfd; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEprofile_CONFIGURE_FLAGS)
  @endif bfd-bootstrap
@@ -3130,19 +3342,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bfd; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEfeedback_CONFIGURE_FLAGS)
  @endif bfd-bootstrap
@@ -3164,7 +3376,7 @@ all-bfd: configure-bfd
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/bfd && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-bfd))
  @endif bfd
  
@@ -3185,6 +3397,7 @@ all-stage1-bfd: configure-stage1-bfd
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/bfd && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -3192,8 +3405,9 @@ all-stage1-bfd: configure-stage1-bfd
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-bfd)
  
  maybe-clean-stage1-bfd: clean-stage1-bfd
@@ -3207,7 +3421,7 @@ clean-stage1-bfd:
         fi; \
         cd $(HOST_SUBDIR)/bfd && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
  @endif bfd-bootstrap
  
  
@@ -3227,6 +3441,7 @@ all-stage2-bfd: configure-stage2-bfd
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/bfd && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -3235,7 +3450,7 @@ all-stage2-bfd: configure-stage2-bfd
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-bfd)
  
  maybe-clean-stage2-bfd: clean-stage2-bfd
@@ -3248,9 +3463,7 @@ clean-stage2-bfd:
           $(MAKE) stage2-start; \
         fi; \
         cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif bfd-bootstrap
  
  
@@ -3270,6 +3483,7 @@ all-stage3-bfd: configure-stage3-bfd
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/bfd && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -3278,7 +3492,7 @@ all-stage3-bfd: configure-stage3-bfd
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-bfd)
  
  maybe-clean-stage3-bfd: clean-stage3-bfd
@@ -3291,9 +3505,7 @@ clean-stage3-bfd:
           $(MAKE) stage3-start; \
         fi; \
         cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif bfd-bootstrap
  
  
@@ -3313,6 +3525,7 @@ all-stage4-bfd: configure-stage4-bfd
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/bfd && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -3321,7 +3534,7 @@ all-stage4-bfd: configure-stage4-bfd
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-bfd)
  
  maybe-clean-stage4-bfd: clean-stage4-bfd
@@ -3334,9 +3547,7 @@ clean-stage4-bfd:
           $(MAKE) stage4-start; \
         fi; \
         cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif bfd-bootstrap
  
  
@@ -3356,6 +3567,7 @@ all-stageprofile-bfd: configure-stageprofile-bfd
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/bfd && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -3364,7 +3576,7 @@ all-stageprofile-bfd: configure-stageprofile-bfd
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-bfd)
  
  maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
@@ -3377,9 +3589,7 @@ clean-stageprofile-bfd:
           $(MAKE) stageprofile-start; \
         fi; \
         cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif bfd-bootstrap
  
  
@@ -3399,6 +3609,7 @@ all-stagefeedback-bfd: configure-stagefeedback-bfd
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/bfd && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -3407,7 +3618,7 @@ all-stagefeedback-bfd: configure-stagefeedback-bfd
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-bfd)
  
  maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
@@ -3420,9 +3631,7 @@ clean-stagefeedback-bfd:
           $(MAKE) stagefeedback-start; \
         fi; \
         cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif bfd-bootstrap
  
  
@@ -3438,9 +3647,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
  
@@ -3490,7 +3699,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}" \
@@ -3515,7 +3724,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}" \
@@ -3540,7 +3749,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}" \
@@ -3565,7 +3774,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}" \
@@ -3590,7 +3799,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}" \
@@ -3616,7 +3825,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}" \
@@ -3642,7 +3851,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}" \
@@ -3668,7 +3877,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}" \
@@ -3693,7 +3902,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}" \
@@ -3717,7 +3926,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}" \
@@ -3741,7 +3950,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}" \
@@ -3765,7 +3974,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}" \
@@ -3789,7 +3998,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}" \
@@ -3813,7 +4022,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; \
@@ -3822,11 +4031,12 @@ configure-opcodes:
           *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=opcodes; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif opcodes
  
@@ -3847,19 +4057,20 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=opcodes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
           $(STAGE1_CONFIGURE_FLAGS)
  @endif opcodes-bootstrap
  
@@ -3879,19 +4090,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=opcodes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE2_CONFIGURE_FLAGS)
  @endif opcodes-bootstrap
@@ -3912,19 +4123,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=opcodes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE3_CONFIGURE_FLAGS)
  @endif opcodes-bootstrap
@@ -3945,19 +4156,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=opcodes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE4_CONFIGURE_FLAGS)
  @endif opcodes-bootstrap
@@ -3978,19 +4189,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=opcodes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEprofile_CONFIGURE_FLAGS)
  @endif opcodes-bootstrap
@@ -4011,19 +4222,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=opcodes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEfeedback_CONFIGURE_FLAGS)
  @endif opcodes-bootstrap
@@ -4045,7 +4256,7 @@ all-opcodes: configure-opcodes
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/opcodes && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-opcodes))
  @endif opcodes
  
@@ -4066,6 +4277,7 @@ all-stage1-opcodes: configure-stage1-opcodes
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/opcodes && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -4073,8 +4285,9 @@ all-stage1-opcodes: configure-stage1-opcodes
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-opcodes)
  
  maybe-clean-stage1-opcodes: clean-stage1-opcodes
@@ -4088,7 +4301,7 @@ clean-stage1-opcodes:
         fi; \
         cd $(HOST_SUBDIR)/opcodes && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
  @endif opcodes-bootstrap
  
  
@@ -4108,6 +4321,7 @@ all-stage2-opcodes: configure-stage2-opcodes
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/opcodes && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -4116,7 +4330,7 @@ all-stage2-opcodes: configure-stage2-opcodes
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-opcodes)
  
  maybe-clean-stage2-opcodes: clean-stage2-opcodes
@@ -4129,9 +4343,7 @@ clean-stage2-opcodes:
           $(MAKE) stage2-start; \
         fi; \
         cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif opcodes-bootstrap
  
  
@@ -4151,6 +4363,7 @@ all-stage3-opcodes: configure-stage3-opcodes
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/opcodes && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -4159,7 +4372,7 @@ all-stage3-opcodes: configure-stage3-opcodes
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-opcodes)
  
  maybe-clean-stage3-opcodes: clean-stage3-opcodes
@@ -4172,9 +4385,7 @@ clean-stage3-opcodes:
           $(MAKE) stage3-start; \
         fi; \
         cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif opcodes-bootstrap
  
  
@@ -4194,6 +4405,7 @@ all-stage4-opcodes: configure-stage4-opcodes
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/opcodes && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -4202,7 +4414,7 @@ all-stage4-opcodes: configure-stage4-opcodes
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-opcodes)
  
  maybe-clean-stage4-opcodes: clean-stage4-opcodes
@@ -4215,9 +4427,7 @@ clean-stage4-opcodes:
           $(MAKE) stage4-start; \
         fi; \
         cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif opcodes-bootstrap
  
  
@@ -4237,6 +4447,7 @@ all-stageprofile-opcodes: configure-stageprofile-opcodes
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/opcodes && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -4245,7 +4456,7 @@ all-stageprofile-opcodes: configure-stageprofile-opcodes
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-opcodes)
  
  maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
@@ -4258,9 +4469,7 @@ clean-stageprofile-opcodes:
           $(MAKE) stageprofile-start; \
         fi; \
         cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif opcodes-bootstrap
  
  
@@ -4280,6 +4489,7 @@ all-stagefeedback-opcodes: configure-stagefeedback-opcodes
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/opcodes && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -4288,7 +4498,7 @@ all-stagefeedback-opcodes: configure-stagefeedback-opcodes
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-opcodes)
  
  maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
@@ -4301,9 +4511,7 @@ clean-stagefeedback-opcodes:
           $(MAKE) stagefeedback-start; \
         fi; \
         cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif opcodes-bootstrap
  
  
@@ -4319,9 +4527,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
  
@@ -4371,7 +4579,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}" \
@@ -4396,7 +4604,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}" \
@@ -4421,7 +4629,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}" \
@@ -4446,7 +4654,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}" \
@@ -4471,7 +4679,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}" \
@@ -4497,7 +4705,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}" \
@@ -4523,7 +4731,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}" \
@@ -4549,7 +4757,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}" \
@@ -4574,7 +4782,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}" \
@@ -4598,7 +4806,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}" \
@@ -4622,7 +4830,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}" \
@@ -4646,7 +4854,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}" \
@@ -4670,7 +4878,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}" \
@@ -4694,7 +4902,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; \
@@ -4703,11 +4911,12 @@ configure-binutils:
           *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=binutils; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif binutils
  
@@ -4728,19 +4937,20 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=binutils; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
           $(STAGE1_CONFIGURE_FLAGS)
  @endif binutils-bootstrap
  
@@ -4760,19 +4970,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=binutils; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE2_CONFIGURE_FLAGS)
  @endif binutils-bootstrap
@@ -4793,19 +5003,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=binutils; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE3_CONFIGURE_FLAGS)
  @endif binutils-bootstrap
@@ -4826,19 +5036,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=binutils; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE4_CONFIGURE_FLAGS)
  @endif binutils-bootstrap
@@ -4859,19 +5069,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=binutils; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEprofile_CONFIGURE_FLAGS)
  @endif binutils-bootstrap
@@ -4892,19 +5102,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=binutils; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEfeedback_CONFIGURE_FLAGS)
  @endif binutils-bootstrap
@@ -4926,7 +5136,7 @@ all-binutils: configure-binutils
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/binutils && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-binutils))
  @endif binutils
  
@@ -4947,6 +5157,7 @@ all-stage1-binutils: configure-stage1-binutils
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/binutils && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -4954,8 +5165,9 @@ all-stage1-binutils: configure-stage1-binutils
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-binutils)
  
  maybe-clean-stage1-binutils: clean-stage1-binutils
@@ -4969,7 +5181,7 @@ clean-stage1-binutils:
         fi; \
         cd $(HOST_SUBDIR)/binutils && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
  @endif binutils-bootstrap
  
  
@@ -4989,6 +5201,7 @@ all-stage2-binutils: configure-stage2-binutils
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/binutils && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -4997,7 +5210,7 @@ all-stage2-binutils: configure-stage2-binutils
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-binutils)
  
  maybe-clean-stage2-binutils: clean-stage2-binutils
@@ -5010,9 +5223,7 @@ clean-stage2-binutils:
           $(MAKE) stage2-start; \
         fi; \
         cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif binutils-bootstrap
  
  
@@ -5032,6 +5243,7 @@ all-stage3-binutils: configure-stage3-binutils
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/binutils && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -5040,7 +5252,7 @@ all-stage3-binutils: configure-stage3-binutils
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-binutils)
  
  maybe-clean-stage3-binutils: clean-stage3-binutils
@@ -5053,9 +5265,7 @@ clean-stage3-binutils:
           $(MAKE) stage3-start; \
         fi; \
         cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif binutils-bootstrap
  
  
@@ -5075,6 +5285,7 @@ all-stage4-binutils: configure-stage4-binutils
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/binutils && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -5083,7 +5294,7 @@ all-stage4-binutils: configure-stage4-binutils
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-binutils)
  
  maybe-clean-stage4-binutils: clean-stage4-binutils
@@ -5096,9 +5307,7 @@ clean-stage4-binutils:
           $(MAKE) stage4-start; \
         fi; \
         cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif binutils-bootstrap
  
  
@@ -5118,6 +5327,7 @@ all-stageprofile-binutils: configure-stageprofile-binutils
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/binutils && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -5126,7 +5336,7 @@ all-stageprofile-binutils: configure-stageprofile-binutils
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-binutils)
  
  maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
@@ -5139,9 +5349,7 @@ clean-stageprofile-binutils:
           $(MAKE) stageprofile-start; \
         fi; \
         cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif binutils-bootstrap
  
  
@@ -5161,6 +5369,7 @@ all-stagefeedback-binutils: configure-stagefeedback-binutils
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/binutils && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -5169,7 +5378,7 @@ all-stagefeedback-binutils: configure-stagefeedback-binutils
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-binutils)
  
  maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
@@ -5182,9 +5391,7 @@ clean-stagefeedback-binutils:
           $(MAKE) stagefeedback-start; \
         fi; \
         cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif binutils-bootstrap
  
  
@@ -5200,9 +5407,9 @@ check-binutils:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/binutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
  
  @endif binutils
  
@@ -5252,7 +5459,7 @@ info-binutils: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in binutils" ; \
+       echo "Doing info in binutils"; \
         (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5277,7 +5484,7 @@ dvi-binutils: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in binutils" ; \
+       echo "Doing dvi in binutils"; \
         (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5302,7 +5509,7 @@ pdf-binutils: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing pdf in binutils" ; \
+       echo "Doing pdf in binutils"; \
         (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5327,7 +5534,7 @@ html-binutils: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing html in binutils" ; \
+       echo "Doing html in binutils"; \
         (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5352,7 +5559,7 @@ TAGS-binutils: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in binutils" ; \
+       echo "Doing TAGS in binutils"; \
         (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5378,7 +5585,7 @@ install-info-binutils: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in binutils" ; \
+       echo "Doing install-info in binutils"; \
         (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5404,7 +5611,7 @@ install-pdf-binutils: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-pdf in binutils" ; \
+       echo "Doing install-pdf in binutils"; \
         (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5430,7 +5637,7 @@ install-html-binutils: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-html in binutils" ; \
+       echo "Doing install-html in binutils"; \
         (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5455,7 +5662,7 @@ installcheck-binutils: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in binutils" ; \
+       echo "Doing installcheck in binutils"; \
         (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5479,7 +5686,7 @@ mostlyclean-binutils:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in binutils" ; \
+       echo "Doing mostlyclean in binutils"; \
         (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5503,7 +5710,7 @@ clean-binutils:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in binutils" ; \
+       echo "Doing clean in binutils"; \
         (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5527,7 +5734,7 @@ distclean-binutils:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in binutils" ; \
+       echo "Doing distclean in binutils"; \
         (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5551,7 +5758,7 @@ maintainer-clean-binutils:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in binutils" ; \
+       echo "Doing maintainer-clean in binutils"; \
         (cd $(HOST_SUBDIR)/binutils && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5576,7 +5783,7 @@ configure-bison:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         test ! -f $(HOST_SUBDIR)/bison/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison; \
         $(HOST_EXPORTS)  \
         echo Configuring in $(HOST_SUBDIR)/bison; \
         cd "$(HOST_SUBDIR)/bison" || exit 1; \
@@ -5585,11 +5792,12 @@ configure-bison:
           *) topdir=`echo $(HOST_SUBDIR)/bison/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/bison"; \
-       libsrcdir="$$s/bison"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bison; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif bison
  
@@ -5611,7 +5819,7 @@ all-bison: configure-bison
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/bison && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-bison))
  @endif bison
  
@@ -5626,12 +5834,12 @@ maybe-check-bison: check-bison
  # This module is only tested in a native toolchain.
  check-bison:
         @: $(MAKE); $(unstage)
-       @if [ '$(host)' = '$(target)' ] ; then \
+       @if [ '$(host)' = '$(target)' ]; then \
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(HOST_EXPORTS) \
+         $(HOST_EXPORTS)  \
           (cd $(HOST_SUBDIR)/bison && \
-           $(MAKE) $(FLAGS_TO_PASS)  check); \
+           $(MAKE) $(FLAGS_TO_PASS)  check)
         fi
  
  @endif bison
@@ -5683,7 +5891,7 @@ info-bison: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in bison" ; \
+       echo "Doing info in bison"; \
         (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5709,7 +5917,7 @@ dvi-bison: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in bison" ; \
+       echo "Doing dvi in bison"; \
         (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5735,7 +5943,7 @@ pdf-bison: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing pdf in bison" ; \
+       echo "Doing pdf in bison"; \
         (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5761,7 +5969,7 @@ html-bison: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing html in bison" ; \
+       echo "Doing html in bison"; \
         (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5787,7 +5995,7 @@ TAGS-bison: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in bison" ; \
+       echo "Doing TAGS in bison"; \
         (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5814,7 +6022,7 @@ install-info-bison: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in bison" ; \
+       echo "Doing install-info in bison"; \
         (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5841,7 +6049,7 @@ install-pdf-bison: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-pdf in bison" ; \
+       echo "Doing install-pdf in bison"; \
         (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5868,7 +6076,7 @@ install-html-bison: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-html in bison" ; \
+       echo "Doing install-html in bison"; \
         (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5894,7 +6102,7 @@ installcheck-bison: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in bison" ; \
+       echo "Doing installcheck in bison"; \
         (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5919,7 +6127,7 @@ mostlyclean-bison:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in bison" ; \
+       echo "Doing mostlyclean in bison"; \
         (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5944,7 +6152,7 @@ clean-bison:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in bison" ; \
+       echo "Doing clean in bison"; \
         (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5969,7 +6177,7 @@ distclean-bison:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in bison" ; \
+       echo "Doing distclean in bison"; \
         (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -5994,7 +6202,7 @@ maintainer-clean-bison:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in bison" ; \
+       echo "Doing maintainer-clean in bison"; \
         (cd $(HOST_SUBDIR)/bison && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6019,7 +6227,7 @@ configure-cgen:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         test ! -f $(HOST_SUBDIR)/cgen/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cgen ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cgen; \
         $(HOST_EXPORTS)  \
         echo Configuring in $(HOST_SUBDIR)/cgen; \
         cd "$(HOST_SUBDIR)/cgen" || exit 1; \
@@ -6028,11 +6236,12 @@ configure-cgen:
           *) topdir=`echo $(HOST_SUBDIR)/cgen/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/cgen"; \
-       libsrcdir="$$s/cgen"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=cgen; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif cgen
  
@@ -6054,7 +6263,7 @@ all-cgen: configure-cgen
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/cgen && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-cgen))
  @endif cgen
  
@@ -6070,7 +6279,7 @@ check-cgen:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/cgen && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
  
@@ -6123,7 +6332,7 @@ info-cgen: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in cgen" ; \
+       echo "Doing info in cgen"; \
         (cd $(HOST_SUBDIR)/cgen && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6149,7 +6358,7 @@ dvi-cgen: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in cgen" ; \
+       echo "Doing dvi in cgen"; \
         (cd $(HOST_SUBDIR)/cgen && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6175,7 +6384,7 @@ pdf-cgen: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing pdf in cgen" ; \
+       echo "Doing pdf in cgen"; \
         (cd $(HOST_SUBDIR)/cgen && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6201,7 +6410,7 @@ html-cgen: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing html in cgen" ; \
+       echo "Doing html in cgen"; \
         (cd $(HOST_SUBDIR)/cgen && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6227,7 +6436,7 @@ TAGS-cgen: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in cgen" ; \
+       echo "Doing TAGS in cgen"; \
         (cd $(HOST_SUBDIR)/cgen && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6254,7 +6463,7 @@ install-info-cgen: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in cgen" ; \
+       echo "Doing install-info in cgen"; \
         (cd $(HOST_SUBDIR)/cgen && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6281,7 +6490,7 @@ install-pdf-cgen: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-pdf in cgen" ; \
+       echo "Doing install-pdf in cgen"; \
         (cd $(HOST_SUBDIR)/cgen && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6308,7 +6517,7 @@ install-html-cgen: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-html in cgen" ; \
+       echo "Doing install-html in cgen"; \
         (cd $(HOST_SUBDIR)/cgen && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6334,7 +6543,7 @@ installcheck-cgen: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in cgen" ; \
+       echo "Doing installcheck in cgen"; \
         (cd $(HOST_SUBDIR)/cgen && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6359,7 +6568,7 @@ mostlyclean-cgen:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in cgen" ; \
+       echo "Doing mostlyclean in cgen"; \
         (cd $(HOST_SUBDIR)/cgen && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6384,7 +6593,7 @@ clean-cgen:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in cgen" ; \
+       echo "Doing clean in cgen"; \
         (cd $(HOST_SUBDIR)/cgen && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6409,7 +6618,7 @@ distclean-cgen:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in cgen" ; \
+       echo "Doing distclean in cgen"; \
         (cd $(HOST_SUBDIR)/cgen && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6434,7 +6643,7 @@ maintainer-clean-cgen:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in cgen" ; \
+       echo "Doing maintainer-clean in cgen"; \
         (cd $(HOST_SUBDIR)/cgen && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6459,7 +6668,7 @@ configure-dejagnu:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         test ! -f $(HOST_SUBDIR)/dejagnu/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dejagnu ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dejagnu; \
         $(HOST_EXPORTS)  \
         echo Configuring in $(HOST_SUBDIR)/dejagnu; \
         cd "$(HOST_SUBDIR)/dejagnu" || exit 1; \
@@ -6468,11 +6677,12 @@ configure-dejagnu:
           *) topdir=`echo $(HOST_SUBDIR)/dejagnu/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/dejagnu"; \
-       libsrcdir="$$s/dejagnu"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=dejagnu; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif dejagnu
  
@@ -6494,7 +6704,7 @@ all-dejagnu: configure-dejagnu
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/dejagnu && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-dejagnu))
  @endif dejagnu
  
@@ -6510,7 +6720,7 @@ check-dejagnu:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
  
@@ -6563,7 +6773,7 @@ info-dejagnu: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in dejagnu" ; \
+       echo "Doing info in dejagnu"; \
         (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6589,7 +6799,7 @@ dvi-dejagnu: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in dejagnu" ; \
+       echo "Doing dvi in dejagnu"; \
         (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6615,7 +6825,7 @@ pdf-dejagnu: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing pdf in dejagnu" ; \
+       echo "Doing pdf in dejagnu"; \
         (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6641,7 +6851,7 @@ html-dejagnu: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing html in dejagnu" ; \
+       echo "Doing html in dejagnu"; \
         (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6667,7 +6877,7 @@ TAGS-dejagnu: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in dejagnu" ; \
+       echo "Doing TAGS in dejagnu"; \
         (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6694,7 +6904,7 @@ install-info-dejagnu: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in dejagnu" ; \
+       echo "Doing install-info in dejagnu"; \
         (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6721,7 +6931,7 @@ install-pdf-dejagnu: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-pdf in dejagnu" ; \
+       echo "Doing install-pdf in dejagnu"; \
         (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6748,7 +6958,7 @@ install-html-dejagnu: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-html in dejagnu" ; \
+       echo "Doing install-html in dejagnu"; \
         (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6774,7 +6984,7 @@ installcheck-dejagnu: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in dejagnu" ; \
+       echo "Doing installcheck in dejagnu"; \
         (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6799,7 +7009,7 @@ mostlyclean-dejagnu:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in dejagnu" ; \
+       echo "Doing mostlyclean in dejagnu"; \
         (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6824,7 +7034,7 @@ clean-dejagnu:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in dejagnu" ; \
+       echo "Doing clean in dejagnu"; \
         (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6849,7 +7059,7 @@ distclean-dejagnu:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in dejagnu" ; \
+       echo "Doing distclean in dejagnu"; \
         (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6874,7 +7084,7 @@ maintainer-clean-dejagnu:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in dejagnu" ; \
+       echo "Doing maintainer-clean in dejagnu"; \
         (cd $(HOST_SUBDIR)/dejagnu && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -6899,7 +7109,7 @@ configure-etc:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         test ! -f $(HOST_SUBDIR)/etc/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/etc ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/etc; \
         $(HOST_EXPORTS)  \
         echo Configuring in $(HOST_SUBDIR)/etc; \
         cd "$(HOST_SUBDIR)/etc" || exit 1; \
@@ -6908,11 +7118,12 @@ configure-etc:
           *) topdir=`echo $(HOST_SUBDIR)/etc/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/etc"; \
-       libsrcdir="$$s/etc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=etc; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif etc
  
@@ -6934,7 +7145,7 @@ all-etc: configure-etc
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/etc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-etc))
  @endif etc
  
@@ -6950,7 +7161,7 @@ check-etc:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(FLAGS_TO_PASS)  check)
  
@@ -7003,7 +7214,7 @@ info-etc: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in etc" ; \
+       echo "Doing info in etc"; \
         (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7029,7 +7240,7 @@ dvi-etc: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in etc" ; \
+       echo "Doing dvi in etc"; \
         (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7055,7 +7266,7 @@ pdf-etc: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing pdf in etc" ; \
+       echo "Doing pdf in etc"; \
         (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7081,7 +7292,7 @@ html-etc: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing html in etc" ; \
+       echo "Doing html in etc"; \
         (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7107,7 +7318,7 @@ TAGS-etc: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in etc" ; \
+       echo "Doing TAGS in etc"; \
         (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7134,7 +7345,7 @@ install-info-etc: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in etc" ; \
+       echo "Doing install-info in etc"; \
         (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7161,7 +7372,7 @@ install-pdf-etc: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-pdf in etc" ; \
+       echo "Doing install-pdf in etc"; \
         (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7188,7 +7399,7 @@ install-html-etc: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-html in etc" ; \
+       echo "Doing install-html in etc"; \
         (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7214,7 +7425,7 @@ installcheck-etc: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in etc" ; \
+       echo "Doing installcheck in etc"; \
         (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7239,7 +7450,7 @@ mostlyclean-etc:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in etc" ; \
+       echo "Doing mostlyclean in etc"; \
         (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7264,7 +7475,7 @@ clean-etc:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in etc" ; \
+       echo "Doing clean in etc"; \
         (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7289,7 +7500,7 @@ distclean-etc:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in etc" ; \
+       echo "Doing distclean in etc"; \
         (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7314,7 +7525,7 @@ maintainer-clean-etc:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in etc" ; \
+       echo "Doing maintainer-clean in etc"; \
         (cd $(HOST_SUBDIR)/etc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7339,7 +7550,7 @@ configure-fastjar:
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         test ! -f $(HOST_SUBDIR)/fastjar/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fastjar ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fastjar; \
         $(HOST_EXPORTS)  \
         echo Configuring in $(HOST_SUBDIR)/fastjar; \
         cd "$(HOST_SUBDIR)/fastjar" || exit 1; \
@@ -7348,11 +7559,12 @@ configure-fastjar:
           *) topdir=`echo $(HOST_SUBDIR)/fastjar/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/fastjar"; \
-       libsrcdir="$$s/fastjar"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=fastjar; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif fastjar
  
@@ -7374,7 +7586,7 @@ all-fastjar: configure-fastjar
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/fastjar && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-fastjar))
  @endif fastjar
  
@@ -7389,12 +7601,12 @@ maybe-check-fastjar: check-fastjar
  # This module is only tested in a native toolchain.
  check-fastjar:
         @: $(MAKE); $(unstage)
-       @if [ '$(host)' = '$(target)' ] ; then \
+       @if [ '$(host)' = '$(target)' ]; then \
           r=`${PWD_COMMAND}`; export r; \
           s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(HOST_EXPORTS) \
+         $(HOST_EXPORTS)  \
           (cd $(HOST_SUBDIR)/fastjar && \
-           $(MAKE) $(FLAGS_TO_PASS)  check); \
+           $(MAKE) $(FLAGS_TO_PASS)  check)
         fi
  
  @endif fastjar
@@ -7446,7 +7658,7 @@ info-fastjar: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in fastjar" ; \
+       echo "Doing info in fastjar"; \
         (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7472,7 +7684,7 @@ dvi-fastjar: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in fastjar" ; \
+       echo "Doing dvi in fastjar"; \
         (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7498,7 +7710,7 @@ pdf-fastjar: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing pdf in fastjar" ; \
+       echo "Doing pdf in fastjar"; \
         (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7524,7 +7736,7 @@ html-fastjar: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing html in fastjar" ; \
+       echo "Doing html in fastjar"; \
         (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7550,7 +7762,7 @@ TAGS-fastjar: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in fastjar" ; \
+       echo "Doing TAGS in fastjar"; \
         (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7577,7 +7789,7 @@ install-info-fastjar: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in fastjar" ; \
+       echo "Doing install-info in fastjar"; \
         (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7604,7 +7816,7 @@ install-pdf-fastjar: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-pdf in fastjar" ; \
+       echo "Doing install-pdf in fastjar"; \
         (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7631,7 +7843,7 @@ install-html-fastjar: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-html in fastjar" ; \
+       echo "Doing install-html in fastjar"; \
         (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7657,7 +7869,7 @@ installcheck-fastjar: \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in fastjar" ; \
+       echo "Doing installcheck in fastjar"; \
         (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7682,7 +7894,7 @@ mostlyclean-fastjar:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in fastjar" ; \
+       echo "Doing mostlyclean in fastjar"; \
         (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7707,7 +7919,7 @@ clean-fastjar:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in fastjar" ; \
+       echo "Doing clean in fastjar"; \
         (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7732,7 +7944,7 @@ distclean-fastjar:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in fastjar" ; \
+       echo "Doing distclean in fastjar"; \
         (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7757,7 +7969,7 @@ maintainer-clean-fastjar:
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in fastjar" ; \
+       echo "Doing maintainer-clean in fastjar"; \
         (cd $(HOST_SUBDIR)/fastjar && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -7778,11 +7990,10 @@ configure-fixincludes: stage_current
  @if fixincludes
  maybe-configure-fixincludes: configure-fixincludes
  configure-fixincludes: 
-       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
-       $(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; \
@@ -7791,16 +8002,216 @@ configure-fixincludes:
           *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/fixincludes"; \
-       libsrcdir="$$s/fixincludes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=fixincludes; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif fixincludes
  
  
  
+.PHONY: configure-stage1-fixincludes maybe-configure-stage1-fixincludes
+maybe-configure-stage1-fixincludes:
+@if fixincludes-bootstrap
+maybe-configure-stage1-fixincludes: configure-stage1-fixincludes
+configure-stage1-fixincludes:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/fixincludes; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes; \
+       cd $(HOST_SUBDIR)/fixincludes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=fixincludes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif fixincludes-bootstrap
+
+.PHONY: configure-stage2-fixincludes maybe-configure-stage2-fixincludes
+maybe-configure-stage2-fixincludes:
+@if fixincludes-bootstrap
+maybe-configure-stage2-fixincludes: configure-stage2-fixincludes
+configure-stage2-fixincludes:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/fixincludes; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes; \
+       cd $(HOST_SUBDIR)/fixincludes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=fixincludes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif fixincludes-bootstrap
+
+.PHONY: configure-stage3-fixincludes maybe-configure-stage3-fixincludes
+maybe-configure-stage3-fixincludes:
+@if fixincludes-bootstrap
+maybe-configure-stage3-fixincludes: configure-stage3-fixincludes
+configure-stage3-fixincludes:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/fixincludes; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes; \
+       cd $(HOST_SUBDIR)/fixincludes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=fixincludes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif fixincludes-bootstrap
+
+.PHONY: configure-stage4-fixincludes maybe-configure-stage4-fixincludes
+maybe-configure-stage4-fixincludes:
+@if fixincludes-bootstrap
+maybe-configure-stage4-fixincludes: configure-stage4-fixincludes
+configure-stage4-fixincludes:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/fixincludes; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes; \
+       cd $(HOST_SUBDIR)/fixincludes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=fixincludes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif fixincludes-bootstrap
+
+.PHONY: configure-stageprofile-fixincludes maybe-configure-stageprofile-fixincludes
+maybe-configure-stageprofile-fixincludes:
+@if fixincludes-bootstrap
+maybe-configure-stageprofile-fixincludes: configure-stageprofile-fixincludes
+configure-stageprofile-fixincludes:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage profile in $(HOST_SUBDIR)/fixincludes; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes; \
+       cd $(HOST_SUBDIR)/fixincludes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=fixincludes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif fixincludes-bootstrap
+
+.PHONY: configure-stagefeedback-fixincludes maybe-configure-stagefeedback-fixincludes
+maybe-configure-stagefeedback-fixincludes:
+@if fixincludes-bootstrap
+maybe-configure-stagefeedback-fixincludes: configure-stagefeedback-fixincludes
+configure-stagefeedback-fixincludes:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/fixincludes; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes; \
+       cd $(HOST_SUBDIR)/fixincludes || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=fixincludes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif fixincludes-bootstrap
+
+
+
  
  
  .PHONY: all-fixincludes maybe-all-fixincludes
@@ -7812,17 +8223,271 @@ all-fixincludes: stage_current
  TARGET-fixincludes=all
  maybe-all-fixincludes: all-fixincludes
  all-fixincludes: configure-fixincludes
-       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/fixincludes && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-fixincludes))
  @endif fixincludes
  
  
  
+.PHONY: all-stage1-fixincludes maybe-all-stage1-fixincludes
+.PHONY: clean-stage1-fixincludes maybe-clean-stage1-fixincludes
+maybe-all-stage1-fixincludes:
+maybe-clean-stage1-fixincludes:
+@if fixincludes-bootstrap
+maybe-all-stage1-fixincludes: all-stage1-fixincludes
+all-stage1: all-stage1-fixincludes
+TARGET-stage1-fixincludes = $(TARGET-fixincludes)
+all-stage1-fixincludes: configure-stage1-fixincludes
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/fixincludes && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE1_CFLAGS)" \
+               CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+               LIBCFLAGS="$(LIBCFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
+               $(TARGET-stage1-fixincludes)
+
+maybe-clean-stage1-fixincludes: clean-stage1-fixincludes
+clean-stage1: clean-stage1-fixincludes
+clean-stage1-fixincludes:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/fixincludes/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-fixincludes/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/fixincludes && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif fixincludes-bootstrap
+
+
+.PHONY: all-stage2-fixincludes maybe-all-stage2-fixincludes
+.PHONY: clean-stage2-fixincludes maybe-clean-stage2-fixincludes
+maybe-all-stage2-fixincludes:
+maybe-clean-stage2-fixincludes:
+@if fixincludes-bootstrap
+maybe-all-stage2-fixincludes: all-stage2-fixincludes
+all-stage2: all-stage2-fixincludes
+TARGET-stage2-fixincludes = $(TARGET-fixincludes)
+all-stage2-fixincludes: configure-stage2-fixincludes
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/fixincludes && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE2_CFLAGS)" \
+               CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGE2_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
+               $(TARGET-stage2-fixincludes)
+
+maybe-clean-stage2-fixincludes: clean-stage2-fixincludes
+clean-stage2: clean-stage2-fixincludes
+clean-stage2-fixincludes:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/fixincludes/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-fixincludes/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/fixincludes && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif fixincludes-bootstrap
+
+
+.PHONY: all-stage3-fixincludes maybe-all-stage3-fixincludes
+.PHONY: clean-stage3-fixincludes maybe-clean-stage3-fixincludes
+maybe-all-stage3-fixincludes:
+maybe-clean-stage3-fixincludes:
+@if fixincludes-bootstrap
+maybe-all-stage3-fixincludes: all-stage3-fixincludes
+all-stage3: all-stage3-fixincludes
+TARGET-stage3-fixincludes = $(TARGET-fixincludes)
+all-stage3-fixincludes: configure-stage3-fixincludes
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/fixincludes && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE3_CFLAGS)" \
+               CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGE3_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
+               $(TARGET-stage3-fixincludes)
+
+maybe-clean-stage3-fixincludes: clean-stage3-fixincludes
+clean-stage3: clean-stage3-fixincludes
+clean-stage3-fixincludes:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/fixincludes/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-fixincludes/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/fixincludes && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif fixincludes-bootstrap
+
+
+.PHONY: all-stage4-fixincludes maybe-all-stage4-fixincludes
+.PHONY: clean-stage4-fixincludes maybe-clean-stage4-fixincludes
+maybe-all-stage4-fixincludes:
+maybe-clean-stage4-fixincludes:
+@if fixincludes-bootstrap
+maybe-all-stage4-fixincludes: all-stage4-fixincludes
+all-stage4: all-stage4-fixincludes
+TARGET-stage4-fixincludes = $(TARGET-fixincludes)
+all-stage4-fixincludes: configure-stage4-fixincludes
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/fixincludes && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE4_CFLAGS)" \
+               CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGE4_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
+               $(TARGET-stage4-fixincludes)
+
+maybe-clean-stage4-fixincludes: clean-stage4-fixincludes
+clean-stage4: clean-stage4-fixincludes
+clean-stage4-fixincludes:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/fixincludes/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-fixincludes/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/fixincludes && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif fixincludes-bootstrap
+
+
+.PHONY: all-stageprofile-fixincludes maybe-all-stageprofile-fixincludes
+.PHONY: clean-stageprofile-fixincludes maybe-clean-stageprofile-fixincludes
+maybe-all-stageprofile-fixincludes:
+maybe-clean-stageprofile-fixincludes:
+@if fixincludes-bootstrap
+maybe-all-stageprofile-fixincludes: all-stageprofile-fixincludes
+all-stageprofile: all-stageprofile-fixincludes
+TARGET-stageprofile-fixincludes = $(TARGET-fixincludes)
+all-stageprofile-fixincludes: configure-stageprofile-fixincludes
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/fixincludes && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGEprofile_CFLAGS)" \
+               CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
+               $(TARGET-stageprofile-fixincludes)
+
+maybe-clean-stageprofile-fixincludes: clean-stageprofile-fixincludes
+clean-stageprofile: clean-stageprofile-fixincludes
+clean-stageprofile-fixincludes:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/fixincludes/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-fixincludes/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/fixincludes && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif fixincludes-bootstrap
+
+
+.PHONY: all-stagefeedback-fixincludes maybe-all-stagefeedback-fixincludes
+.PHONY: clean-stagefeedback-fixincludes maybe-clean-stagefeedback-fixincludes
+maybe-all-stagefeedback-fixincludes:
+maybe-clean-stagefeedback-fixincludes:
+@if fixincludes-bootstrap
+maybe-all-stagefeedback-fixincludes: all-stagefeedback-fixincludes
+all-stagefeedback: all-stagefeedback-fixincludes
+TARGET-stagefeedback-fixincludes = $(TARGET-fixincludes)
+all-stagefeedback-fixincludes: configure-stagefeedback-fixincludes
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/fixincludes && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
+               $(TARGET-stagefeedback-fixincludes)
+
+maybe-clean-stagefeedback-fixincludes: clean-stagefeedback-fixincludes
+clean-stagefeedback: clean-stagefeedback-fixincludes
+clean-stagefeedback-fixincludes:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/fixincludes/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-fixincludes/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/fixincludes && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif fixincludes-bootstrap
+
+
+
+
  
  .PHONY: check-fixincludes maybe-check-fixincludes
  maybe-check-fixincludes:
@@ -7833,9 +8498,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
  
@@ -7878,7 +8543,6 @@ maybe-info-fixincludes: info-fixincludes
  
  info-fixincludes: \
      configure-fixincludes 
-       @: $(MAKE); $(unstage)
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7886,7 +8550,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}" \
@@ -7904,7 +8568,6 @@ maybe-dvi-fixincludes: dvi-fixincludes
  
  dvi-fixincludes: \
      configure-fixincludes 
-       @: $(MAKE); $(unstage)
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7912,7 +8575,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}" \
@@ -7930,7 +8593,6 @@ maybe-pdf-fixincludes: pdf-fixincludes
  
  pdf-fixincludes: \
      configure-fixincludes 
-       @: $(MAKE); $(unstage)
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7938,7 +8600,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}" \
@@ -7956,7 +8618,6 @@ maybe-html-fixincludes: html-fixincludes
  
  html-fixincludes: \
      configure-fixincludes 
-       @: $(MAKE); $(unstage)
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7964,7 +8625,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}" \
@@ -7993,7 +8654,6 @@ maybe-install-info-fixincludes: install-info-fixincludes
  install-info-fixincludes: \
      configure-fixincludes \
      info-fixincludes 
-       @: $(MAKE); $(unstage)
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8001,7 +8661,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}" \
@@ -8020,7 +8680,6 @@ maybe-install-pdf-fixincludes: install-pdf-fixincludes
  install-pdf-fixincludes: \
      configure-fixincludes \
      pdf-fixincludes 
-       @: $(MAKE); $(unstage)
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8028,7 +8687,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}" \
@@ -8047,7 +8706,6 @@ maybe-install-html-fixincludes: install-html-fixincludes
  install-html-fixincludes: \
      configure-fixincludes \
      html-fixincludes 
-       @: $(MAKE); $(unstage)
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8055,7 +8713,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}" \
@@ -8073,7 +8731,6 @@ maybe-installcheck-fixincludes: installcheck-fixincludes
  
  installcheck-fixincludes: \
      configure-fixincludes 
-       @: $(MAKE); $(unstage)
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8081,7 +8738,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}" \
@@ -8098,7 +8755,6 @@ maybe-mostlyclean-fixincludes:
  maybe-mostlyclean-fixincludes: mostlyclean-fixincludes
  
  mostlyclean-fixincludes: 
-       @: $(MAKE); $(unstage)
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8106,7 +8762,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}" \
@@ -8123,7 +8779,6 @@ maybe-clean-fixincludes:
  maybe-clean-fixincludes: clean-fixincludes
  
  clean-fixincludes: 
-       @: $(MAKE); $(unstage)
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8131,7 +8786,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}" \
@@ -8148,7 +8803,6 @@ maybe-distclean-fixincludes:
  maybe-distclean-fixincludes: distclean-fixincludes
  
  distclean-fixincludes: 
-       @: $(MAKE); $(unstage)
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8156,7 +8810,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}" \
@@ -8173,7 +8827,6 @@ maybe-maintainer-clean-fixincludes:
  maybe-maintainer-clean-fixincludes: maintainer-clean-fixincludes
  
  maintainer-clean-fixincludes: 
-       @: $(MAKE); $(unstage)
         @[ -f ./fixincludes/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8181,7 +8834,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}" \
@@ -8206,7 +8859,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; \
@@ -8215,11 +8868,12 @@ configure-flex:
           *) topdir=`echo $(HOST_SUBDIR)/flex/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/flex"; \
-       libsrcdir="$$s/flex"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=flex; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif flex
  
@@ -8241,7 +8895,7 @@ all-flex: configure-flex
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/flex && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-flex))
  @endif flex
  
@@ -8256,12 +8910,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
@@ -8313,7 +8967,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}" \
@@ -8339,7 +8993,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}" \
@@ -8365,7 +9019,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}" \
@@ -8391,7 +9045,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}" \
@@ -8417,7 +9071,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}" \
@@ -8444,7 +9098,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}" \
@@ -8471,7 +9125,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}" \
@@ -8498,7 +9152,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}" \
@@ -8524,7 +9178,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}" \
@@ -8549,7 +9203,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}" \
@@ -8574,7 +9228,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}" \
@@ -8599,7 +9253,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}" \
@@ -8624,7 +9278,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}" \
@@ -8648,7 +9302,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; \
@@ -8657,11 +9311,12 @@ configure-gas:
           *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gas; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif gas
  
@@ -8682,19 +9337,20 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gas; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
           $(STAGE1_CONFIGURE_FLAGS)
  @endif gas-bootstrap
  
@@ -8714,19 +9370,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gas; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE2_CONFIGURE_FLAGS)
  @endif gas-bootstrap
@@ -8747,19 +9403,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gas; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE3_CONFIGURE_FLAGS)
  @endif gas-bootstrap
@@ -8780,19 +9436,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gas; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE4_CONFIGURE_FLAGS)
  @endif gas-bootstrap
@@ -8813,19 +9469,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gas; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEprofile_CONFIGURE_FLAGS)
  @endif gas-bootstrap
@@ -8846,19 +9502,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gas; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEfeedback_CONFIGURE_FLAGS)
  @endif gas-bootstrap
@@ -8880,7 +9536,7 @@ all-gas: configure-gas
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/gas && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-gas))
  @endif gas
  
@@ -8901,6 +9557,7 @@ all-stage1-gas: configure-stage1-gas
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gas && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -8908,8 +9565,9 @@ all-stage1-gas: configure-stage1-gas
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-gas)
  
  maybe-clean-stage1-gas: clean-stage1-gas
@@ -8923,7 +9581,7 @@ clean-stage1-gas:
         fi; \
         cd $(HOST_SUBDIR)/gas && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
  @endif gas-bootstrap
  
  
@@ -8943,6 +9601,7 @@ all-stage2-gas: configure-stage2-gas
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gas && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -8951,7 +9610,7 @@ all-stage2-gas: configure-stage2-gas
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-gas)
  
  maybe-clean-stage2-gas: clean-stage2-gas
@@ -8964,9 +9623,7 @@ clean-stage2-gas:
           $(MAKE) stage2-start; \
         fi; \
         cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif gas-bootstrap
  
  
@@ -8986,6 +9643,7 @@ all-stage3-gas: configure-stage3-gas
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gas && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -8994,7 +9652,7 @@ all-stage3-gas: configure-stage3-gas
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-gas)
  
  maybe-clean-stage3-gas: clean-stage3-gas
@@ -9007,9 +9665,7 @@ clean-stage3-gas:
           $(MAKE) stage3-start; \
         fi; \
         cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif gas-bootstrap
  
  
@@ -9029,6 +9685,7 @@ all-stage4-gas: configure-stage4-gas
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gas && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -9037,7 +9694,7 @@ all-stage4-gas: configure-stage4-gas
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-gas)
  
  maybe-clean-stage4-gas: clean-stage4-gas
@@ -9050,9 +9707,7 @@ clean-stage4-gas:
           $(MAKE) stage4-start; \
         fi; \
         cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif gas-bootstrap
  
  
@@ -9072,6 +9727,7 @@ all-stageprofile-gas: configure-stageprofile-gas
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gas && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -9080,7 +9736,7 @@ all-stageprofile-gas: configure-stageprofile-gas
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-gas)
  
  maybe-clean-stageprofile-gas: clean-stageprofile-gas
@@ -9093,9 +9749,7 @@ clean-stageprofile-gas:
           $(MAKE) stageprofile-start; \
         fi; \
         cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif gas-bootstrap
  
  
@@ -9115,6 +9769,7 @@ all-stagefeedback-gas: configure-stagefeedback-gas
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gas && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -9123,7 +9778,7 @@ all-stagefeedback-gas: configure-stagefeedback-gas
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-gas)
  
  maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
@@ -9136,9 +9791,7 @@ clean-stagefeedback-gas:
           $(MAKE) stagefeedback-start; \
         fi; \
         cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif gas-bootstrap
  
  
@@ -9154,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
  
@@ -9206,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}" \
@@ -9231,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}" \
@@ -9256,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}" \
@@ -9281,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}" \
@@ -9306,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}" \
@@ -9332,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}" \
@@ -9358,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}" \
@@ -9384,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}" \
@@ -9409,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}" \
@@ -9433,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}" \
@@ -9457,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}" \
@@ -9481,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}" \
@@ -9505,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}" \
@@ -9529,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; \
@@ -9538,11 +10191,12 @@ configure-gcc:
           *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gcc; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif gcc
  
@@ -9563,19 +10217,20 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
           $(STAGE1_CONFIGURE_FLAGS)
  @endif gcc-bootstrap
  
@@ -9595,19 +10250,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE2_CONFIGURE_FLAGS)
  @endif gcc-bootstrap
@@ -9628,19 +10283,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE3_CONFIGURE_FLAGS)
  @endif gcc-bootstrap
@@ -9661,19 +10316,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE4_CONFIGURE_FLAGS)
  @endif gcc-bootstrap
@@ -9694,19 +10349,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEprofile_CONFIGURE_FLAGS)
  @endif gcc-bootstrap
@@ -9727,19 +10382,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEfeedback_CONFIGURE_FLAGS)
  @endif gcc-bootstrap
@@ -9761,7 +10416,7 @@ all-gcc: configure-gcc
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
                 $(TARGET-gcc))
  @endif gcc
  
@@ -9782,6 +10437,7 @@ all-stage1-gcc: configure-stage1-gcc
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gcc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -9789,8 +10445,9 @@ all-stage1-gcc: configure-stage1-gcc
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)  $(EXTRA_GCC_FLAGS) \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-gcc)
  
  maybe-clean-stage1-gcc: clean-stage1-gcc
@@ -9804,7 +10461,7 @@ clean-stage1-gcc:
         fi; \
         cd $(HOST_SUBDIR)/gcc && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(EXTRA_GCC_FLAGS) clean
+       $(STAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
  @endif gcc-bootstrap
  
  
@@ -9824,6 +10481,7 @@ all-stage2-gcc: configure-stage2-gcc
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gcc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -9832,7 +10490,7 @@ all-stage2-gcc: configure-stage2-gcc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-gcc)
  
  maybe-clean-stage2-gcc: clean-stage2-gcc
@@ -9845,9 +10503,7 @@ clean-stage2-gcc:
           $(MAKE) stage2-start; \
         fi; \
         cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
  @endif gcc-bootstrap
  
  
@@ -9867,6 +10523,7 @@ all-stage3-gcc: configure-stage3-gcc
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gcc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -9875,7 +10532,7 @@ all-stage3-gcc: configure-stage3-gcc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-gcc)
  
  maybe-clean-stage3-gcc: clean-stage3-gcc
@@ -9888,9 +10545,7 @@ clean-stage3-gcc:
           $(MAKE) stage3-start; \
         fi; \
         cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
  @endif gcc-bootstrap
  
  
@@ -9910,6 +10565,7 @@ all-stage4-gcc: configure-stage4-gcc
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gcc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -9918,7 +10574,7 @@ all-stage4-gcc: configure-stage4-gcc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-gcc)
  
  maybe-clean-stage4-gcc: clean-stage4-gcc
@@ -9931,9 +10587,7 @@ clean-stage4-gcc:
           $(MAKE) stage4-start; \
         fi; \
         cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
  @endif gcc-bootstrap
  
  
@@ -9953,6 +10607,7 @@ all-stageprofile-gcc: configure-stageprofile-gcc
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gcc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -9961,7 +10616,7 @@ all-stageprofile-gcc: configure-stageprofile-gcc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-gcc)
  
  maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
@@ -9974,9 +10629,7 @@ clean-stageprofile-gcc:
           $(MAKE) stageprofile-start; \
         fi; \
         cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
  @endif gcc-bootstrap
  
  
@@ -9996,6 +10649,7 @@ all-stagefeedback-gcc: configure-stagefeedback-gcc
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gcc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -10004,7 +10658,7 @@ all-stagefeedback-gcc: configure-stagefeedback-gcc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-gcc)
  
  maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
@@ -10017,9 +10671,7 @@ clean-stagefeedback-gcc:
           $(MAKE) stagefeedback-start; \
         fi; \
         cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
  @endif gcc-bootstrap
  
  
@@ -10035,9 +10687,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
  
@@ -10087,7 +10739,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}" \
@@ -10112,7 +10764,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}" \
@@ -10137,7 +10789,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}" \
@@ -10162,7 +10814,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}" \
@@ -10187,7 +10839,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}" \
@@ -10213,7 +10865,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}" \
@@ -10239,7 +10891,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}" \
@@ -10265,7 +10917,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}" \
@@ -10290,7 +10942,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}" \
@@ -10314,7 +10966,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}" \
@@ -10338,7 +10990,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}" \
@@ -10362,7 +11014,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}" \
@@ -10386,7 +11038,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}" \
@@ -10410,7 +11062,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; \
@@ -10419,11 +11071,12 @@ configure-gmp:
           *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gmp"; \
-       libsrcdir="$$s/gmp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gmp; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} --disable-shared \
+         --target=none-${host_vendor}-${host_os} --disable-shared LEX="touch lex.yy.c" \
           || exit 1
  @endif gmp
  
@@ -10444,21 +11097,22 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gmp"; \
-       libsrcdir="$$s/gmp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gmp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
+         --target=none-${host_vendor}-${host_os} \
+          \
           $(STAGE1_CONFIGURE_FLAGS) \
-         --disable-shared
+         --disable-shared LEX="touch lex.yy.c"
  @endif gmp-bootstrap
  
  .PHONY: configure-stage2-gmp maybe-configure-stage2-gmp
@@ -10477,22 +11131,22 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gmp"; \
-       libsrcdir="$$s/gmp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gmp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
+         --target=none-${host_vendor}-${host_os} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE2_CONFIGURE_FLAGS) \
-         --disable-shared
+         --disable-shared LEX="touch lex.yy.c"
  @endif gmp-bootstrap
  
  .PHONY: configure-stage3-gmp maybe-configure-stage3-gmp
@@ -10511,22 +11165,22 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gmp"; \
-       libsrcdir="$$s/gmp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gmp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
+         --target=none-${host_vendor}-${host_os} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE3_CONFIGURE_FLAGS) \
-         --disable-shared
+         --disable-shared LEX="touch lex.yy.c"
  @endif gmp-bootstrap
  
  .PHONY: configure-stage4-gmp maybe-configure-stage4-gmp
@@ -10545,22 +11199,22 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gmp"; \
-       libsrcdir="$$s/gmp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gmp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
+         --target=none-${host_vendor}-${host_os} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE4_CONFIGURE_FLAGS) \
-         --disable-shared
+         --disable-shared LEX="touch lex.yy.c"
  @endif gmp-bootstrap
  
  .PHONY: configure-stageprofile-gmp maybe-configure-stageprofile-gmp
@@ -10579,22 +11233,22 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gmp"; \
-       libsrcdir="$$s/gmp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gmp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
+         --target=none-${host_vendor}-${host_os} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEprofile_CONFIGURE_FLAGS) \
-         --disable-shared
+         --disable-shared LEX="touch lex.yy.c"
  @endif gmp-bootstrap
  
  .PHONY: configure-stagefeedback-gmp maybe-configure-stagefeedback-gmp
@@ -10613,22 +11267,22 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gmp"; \
-       libsrcdir="$$s/gmp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gmp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
+         --target=none-${host_vendor}-${host_os} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEfeedback_CONFIGURE_FLAGS) \
-         --disable-shared
+         --disable-shared LEX="touch lex.yy.c"
  @endif gmp-bootstrap
  
  
@@ -10648,7 +11302,7 @@ all-gmp: configure-gmp
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/gmp && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
                 $(TARGET-gmp))
  @endif gmp
  
@@ -10669,6 +11323,7 @@ all-stage1-gmp: configure-stage1-gmp
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gmp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -10676,8 +11331,9 @@ all-stage1-gmp: configure-stage1-gmp
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-gmp)
  
  maybe-clean-stage1-gmp: clean-stage1-gmp
@@ -10691,7 +11347,7 @@ clean-stage1-gmp:
         fi; \
         cd $(HOST_SUBDIR)/gmp && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif gmp-bootstrap
  
  
@@ -10711,6 +11367,7 @@ all-stage2-gmp: configure-stage2-gmp
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gmp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -10718,8 +11375,8 @@ all-stage2-gmp: configure-stage2-gmp
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-gmp)
  
  maybe-clean-stage2-gmp: clean-stage2-gmp
@@ -10732,9 +11389,7 @@ clean-stage2-gmp:
           $(MAKE) stage2-start; \
         fi; \
         cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif gmp-bootstrap
  
  
@@ -10754,6 +11409,7 @@ all-stage3-gmp: configure-stage3-gmp
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gmp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -10761,8 +11417,8 @@ all-stage3-gmp: configure-stage3-gmp
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-gmp)
  
  maybe-clean-stage3-gmp: clean-stage3-gmp
@@ -10775,9 +11431,7 @@ clean-stage3-gmp:
           $(MAKE) stage3-start; \
         fi; \
         cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif gmp-bootstrap
  
  
@@ -10797,6 +11451,7 @@ all-stage4-gmp: configure-stage4-gmp
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gmp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -10804,8 +11459,8 @@ all-stage4-gmp: configure-stage4-gmp
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-gmp)
  
  maybe-clean-stage4-gmp: clean-stage4-gmp
@@ -10818,9 +11473,7 @@ clean-stage4-gmp:
           $(MAKE) stage4-start; \
         fi; \
         cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif gmp-bootstrap
  
  
@@ -10840,6 +11493,7 @@ all-stageprofile-gmp: configure-stageprofile-gmp
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gmp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -10847,8 +11501,8 @@ all-stageprofile-gmp: configure-stageprofile-gmp
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-gmp)
  
  maybe-clean-stageprofile-gmp: clean-stageprofile-gmp
@@ -10861,9 +11515,7 @@ clean-stageprofile-gmp:
           $(MAKE) stageprofile-start; \
         fi; \
         cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif gmp-bootstrap
  
  
@@ -10883,6 +11535,7 @@ all-stagefeedback-gmp: configure-stagefeedback-gmp
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gmp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -10890,8 +11543,8 @@ all-stagefeedback-gmp: configure-stagefeedback-gmp
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-gmp)
  
  maybe-clean-stagefeedback-gmp: clean-stagefeedback-gmp
@@ -10904,9 +11557,7 @@ clean-stagefeedback-gmp:
           $(MAKE) stagefeedback-start; \
         fi; \
         cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif gmp-bootstrap
  
  
@@ -10922,9 +11573,9 @@ check-gmp:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gmp && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" $(EXTRA_BOOTSTRAP_FLAGS) check)
  
  @endif gmp
  
@@ -10959,10 +11610,10 @@ info-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in gmp" ; \
+       echo "Doing info in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -10984,10 +11635,10 @@ dvi-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in gmp" ; \
+       echo "Doing dvi in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11009,10 +11660,10 @@ pdf-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing pdf in gmp" ; \
+       echo "Doing pdf in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11034,10 +11685,10 @@ html-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing html in gmp" ; \
+       echo "Doing html in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11059,10 +11710,10 @@ TAGS-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in gmp" ; \
+       echo "Doing TAGS in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11085,10 +11736,10 @@ install-info-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in gmp" ; \
+       echo "Doing install-info in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11111,10 +11762,10 @@ install-pdf-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-pdf in gmp" ; \
+       echo "Doing install-pdf in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11137,10 +11788,10 @@ install-html-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-html in gmp" ; \
+       echo "Doing install-html in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11162,10 +11813,10 @@ installcheck-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in gmp" ; \
+       echo "Doing installcheck in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11186,10 +11837,10 @@ mostlyclean-gmp:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in gmp" ; \
+       echo "Doing mostlyclean in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11210,10 +11861,10 @@ clean-gmp:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in gmp" ; \
+       echo "Doing clean in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11234,10 +11885,10 @@ distclean-gmp:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in gmp" ; \
+       echo "Doing distclean in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11258,10 +11909,10 @@ maintainer-clean-gmp:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in gmp" ; \
+       echo "Doing maintainer-clean in gmp"; \
         (cd $(HOST_SUBDIR)/gmp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11285,7 +11936,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; \
@@ -11294,11 +11945,12 @@ configure-mpfr:
           *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/mpfr"; \
-       libsrcdir="$$s/mpfr"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpfr; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} --disable-shared @extra_mpfr_configure_flags@ \
+         --target=${target_alias} --disable-shared @extra_mpfr_configure_flags@ \
           || exit 1
  @endif mpfr
  
@@ -11319,19 +11971,20 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/mpfr"; \
-       libsrcdir="$$s/mpfr"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpfr; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
           $(STAGE1_CONFIGURE_FLAGS) \
           --disable-shared @extra_mpfr_configure_flags@
  @endif mpfr-bootstrap
@@ -11352,19 +12005,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/mpfr"; \
-       libsrcdir="$$s/mpfr"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpfr; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE2_CONFIGURE_FLAGS) \
           --disable-shared @extra_mpfr_configure_flags@
@@ -11386,19 +12039,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/mpfr"; \
-       libsrcdir="$$s/mpfr"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpfr; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE3_CONFIGURE_FLAGS) \
           --disable-shared @extra_mpfr_configure_flags@
@@ -11420,19 +12073,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/mpfr"; \
-       libsrcdir="$$s/mpfr"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpfr; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE4_CONFIGURE_FLAGS) \
           --disable-shared @extra_mpfr_configure_flags@
@@ -11454,19 +12107,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/mpfr"; \
-       libsrcdir="$$s/mpfr"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpfr; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEprofile_CONFIGURE_FLAGS) \
           --disable-shared @extra_mpfr_configure_flags@
@@ -11488,19 +12141,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/mpfr"; \
-       libsrcdir="$$s/mpfr"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpfr; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEfeedback_CONFIGURE_FLAGS) \
           --disable-shared @extra_mpfr_configure_flags@
@@ -11523,7 +12176,7 @@ all-mpfr: configure-mpfr
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/mpfr && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
                 $(TARGET-mpfr))
  @endif mpfr
  
@@ -11544,6 +12197,7 @@ all-stage1-mpfr: configure-stage1-mpfr
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpfr && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -11551,8 +12205,9 @@ all-stage1-mpfr: configure-stage1-mpfr
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-mpfr)
  
  maybe-clean-stage1-mpfr: clean-stage1-mpfr
@@ -11566,7 +12221,7 @@ clean-stage1-mpfr:
         fi; \
         cd $(HOST_SUBDIR)/mpfr && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif mpfr-bootstrap
  
  
@@ -11586,6 +12241,7 @@ all-stage2-mpfr: configure-stage2-mpfr
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpfr && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -11593,8 +12249,8 @@ all-stage2-mpfr: configure-stage2-mpfr
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-mpfr)
  
  maybe-clean-stage2-mpfr: clean-stage2-mpfr
@@ -11607,9 +12263,7 @@ clean-stage2-mpfr:
           $(MAKE) stage2-start; \
         fi; \
         cd $(HOST_SUBDIR)/mpfr && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif mpfr-bootstrap
  
  
@@ -11629,6 +12283,7 @@ all-stage3-mpfr: configure-stage3-mpfr
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpfr && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -11636,8 +12291,8 @@ all-stage3-mpfr: configure-stage3-mpfr
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-mpfr)
  
  maybe-clean-stage3-mpfr: clean-stage3-mpfr
@@ -11650,9 +12305,7 @@ clean-stage3-mpfr:
           $(MAKE) stage3-start; \
         fi; \
         cd $(HOST_SUBDIR)/mpfr && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif mpfr-bootstrap
  
  
@@ -11672,6 +12325,7 @@ all-stage4-mpfr: configure-stage4-mpfr
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpfr && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -11679,8 +12333,8 @@ all-stage4-mpfr: configure-stage4-mpfr
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-mpfr)
  
  maybe-clean-stage4-mpfr: clean-stage4-mpfr
@@ -11693,9 +12347,7 @@ clean-stage4-mpfr:
           $(MAKE) stage4-start; \
         fi; \
         cd $(HOST_SUBDIR)/mpfr && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif mpfr-bootstrap
  
  
@@ -11715,6 +12367,7 @@ all-stageprofile-mpfr: configure-stageprofile-mpfr
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpfr && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -11722,8 +12375,8 @@ all-stageprofile-mpfr: configure-stageprofile-mpfr
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-mpfr)
  
  maybe-clean-stageprofile-mpfr: clean-stageprofile-mpfr
@@ -11736,9 +12389,7 @@ clean-stageprofile-mpfr:
           $(MAKE) stageprofile-start; \
         fi; \
         cd $(HOST_SUBDIR)/mpfr && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif mpfr-bootstrap
  
  
@@ -11758,6 +12409,7 @@ all-stagefeedback-mpfr: configure-stagefeedback-mpfr
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpfr && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -11765,8 +12417,8 @@ all-stagefeedback-mpfr: configure-stagefeedback-mpfr
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-mpfr)
  
  maybe-clean-stagefeedback-mpfr: clean-stagefeedback-mpfr
@@ -11779,9 +12431,7 @@ clean-stagefeedback-mpfr:
           $(MAKE) stagefeedback-start; \
         fi; \
         cd $(HOST_SUBDIR)/mpfr && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif mpfr-bootstrap
  
  
@@ -11797,9 +12447,9 @@ check-mpfr:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/mpfr && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" $(EXTRA_BOOTSTRAP_FLAGS) check)
  
  @endif mpfr
  
@@ -11834,10 +12484,10 @@ info-mpfr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in mpfr" ; \
+       echo "Doing info in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11859,10 +12509,10 @@ dvi-mpfr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in mpfr" ; \
+       echo "Doing dvi in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11884,10 +12534,10 @@ pdf-mpfr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing pdf in mpfr" ; \
+       echo "Doing pdf in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11909,10 +12559,10 @@ html-mpfr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing html in mpfr" ; \
+       echo "Doing html in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11934,10 +12584,10 @@ TAGS-mpfr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in mpfr" ; \
+       echo "Doing TAGS in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11960,10 +12610,10 @@ install-info-mpfr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in mpfr" ; \
+       echo "Doing install-info in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -11986,10 +12636,10 @@ install-pdf-mpfr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-pdf in mpfr" ; \
+       echo "Doing install-pdf in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12012,10 +12662,10 @@ install-html-mpfr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-html in mpfr" ; \
+       echo "Doing install-html in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12037,10 +12687,10 @@ installcheck-mpfr: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in mpfr" ; \
+       echo "Doing installcheck in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12061,10 +12711,10 @@ mostlyclean-mpfr:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in mpfr" ; \
+       echo "Doing mostlyclean in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12085,10 +12735,10 @@ clean-mpfr:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in mpfr" ; \
+       echo "Doing clean in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12109,10 +12759,10 @@ distclean-mpfr:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in mpfr" ; \
+       echo "Doing distclean in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12133,10 +12783,10 @@ maintainer-clean-mpfr:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in mpfr" ; \
+       echo "Doing maintainer-clean in mpfr"; \
         (cd $(HOST_SUBDIR)/mpfr && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -12160,7 +12810,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; \
@@ -12169,11 +12819,12 @@ configure-mpc:
           *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/mpc"; \
-       libsrcdir="$$s/mpc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpc; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ \
+         --target=${target_alias} --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ \
           || exit 1
  @endif mpc
  
@@ -12194,19 +12845,20 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/mpc"; \
-       libsrcdir="$$s/mpc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
           $(STAGE1_CONFIGURE_FLAGS) \
           --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
  @endif mpc-bootstrap
@@ -12227,19 +12879,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/mpc"; \
-       libsrcdir="$$s/mpc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE2_CONFIGURE_FLAGS) \
           --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
@@ -12261,19 +12913,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/mpc"; \
-       libsrcdir="$$s/mpc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE3_CONFIGURE_FLAGS) \
           --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
@@ -12295,19 +12947,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/mpc"; \
-       libsrcdir="$$s/mpc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE4_CONFIGURE_FLAGS) \
           --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
@@ -12329,19 +12981,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/mpc"; \
-       libsrcdir="$$s/mpc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEprofile_CONFIGURE_FLAGS) \
           --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
@@ -12363,19 +13015,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/mpc"; \
-       libsrcdir="$$s/mpc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=mpc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEfeedback_CONFIGURE_FLAGS) \
           --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
@@ -12398,7 +13050,7 @@ all-mpc: configure-mpc
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/mpc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-mpc))
  @endif mpc
  
@@ -12419,6 +13071,7 @@ all-stage1-mpc: configure-stage1-mpc
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -12426,8 +13079,9 @@ all-stage1-mpc: configure-stage1-mpc
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-mpc)
  
  maybe-clean-stage1-mpc: clean-stage1-mpc
@@ -12441,7 +13095,7 @@ clean-stage1-mpc:
         fi; \
         cd $(HOST_SUBDIR)/mpc && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
  @endif mpc-bootstrap
  
  
@@ -12461,6 +13115,7 @@ all-stage2-mpc: configure-stage2-mpc
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -12469,7 +13124,7 @@ all-stage2-mpc: configure-stage2-mpc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-mpc)
  
  maybe-clean-stage2-mpc: clean-stage2-mpc
@@ -12482,9 +13137,7 @@ clean-stage2-mpc:
           $(MAKE) stage2-start; \
         fi; \
         cd $(HOST_SUBDIR)/mpc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif mpc-bootstrap
  
  
@@ -12504,6 +13157,7 @@ all-stage3-mpc: configure-stage3-mpc
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -12512,7 +13166,7 @@ all-stage3-mpc: configure-stage3-mpc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-mpc)
  
  maybe-clean-stage3-mpc: clean-stage3-mpc
@@ -12525,9 +13179,7 @@ clean-stage3-mpc:
           $(MAKE) stage3-start; \
         fi; \
         cd $(HOST_SUBDIR)/mpc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif mpc-bootstrap
  
  
@@ -12547,6 +13199,7 @@ all-stage4-mpc: configure-stage4-mpc
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -12555,7 +13208,7 @@ all-stage4-mpc: configure-stage4-mpc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-mpc)
  
  maybe-clean-stage4-mpc: clean-stage4-mpc
@@ -12568,9 +13221,7 @@ clean-stage4-mpc:
           $(MAKE) stage4-start; \
         fi; \
         cd $(HOST_SUBDIR)/mpc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif mpc-bootstrap
  
  
@@ -12590,6 +13241,7 @@ all-stageprofile-mpc: configure-stageprofile-mpc
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -12598,7 +13250,7 @@ all-stageprofile-mpc: configure-stageprofile-mpc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-mpc)
  
  maybe-clean-stageprofile-mpc: clean-stageprofile-mpc
@@ -12611,9 +13263,7 @@ clean-stageprofile-mpc:
           $(MAKE) stageprofile-start; \
         fi; \
         cd $(HOST_SUBDIR)/mpc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif mpc-bootstrap
  
  
@@ -12633,6 +13283,7 @@ all-stagefeedback-mpc: configure-stagefeedback-mpc
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -12641,7 +13292,7 @@ all-stagefeedback-mpc: configure-stagefeedback-mpc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-mpc)
  
  maybe-clean-stagefeedback-mpc: clean-stagefeedback-mpc
@@ -12654,9 +13305,7 @@ clean-stagefeedback-mpc:
           $(MAKE) stagefeedback-start; \
         fi; \
         cd $(HOST_SUBDIR)/mpc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif mpc-bootstrap
  
  
@@ -12672,9 +13321,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
  
@@ -12712,7 +13361,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}" \
@@ -12737,7 +13386,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}" \
@@ -12762,7 +13411,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}" \
@@ -12787,7 +13436,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}" \
@@ -12812,7 +13461,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}" \
@@ -12838,7 +13487,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}" \
@@ -12864,7 +13513,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}" \
@@ -12890,7 +13539,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}" \
@@ -12915,7 +13564,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}" \
@@ -12939,7 +13588,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}" \
@@ -12963,7 +13612,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}" \
@@ -12987,7 +13636,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}" \
@@ -13011,7 +13660,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}" \
@@ -13035,7 +13684,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; \
@@ -13044,11 +13693,12 @@ configure-isl:
           *) topdir=`echo $(HOST_SUBDIR)/isl/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/isl"; \
-       libsrcdir="$$s/isl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=isl; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} --disable-shared @extra_isl_gmp_configure_flags@ \
+         --target=${target_alias} --disable-shared @extra_isl_gmp_configure_flags@ \
           || exit 1
  @endif isl
  
@@ -13069,19 +13719,20 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/isl/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/isl"; \
-       libsrcdir="$$s/isl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=isl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
           $(STAGE1_CONFIGURE_FLAGS) \
           --disable-shared @extra_isl_gmp_configure_flags@
  @endif isl-bootstrap
@@ -13102,19 +13753,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/isl/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/isl"; \
-       libsrcdir="$$s/isl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=isl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE2_CONFIGURE_FLAGS) \
           --disable-shared @extra_isl_gmp_configure_flags@
@@ -13136,19 +13787,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/isl/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/isl"; \
-       libsrcdir="$$s/isl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=isl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE3_CONFIGURE_FLAGS) \
           --disable-shared @extra_isl_gmp_configure_flags@
@@ -13170,19 +13821,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/isl/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/isl"; \
-       libsrcdir="$$s/isl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=isl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE4_CONFIGURE_FLAGS) \
           --disable-shared @extra_isl_gmp_configure_flags@
@@ -13204,19 +13855,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/isl/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/isl"; \
-       libsrcdir="$$s/isl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=isl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEprofile_CONFIGURE_FLAGS) \
           --disable-shared @extra_isl_gmp_configure_flags@
@@ -13238,19 +13889,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/isl/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/isl"; \
-       libsrcdir="$$s/isl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=isl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEfeedback_CONFIGURE_FLAGS) \
           --disable-shared @extra_isl_gmp_configure_flags@
@@ -13273,7 +13924,7 @@ all-isl: configure-isl
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/isl && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) V=1 \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) V=1 \
                 $(TARGET-isl))
  @endif isl
  
@@ -13294,6 +13945,7 @@ all-stage1-isl: configure-stage1-isl
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/isl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -13301,8 +13953,9 @@ all-stage1-isl: configure-stage1-isl
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)  V=1 \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS) V=1 \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-isl)
  
  maybe-clean-stage1-isl: clean-stage1-isl
@@ -13316,7 +13969,7 @@ clean-stage1-isl:
         fi; \
         cd $(HOST_SUBDIR)/isl && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               V=1 clean
+       $(STAGE1_FLAGS_TO_PASS) V=1 clean
  @endif isl-bootstrap
  
  
@@ -13336,6 +13989,7 @@ all-stage2-isl: configure-stage2-isl
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/isl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -13344,7 +13998,7 @@ all-stage2-isl: configure-stage2-isl
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-isl)
  
  maybe-clean-stage2-isl: clean-stage2-isl
@@ -13357,9 +14011,7 @@ clean-stage2-isl:
           $(MAKE) stage2-start; \
         fi; \
         cd $(HOST_SUBDIR)/isl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               V=1 clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 clean
  @endif isl-bootstrap
  
  
@@ -13379,6 +14031,7 @@ all-stage3-isl: configure-stage3-isl
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/isl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -13387,7 +14040,7 @@ all-stage3-isl: configure-stage3-isl
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-isl)
  
  maybe-clean-stage3-isl: clean-stage3-isl
@@ -13400,9 +14053,7 @@ clean-stage3-isl:
           $(MAKE) stage3-start; \
         fi; \
         cd $(HOST_SUBDIR)/isl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               V=1 clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 clean
  @endif isl-bootstrap
  
  
@@ -13422,6 +14073,7 @@ all-stage4-isl: configure-stage4-isl
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/isl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -13430,7 +14082,7 @@ all-stage4-isl: configure-stage4-isl
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-isl)
  
  maybe-clean-stage4-isl: clean-stage4-isl
@@ -13443,9 +14095,7 @@ clean-stage4-isl:
           $(MAKE) stage4-start; \
         fi; \
         cd $(HOST_SUBDIR)/isl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               V=1 clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 clean
  @endif isl-bootstrap
  
  
@@ -13465,6 +14115,7 @@ all-stageprofile-isl: configure-stageprofile-isl
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/isl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -13473,7 +14124,7 @@ all-stageprofile-isl: configure-stageprofile-isl
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-isl)
  
  maybe-clean-stageprofile-isl: clean-stageprofile-isl
@@ -13486,9 +14137,7 @@ clean-stageprofile-isl:
           $(MAKE) stageprofile-start; \
         fi; \
         cd $(HOST_SUBDIR)/isl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               V=1 clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 clean
  @endif isl-bootstrap
  
  
@@ -13508,6 +14157,7 @@ all-stagefeedback-isl: configure-stagefeedback-isl
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/isl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -13516,7 +14166,7 @@ all-stagefeedback-isl: configure-stagefeedback-isl
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-isl)
  
  maybe-clean-stagefeedback-isl: clean-stagefeedback-isl
@@ -13529,9 +14179,7 @@ clean-stagefeedback-isl:
           $(MAKE) stagefeedback-start; \
         fi; \
         cd $(HOST_SUBDIR)/isl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               V=1 clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 clean
  @endif isl-bootstrap
  
  
@@ -13547,9 +14195,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
  
@@ -13587,7 +14235,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}" \
@@ -13612,7 +14260,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}" \
@@ -13637,7 +14285,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}" \
@@ -13662,7 +14310,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}" \
@@ -13687,7 +14335,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}" \
@@ -13713,7 +14361,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}" \
@@ -13739,7 +14387,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}" \
@@ -13765,7 +14413,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}" \
@@ -13790,7 +14438,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}" \
@@ -13814,7 +14462,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}" \
@@ -13838,7 +14486,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}" \
@@ -13862,7 +14510,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}" \
@@ -13886,7 +14534,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}" \
@@ -13899,276 +14547,279 @@ maintainer-clean-isl:
  
  
  
-.PHONY: configure-cloog maybe-configure-cloog
-maybe-configure-cloog:
+.PHONY: configure-libelf maybe-configure-libelf
+maybe-configure-libelf:
  @if gcc-bootstrap
-configure-cloog: stage_current
+configure-libelf: stage_current
  @endif gcc-bootstrap
-@if cloog
-maybe-configure-cloog: configure-cloog
-configure-cloog: 
+@if libelf
+maybe-configure-libelf: configure-libelf
+configure-libelf: 
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
-       $(HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
-       echo Configuring in $(HOST_SUBDIR)/cloog; \
-       cd "$(HOST_SUBDIR)/cloog" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/libelf; \
+       cd "$(HOST_SUBDIR)/libelf" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/cloog"; \
-       libsrcdir="$$s/cloog"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libelf; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system \
+         --target=${target_alias} --disable-shared \
           || exit 1
-@endif cloog
+@endif libelf
  
  
  
-.PHONY: configure-stage1-cloog maybe-configure-stage1-cloog
-maybe-configure-stage1-cloog:
-@if cloog-bootstrap
-maybe-configure-stage1-cloog: configure-stage1-cloog
-configure-stage1-cloog:
+.PHONY: configure-stage1-libelf maybe-configure-stage1-libelf
+maybe-configure-stage1-libelf:
+@if libelf-bootstrap
+maybe-configure-stage1-libelf: configure-stage1-libelf
+configure-stage1-libelf:
         @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGE1_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
         CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/cloog ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
-       cd $(HOST_SUBDIR)/cloog || exit 1; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/libelf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \
+       cd $(HOST_SUBDIR)/libelf || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/cloog"; \
-       libsrcdir="$$s/cloog"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libelf; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
           $(STAGE1_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
-@endif cloog-bootstrap
-
-.PHONY: configure-stage2-cloog maybe-configure-stage2-cloog
-maybe-configure-stage2-cloog:
-@if cloog-bootstrap
-maybe-configure-stage2-cloog: configure-stage2-cloog
-configure-stage2-cloog:
+         --disable-shared
+@endif libelf-bootstrap
+
+.PHONY: configure-stage2-libelf maybe-configure-stage2-libelf
+maybe-configure-stage2-libelf:
+@if libelf-bootstrap
+maybe-configure-stage2-libelf: configure-stage2-libelf
+configure-stage2-libelf:
         @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGE2_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
         CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/cloog ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
-       cd $(HOST_SUBDIR)/cloog || exit 1; \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/libelf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \
+       cd $(HOST_SUBDIR)/libelf || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/cloog"; \
-       libsrcdir="$$s/cloog"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libelf; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE2_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
-@endif cloog-bootstrap
-
-.PHONY: configure-stage3-cloog maybe-configure-stage3-cloog
-maybe-configure-stage3-cloog:
-@if cloog-bootstrap
-maybe-configure-stage3-cloog: configure-stage3-cloog
-configure-stage3-cloog:
+         --disable-shared
+@endif libelf-bootstrap
+
+.PHONY: configure-stage3-libelf maybe-configure-stage3-libelf
+maybe-configure-stage3-libelf:
+@if libelf-bootstrap
+maybe-configure-stage3-libelf: configure-stage3-libelf
+configure-stage3-libelf:
         @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGE3_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
         CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/cloog ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
-       cd $(HOST_SUBDIR)/cloog || exit 1; \
+       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/libelf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \
+       cd $(HOST_SUBDIR)/libelf || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/cloog"; \
-       libsrcdir="$$s/cloog"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libelf; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE3_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
-@endif cloog-bootstrap
-
-.PHONY: configure-stage4-cloog maybe-configure-stage4-cloog
-maybe-configure-stage4-cloog:
-@if cloog-bootstrap
-maybe-configure-stage4-cloog: configure-stage4-cloog
-configure-stage4-cloog:
+         --disable-shared
+@endif libelf-bootstrap
+
+.PHONY: configure-stage4-libelf maybe-configure-stage4-libelf
+maybe-configure-stage4-libelf:
+@if libelf-bootstrap
+maybe-configure-stage4-libelf: configure-stage4-libelf
+configure-stage4-libelf:
         @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGE4_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
         CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/cloog ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
-       cd $(HOST_SUBDIR)/cloog || exit 1; \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/libelf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \
+       cd $(HOST_SUBDIR)/libelf || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/cloog"; \
-       libsrcdir="$$s/cloog"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libelf; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE4_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
-@endif cloog-bootstrap
-
-.PHONY: configure-stageprofile-cloog maybe-configure-stageprofile-cloog
-maybe-configure-stageprofile-cloog:
-@if cloog-bootstrap
-maybe-configure-stageprofile-cloog: configure-stageprofile-cloog
-configure-stageprofile-cloog:
+         --disable-shared
+@endif libelf-bootstrap
+
+.PHONY: configure-stageprofile-libelf maybe-configure-stageprofile-libelf
+maybe-configure-stageprofile-libelf:
+@if libelf-bootstrap
+maybe-configure-stageprofile-libelf: configure-stageprofile-libelf
+configure-stageprofile-libelf:
         @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
         CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/cloog ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
-       cd $(HOST_SUBDIR)/cloog || exit 1; \
+       LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage profile in $(HOST_SUBDIR)/libelf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \
+       cd $(HOST_SUBDIR)/libelf || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/cloog"; \
-       libsrcdir="$$s/cloog"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libelf; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEprofile_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
-@endif cloog-bootstrap
-
-.PHONY: configure-stagefeedback-cloog maybe-configure-stagefeedback-cloog
-maybe-configure-stagefeedback-cloog:
-@if cloog-bootstrap
-maybe-configure-stagefeedback-cloog: configure-stagefeedback-cloog
-configure-stagefeedback-cloog:
+         --disable-shared
+@endif libelf-bootstrap
+
+.PHONY: configure-stagefeedback-libelf maybe-configure-stagefeedback-libelf
+maybe-configure-stagefeedback-libelf:
+@if libelf-bootstrap
+maybe-configure-stagefeedback-libelf: configure-stagefeedback-libelf
+configure-stagefeedback-libelf:
         @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
         CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/cloog ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
-       cd $(HOST_SUBDIR)/cloog || exit 1; \
+       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/libelf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \
+       cd $(HOST_SUBDIR)/libelf || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/cloog"; \
-       libsrcdir="$$s/cloog"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libelf; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEfeedback_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
-@endif cloog-bootstrap
+         --disable-shared
+@endif libelf-bootstrap
  
  
  
  
  
-.PHONY: all-cloog maybe-all-cloog
-maybe-all-cloog:
+.PHONY: all-libelf maybe-all-libelf
+maybe-all-libelf:
  @if gcc-bootstrap
-all-cloog: stage_current
+all-libelf: stage_current
  @endif gcc-bootstrap
-@if cloog
-TARGET-cloog=all
-maybe-all-cloog: all-cloog
-all-cloog: configure-cloog
+@if libelf
+TARGET-libelf=all
+maybe-all-libelf: all-libelf
+all-libelf: configure-libelf
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
-       (cd $(HOST_SUBDIR)/cloog && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \
-               $(TARGET-cloog))
-@endif cloog
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libelf && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-libelf))
+@endif libelf
  
  
  
-.PHONY: all-stage1-cloog maybe-all-stage1-cloog
-.PHONY: clean-stage1-cloog maybe-clean-stage1-cloog
-maybe-all-stage1-cloog:
-maybe-clean-stage1-cloog:
-@if cloog-bootstrap
-maybe-all-stage1-cloog: all-stage1-cloog
-all-stage1: all-stage1-cloog
-TARGET-stage1-cloog = $(TARGET-cloog)
-all-stage1-cloog: configure-stage1-cloog
+.PHONY: all-stage1-libelf maybe-all-stage1-libelf
+.PHONY: clean-stage1-libelf maybe-clean-stage1-libelf
+maybe-all-stage1-libelf:
+maybe-clean-stage1-libelf:
+@if libelf-bootstrap
+maybe-all-stage1-libelf: all-stage1-libelf
+all-stage1: all-stage1-libelf
+TARGET-stage1-libelf = $(TARGET-libelf)
+all-stage1-libelf: configure-stage1-libelf
         @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGE1_TFLAGS)"; \
-       $(HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
-       cd $(HOST_SUBDIR)/cloog && \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libelf && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -14176,41 +14827,43 @@ all-stage1-cloog: configure-stage1-cloog
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)  CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \
-               TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-cloog)
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
+               $(TARGET-stage1-libelf)
  
-maybe-clean-stage1-cloog: clean-stage1-cloog
-clean-stage1: clean-stage1-cloog
-clean-stage1-cloog:
+maybe-clean-stage1-libelf: clean-stage1-libelf
+clean-stage1: clean-stage1-libelf
+clean-stage1-libelf:
         @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
         else \
-         [ -f $(HOST_SUBDIR)/stage1-cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage1-libelf/Makefile ] || exit 0; \
           $(MAKE) stage1-start; \
         fi; \
-       cd $(HOST_SUBDIR)/cloog && \
+       cd $(HOST_SUBDIR)/libelf && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
-@endif cloog-bootstrap
-
-
-.PHONY: all-stage2-cloog maybe-all-stage2-cloog
-.PHONY: clean-stage2-cloog maybe-clean-stage2-cloog
-maybe-all-stage2-cloog:
-maybe-clean-stage2-cloog:
-@if cloog-bootstrap
-maybe-all-stage2-cloog: all-stage2-cloog
-all-stage2: all-stage2-cloog
-TARGET-stage2-cloog = $(TARGET-cloog)
-all-stage2-cloog: configure-stage2-cloog
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif libelf-bootstrap
+
+
+.PHONY: all-stage2-libelf maybe-all-stage2-libelf
+.PHONY: clean-stage2-libelf maybe-clean-stage2-libelf
+maybe-all-stage2-libelf:
+maybe-clean-stage2-libelf:
+@if libelf-bootstrap
+maybe-all-stage2-libelf: all-stage2-libelf
+all-stage2: all-stage2-libelf
+TARGET-stage2-libelf = $(TARGET-libelf)
+all-stage2-libelf: configure-stage2-libelf
         @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGE2_TFLAGS)"; \
         $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
-       cd $(HOST_SUBDIR)/cloog && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libelf && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -14218,42 +14871,41 @@ all-stage2-cloog: configure-stage2-cloog
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \
-               TFLAGS="$(STAGE2_TFLAGS)" \
-               $(TARGET-stage2-cloog)
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
+               $(TARGET-stage2-libelf)
  
-maybe-clean-stage2-cloog: clean-stage2-cloog
-clean-stage2: clean-stage2-cloog
-clean-stage2-cloog:
+maybe-clean-stage2-libelf: clean-stage2-libelf
+clean-stage2: clean-stage2-libelf
+clean-stage2-libelf:
         @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
         else \
-         [ -f $(HOST_SUBDIR)/stage2-cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage2-libelf/Makefile ] || exit 0; \
           $(MAKE) stage2-start; \
         fi; \
-       cd $(HOST_SUBDIR)/cloog && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
-@endif cloog-bootstrap
-
-
-.PHONY: all-stage3-cloog maybe-all-stage3-cloog
-.PHONY: clean-stage3-cloog maybe-clean-stage3-cloog
-maybe-all-stage3-cloog:
-maybe-clean-stage3-cloog:
-@if cloog-bootstrap
-maybe-all-stage3-cloog: all-stage3-cloog
-all-stage3: all-stage3-cloog
-TARGET-stage3-cloog = $(TARGET-cloog)
-all-stage3-cloog: configure-stage3-cloog
+       cd $(HOST_SUBDIR)/libelf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libelf-bootstrap
+
+
+.PHONY: all-stage3-libelf maybe-all-stage3-libelf
+.PHONY: clean-stage3-libelf maybe-clean-stage3-libelf
+maybe-all-stage3-libelf:
+maybe-clean-stage3-libelf:
+@if libelf-bootstrap
+maybe-all-stage3-libelf: all-stage3-libelf
+all-stage3: all-stage3-libelf
+TARGET-stage3-libelf = $(TARGET-libelf)
+all-stage3-libelf: configure-stage3-libelf
         @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGE3_TFLAGS)"; \
         $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
-       cd $(HOST_SUBDIR)/cloog && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libelf && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -14261,42 +14913,41 @@ all-stage3-cloog: configure-stage3-cloog
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \
-               TFLAGS="$(STAGE3_TFLAGS)" \
-               $(TARGET-stage3-cloog)
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
+               $(TARGET-stage3-libelf)
  
-maybe-clean-stage3-cloog: clean-stage3-cloog
-clean-stage3: clean-stage3-cloog
-clean-stage3-cloog:
+maybe-clean-stage3-libelf: clean-stage3-libelf
+clean-stage3: clean-stage3-libelf
+clean-stage3-libelf:
         @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
         else \
-         [ -f $(HOST_SUBDIR)/stage3-cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage3-libelf/Makefile ] || exit 0; \
           $(MAKE) stage3-start; \
         fi; \
-       cd $(HOST_SUBDIR)/cloog && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
-@endif cloog-bootstrap
-
-
-.PHONY: all-stage4-cloog maybe-all-stage4-cloog
-.PHONY: clean-stage4-cloog maybe-clean-stage4-cloog
-maybe-all-stage4-cloog:
-maybe-clean-stage4-cloog:
-@if cloog-bootstrap
-maybe-all-stage4-cloog: all-stage4-cloog
-all-stage4: all-stage4-cloog
-TARGET-stage4-cloog = $(TARGET-cloog)
-all-stage4-cloog: configure-stage4-cloog
+       cd $(HOST_SUBDIR)/libelf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libelf-bootstrap
+
+
+.PHONY: all-stage4-libelf maybe-all-stage4-libelf
+.PHONY: clean-stage4-libelf maybe-clean-stage4-libelf
+maybe-all-stage4-libelf:
+maybe-clean-stage4-libelf:
+@if libelf-bootstrap
+maybe-all-stage4-libelf: all-stage4-libelf
+all-stage4: all-stage4-libelf
+TARGET-stage4-libelf = $(TARGET-libelf)
+all-stage4-libelf: configure-stage4-libelf
         @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGE4_TFLAGS)"; \
         $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
-       cd $(HOST_SUBDIR)/cloog && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libelf && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -14304,42 +14955,41 @@ all-stage4-cloog: configure-stage4-cloog
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \
-               TFLAGS="$(STAGE4_TFLAGS)" \
-               $(TARGET-stage4-cloog)
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
+               $(TARGET-stage4-libelf)
  
-maybe-clean-stage4-cloog: clean-stage4-cloog
-clean-stage4: clean-stage4-cloog
-clean-stage4-cloog:
+maybe-clean-stage4-libelf: clean-stage4-libelf
+clean-stage4: clean-stage4-libelf
+clean-stage4-libelf:
         @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
         else \
-         [ -f $(HOST_SUBDIR)/stage4-cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage4-libelf/Makefile ] || exit 0; \
           $(MAKE) stage4-start; \
         fi; \
-       cd $(HOST_SUBDIR)/cloog && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
-@endif cloog-bootstrap
-
-
-.PHONY: all-stageprofile-cloog maybe-all-stageprofile-cloog
-.PHONY: clean-stageprofile-cloog maybe-clean-stageprofile-cloog
-maybe-all-stageprofile-cloog:
-maybe-clean-stageprofile-cloog:
-@if cloog-bootstrap
-maybe-all-stageprofile-cloog: all-stageprofile-cloog
-all-stageprofile: all-stageprofile-cloog
-TARGET-stageprofile-cloog = $(TARGET-cloog)
-all-stageprofile-cloog: configure-stageprofile-cloog
+       cd $(HOST_SUBDIR)/libelf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libelf-bootstrap
+
+
+.PHONY: all-stageprofile-libelf maybe-all-stageprofile-libelf
+.PHONY: clean-stageprofile-libelf maybe-clean-stageprofile-libelf
+maybe-all-stageprofile-libelf:
+maybe-clean-stageprofile-libelf:
+@if libelf-bootstrap
+maybe-all-stageprofile-libelf: all-stageprofile-libelf
+all-stageprofile: all-stageprofile-libelf
+TARGET-stageprofile-libelf = $(TARGET-libelf)
+all-stageprofile-libelf: configure-stageprofile-libelf
         @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGEprofile_TFLAGS)"; \
         $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
-       cd $(HOST_SUBDIR)/cloog && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libelf && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -14347,42 +14997,41 @@ all-stageprofile-cloog: configure-stageprofile-cloog
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
-               $(TARGET-stageprofile-cloog)
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
+               $(TARGET-stageprofile-libelf)
  
-maybe-clean-stageprofile-cloog: clean-stageprofile-cloog
-clean-stageprofile: clean-stageprofile-cloog
-clean-stageprofile-cloog:
+maybe-clean-stageprofile-libelf: clean-stageprofile-libelf
+clean-stageprofile: clean-stageprofile-libelf
+clean-stageprofile-libelf:
         @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
         else \
-         [ -f $(HOST_SUBDIR)/stageprofile-cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageprofile-libelf/Makefile ] || exit 0; \
           $(MAKE) stageprofile-start; \
         fi; \
-       cd $(HOST_SUBDIR)/cloog && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
-@endif cloog-bootstrap
-
-
-.PHONY: all-stagefeedback-cloog maybe-all-stagefeedback-cloog
-.PHONY: clean-stagefeedback-cloog maybe-clean-stagefeedback-cloog
-maybe-all-stagefeedback-cloog:
-maybe-clean-stagefeedback-cloog:
-@if cloog-bootstrap
-maybe-all-stagefeedback-cloog: all-stagefeedback-cloog
-all-stagefeedback: all-stagefeedback-cloog
-TARGET-stagefeedback-cloog = $(TARGET-cloog)
-all-stagefeedback-cloog: configure-stagefeedback-cloog
+       cd $(HOST_SUBDIR)/libelf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libelf-bootstrap
+
+
+.PHONY: all-stagefeedback-libelf maybe-all-stagefeedback-libelf
+.PHONY: clean-stagefeedback-libelf maybe-clean-stagefeedback-libelf
+maybe-all-stagefeedback-libelf:
+maybe-clean-stagefeedback-libelf:
+@if libelf-bootstrap
+maybe-all-stagefeedback-libelf: all-stagefeedback-libelf
+all-stagefeedback: all-stagefeedback-libelf
+TARGET-stagefeedback-libelf = $(TARGET-libelf)
+all-stagefeedback-libelf: configure-stagefeedback-libelf
         @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGEfeedback_TFLAGS)"; \
         $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS;  \
-       cd $(HOST_SUBDIR)/cloog && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libelf && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -14390,80 +15039,78 @@ all-stagefeedback-cloog: configure-stagefeedback-cloog
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
-               $(TARGET-stagefeedback-cloog)
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
+               $(TARGET-stagefeedback-libelf)
  
-maybe-clean-stagefeedback-cloog: clean-stagefeedback-cloog
-clean-stagefeedback: clean-stagefeedback-cloog
-clean-stagefeedback-cloog:
+maybe-clean-stagefeedback-libelf: clean-stagefeedback-libelf
+clean-stagefeedback: clean-stagefeedback-libelf
+clean-stagefeedback-libelf:
         @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
         else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stagefeedback-libelf/Makefile ] || exit 0; \
           $(MAKE) stagefeedback-start; \
         fi; \
-       cd $(HOST_SUBDIR)/cloog && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean
-@endif cloog-bootstrap
+       cd $(HOST_SUBDIR)/libelf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libelf-bootstrap
  
  
  
  
  
-.PHONY: check-cloog maybe-check-cloog
-maybe-check-cloog:
-@if cloog
-maybe-check-cloog: check-cloog
+.PHONY: check-libelf maybe-check-libelf
+maybe-check-libelf:
+@if libelf
+maybe-check-libelf: check-libelf
  
-check-cloog:
+check-libelf:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/cloog && \
-         $(MAKE) $(FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 check)
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libelf && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
  
-@endif cloog
+@endif libelf
  
-.PHONY: install-cloog maybe-install-cloog
-maybe-install-cloog:
-@if cloog
-maybe-install-cloog: install-cloog
+.PHONY: install-libelf maybe-install-libelf
+maybe-install-libelf:
+@if libelf
+maybe-install-libelf: install-libelf
  
-install-cloog:
+install-libelf:
  
-@endif cloog
+@endif libelf
  
-.PHONY: install-strip-cloog maybe-install-strip-cloog
-maybe-install-strip-cloog:
-@if cloog
-maybe-install-strip-cloog: install-strip-cloog
+.PHONY: install-strip-libelf maybe-install-strip-libelf
+maybe-install-strip-libelf:
+@if libelf
+maybe-install-strip-libelf: install-strip-libelf
  
-install-strip-cloog:
+install-strip-libelf:
  
-@endif cloog
+@endif libelf
  
  # Other targets (info, dvi, pdf, etc.)
  
-.PHONY: maybe-info-cloog info-cloog
-maybe-info-cloog:
-@if cloog
-maybe-info-cloog: info-cloog
+.PHONY: maybe-info-libelf info-libelf
+maybe-info-libelf:
+@if libelf
+maybe-info-libelf: info-libelf
  
-info-cloog: \
-    configure-cloog 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+info-libelf: \
+    configure-libelf 
+       @[ -f ./libelf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing info in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14471,24 +15118,24 @@ info-cloog: \
                   info) \
           || exit 1
  
-@endif cloog
+@endif libelf
  
-.PHONY: maybe-dvi-cloog dvi-cloog
-maybe-dvi-cloog:
-@if cloog
-maybe-dvi-cloog: dvi-cloog
+.PHONY: maybe-dvi-libelf dvi-libelf
+maybe-dvi-libelf:
+@if libelf
+maybe-dvi-libelf: dvi-libelf
  
-dvi-cloog: \
-    configure-cloog 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+dvi-libelf: \
+    configure-libelf 
+       @[ -f ./libelf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing dvi in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14496,24 +15143,24 @@ dvi-cloog: \
                   dvi) \
           || exit 1
  
-@endif cloog
+@endif libelf
  
-.PHONY: maybe-pdf-cloog pdf-cloog
-maybe-pdf-cloog:
-@if cloog
-maybe-pdf-cloog: pdf-cloog
+.PHONY: maybe-pdf-libelf pdf-libelf
+maybe-pdf-libelf:
+@if libelf
+maybe-pdf-libelf: pdf-libelf
  
-pdf-cloog: \
-    configure-cloog 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+pdf-libelf: \
+    configure-libelf 
+       @[ -f ./libelf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing pdf in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing pdf in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14521,24 +15168,24 @@ pdf-cloog: \
                   pdf) \
           || exit 1
  
-@endif cloog
+@endif libelf
  
-.PHONY: maybe-html-cloog html-cloog
-maybe-html-cloog:
-@if cloog
-maybe-html-cloog: html-cloog
+.PHONY: maybe-html-libelf html-libelf
+maybe-html-libelf:
+@if libelf
+maybe-html-libelf: html-libelf
  
-html-cloog: \
-    configure-cloog 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+html-libelf: \
+    configure-libelf 
+       @[ -f ./libelf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing html in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing html in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14546,24 +15193,24 @@ html-cloog: \
                   html) \
           || exit 1
  
-@endif cloog
+@endif libelf
  
-.PHONY: maybe-TAGS-cloog TAGS-cloog
-maybe-TAGS-cloog:
-@if cloog
-maybe-TAGS-cloog: TAGS-cloog
+.PHONY: maybe-TAGS-libelf TAGS-libelf
+maybe-TAGS-libelf:
+@if libelf
+maybe-TAGS-libelf: TAGS-libelf
  
-TAGS-cloog: \
-    configure-cloog 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+TAGS-libelf: \
+    configure-libelf 
+       @[ -f ./libelf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing TAGS in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14571,25 +15218,25 @@ TAGS-cloog: \
                   TAGS) \
           || exit 1
  
-@endif cloog
+@endif libelf
  
-.PHONY: maybe-install-info-cloog install-info-cloog
-maybe-install-info-cloog:
-@if cloog
-maybe-install-info-cloog: install-info-cloog
+.PHONY: maybe-install-info-libelf install-info-libelf
+maybe-install-info-libelf:
+@if libelf
+maybe-install-info-libelf: install-info-libelf
  
-install-info-cloog: \
-    configure-cloog \
-    info-cloog 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+install-info-libelf: \
+    configure-libelf \
+    info-libelf 
+       @[ -f ./libelf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing install-info in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14597,25 +15244,25 @@ install-info-cloog: \
                   install-info) \
           || exit 1
  
-@endif cloog
+@endif libelf
  
-.PHONY: maybe-install-pdf-cloog install-pdf-cloog
-maybe-install-pdf-cloog:
-@if cloog
-maybe-install-pdf-cloog: install-pdf-cloog
+.PHONY: maybe-install-pdf-libelf install-pdf-libelf
+maybe-install-pdf-libelf:
+@if libelf
+maybe-install-pdf-libelf: install-pdf-libelf
  
-install-pdf-cloog: \
-    configure-cloog \
-    pdf-cloog 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+install-pdf-libelf: \
+    configure-libelf \
+    pdf-libelf 
+       @[ -f ./libelf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-pdf in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing install-pdf in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14623,25 +15270,25 @@ install-pdf-cloog: \
                   install-pdf) \
           || exit 1
  
-@endif cloog
+@endif libelf
  
-.PHONY: maybe-install-html-cloog install-html-cloog
-maybe-install-html-cloog:
-@if cloog
-maybe-install-html-cloog: install-html-cloog
+.PHONY: maybe-install-html-libelf install-html-libelf
+maybe-install-html-libelf:
+@if libelf
+maybe-install-html-libelf: install-html-libelf
  
-install-html-cloog: \
-    configure-cloog \
-    html-cloog 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+install-html-libelf: \
+    configure-libelf \
+    html-libelf 
+       @[ -f ./libelf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-html in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing install-html in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14649,24 +15296,24 @@ install-html-cloog: \
                   install-html) \
           || exit 1
  
-@endif cloog
+@endif libelf
  
-.PHONY: maybe-installcheck-cloog installcheck-cloog
-maybe-installcheck-cloog:
-@if cloog
-maybe-installcheck-cloog: installcheck-cloog
+.PHONY: maybe-installcheck-libelf installcheck-libelf
+maybe-installcheck-libelf:
+@if libelf
+maybe-installcheck-libelf: installcheck-libelf
  
-installcheck-cloog: \
-    configure-cloog 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+installcheck-libelf: \
+    configure-libelf 
+       @[ -f ./libelf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing installcheck in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14674,23 +15321,23 @@ installcheck-cloog: \
                   installcheck) \
           || exit 1
  
-@endif cloog
+@endif libelf
  
-.PHONY: maybe-mostlyclean-cloog mostlyclean-cloog
-maybe-mostlyclean-cloog:
-@if cloog
-maybe-mostlyclean-cloog: mostlyclean-cloog
+.PHONY: maybe-mostlyclean-libelf mostlyclean-libelf
+maybe-mostlyclean-libelf:
+@if libelf
+maybe-mostlyclean-libelf: mostlyclean-libelf
  
-mostlyclean-cloog: 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+mostlyclean-libelf: 
+       @[ -f ./libelf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing mostlyclean in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14698,23 +15345,23 @@ mostlyclean-cloog:
                   mostlyclean) \
           || exit 1
  
-@endif cloog
+@endif libelf
  
-.PHONY: maybe-clean-cloog clean-cloog
-maybe-clean-cloog:
-@if cloog
-maybe-clean-cloog: clean-cloog
+.PHONY: maybe-clean-libelf clean-libelf
+maybe-clean-libelf:
+@if libelf
+maybe-clean-libelf: clean-libelf
  
-clean-cloog: 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+clean-libelf: 
+       @[ -f ./libelf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing clean in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14722,23 +15369,23 @@ clean-cloog:
                   clean) \
           || exit 1
  
-@endif cloog
+@endif libelf
  
-.PHONY: maybe-distclean-cloog distclean-cloog
-maybe-distclean-cloog:
-@if cloog
-maybe-distclean-cloog: distclean-cloog
+.PHONY: maybe-distclean-libelf distclean-libelf
+maybe-distclean-libelf:
+@if libelf
+maybe-distclean-libelf: distclean-libelf
  
-distclean-cloog: 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+distclean-libelf: 
+       @[ -f ./libelf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing distclean in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14746,23 +15393,23 @@ distclean-cloog:
                   distclean) \
           || exit 1
  
-@endif cloog
-
-.PHONY: maybe-maintainer-clean-cloog maintainer-clean-cloog
-maybe-maintainer-clean-cloog:
-@if cloog
-maybe-maintainer-clean-cloog: maintainer-clean-cloog
+@endif libelf
  
-maintainer-clean-cloog: 
-       @[ -f ./cloog/Makefile ] || exit 0; \
+.PHONY: maybe-maintainer-clean-libelf maintainer-clean-libelf
+maybe-maintainer-clean-libelf:
+@if libelf
+maybe-maintainer-clean-libelf: maintainer-clean-libelf
+
+maintainer-clean-libelf: 
+       @[ -f ./libelf/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing maintainer-clean in libelf"; \
+       (cd $(HOST_SUBDIR)/libelf && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -14770,280 +15417,277 @@ maintainer-clean-cloog:
                   maintainer-clean) \
           || exit 1
  
-@endif cloog
+@endif libelf
  
  
  
-.PHONY: configure-libelf maybe-configure-libelf
-maybe-configure-libelf:
+.PHONY: configure-gold maybe-configure-gold
+maybe-configure-gold:
  @if gcc-bootstrap
-configure-libelf: stage_current
+configure-gold: stage_current
  @endif gcc-bootstrap
-@if libelf
-maybe-configure-libelf: configure-libelf
-configure-libelf: 
+@if gold
+maybe-configure-gold: configure-gold
+configure-gold: 
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
+       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
         $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/libelf; \
-       cd "$(HOST_SUBDIR)/libelf" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gold; \
+       cd "$(HOST_SUBDIR)/gold" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libelf"; \
-       libsrcdir="$$s/libelf"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gold; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} --disable-shared \
+         --target=${target_alias}  \
           || exit 1
-@endif libelf
+@endif gold
  
  
  
-.PHONY: configure-stage1-libelf maybe-configure-stage1-libelf
-maybe-configure-stage1-libelf:
-@if libelf-bootstrap
-maybe-configure-stage1-libelf: configure-stage1-libelf
-configure-stage1-libelf:
+.PHONY: configure-stage1-gold maybe-configure-stage1-gold
+maybe-configure-stage1-gold:
+@if gold-bootstrap
+maybe-configure-stage1-gold: configure-stage1-gold
+configure-stage1-gold:
         @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGE1_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
         CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
         LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/libelf ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-       cd $(HOST_SUBDIR)/libelf || exit 1; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/gold; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libelf"; \
-       libsrcdir="$$s/libelf"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gold; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         $(STAGE1_CONFIGURE_FLAGS) \
-         --disable-shared
-@endif libelf-bootstrap
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif gold-bootstrap
  
-.PHONY: configure-stage2-libelf maybe-configure-stage2-libelf
-maybe-configure-stage2-libelf:
-@if libelf-bootstrap
-maybe-configure-stage2-libelf: configure-stage2-libelf
-configure-stage2-libelf:
+.PHONY: configure-stage2-gold maybe-configure-stage2-gold
+maybe-configure-stage2-gold:
+@if gold-bootstrap
+maybe-configure-stage2-gold: configure-stage2-gold
+configure-stage2-gold:
         @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGE2_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
         CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
         LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/libelf ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-       cd $(HOST_SUBDIR)/libelf || exit 1; \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/gold; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libelf"; \
-       libsrcdir="$$s/libelf"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gold; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE2_CONFIGURE_FLAGS) \
-         --disable-shared
-@endif libelf-bootstrap
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif gold-bootstrap
  
-.PHONY: configure-stage3-libelf maybe-configure-stage3-libelf
-maybe-configure-stage3-libelf:
-@if libelf-bootstrap
-maybe-configure-stage3-libelf: configure-stage3-libelf
-configure-stage3-libelf:
+.PHONY: configure-stage3-gold maybe-configure-stage3-gold
+maybe-configure-stage3-gold:
+@if gold-bootstrap
+maybe-configure-stage3-gold: configure-stage3-gold
+configure-stage3-gold:
         @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGE3_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
         CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
         LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/libelf ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-       cd $(HOST_SUBDIR)/libelf || exit 1; \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/gold; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libelf"; \
-       libsrcdir="$$s/libelf"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gold; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE3_CONFIGURE_FLAGS) \
-         --disable-shared
-@endif libelf-bootstrap
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif gold-bootstrap
  
-.PHONY: configure-stage4-libelf maybe-configure-stage4-libelf
-maybe-configure-stage4-libelf:
-@if libelf-bootstrap
-maybe-configure-stage4-libelf: configure-stage4-libelf
-configure-stage4-libelf:
+.PHONY: configure-stage4-gold maybe-configure-stage4-gold
+maybe-configure-stage4-gold:
+@if gold-bootstrap
+maybe-configure-stage4-gold: configure-stage4-gold
+configure-stage4-gold:
         @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGE4_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
         CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
         LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/libelf ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-       cd $(HOST_SUBDIR)/libelf || exit 1; \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/gold; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libelf"; \
-       libsrcdir="$$s/libelf"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gold; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE4_CONFIGURE_FLAGS) \
-         --disable-shared
-@endif libelf-bootstrap
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif gold-bootstrap
  
-.PHONY: configure-stageprofile-libelf maybe-configure-stageprofile-libelf
-maybe-configure-stageprofile-libelf:
-@if libelf-bootstrap
-maybe-configure-stageprofile-libelf: configure-stageprofile-libelf
-configure-stageprofile-libelf:
+.PHONY: configure-stageprofile-gold maybe-configure-stageprofile-gold
+maybe-configure-stageprofile-gold:
+@if gold-bootstrap
+maybe-configure-stageprofile-gold: configure-stageprofile-gold
+configure-stageprofile-gold:
         @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
         CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
         LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/libelf ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-       cd $(HOST_SUBDIR)/libelf || exit 1; \
+       echo Configuring stage profile in $(HOST_SUBDIR)/gold; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libelf"; \
-       libsrcdir="$$s/libelf"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gold; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEprofile_CONFIGURE_FLAGS) \
-         --disable-shared
-@endif libelf-bootstrap
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif gold-bootstrap
  
-.PHONY: configure-stagefeedback-libelf maybe-configure-stagefeedback-libelf
-maybe-configure-stagefeedback-libelf:
-@if libelf-bootstrap
-maybe-configure-stagefeedback-libelf: configure-stagefeedback-libelf
-configure-stagefeedback-libelf:
+.PHONY: configure-stagefeedback-gold maybe-configure-stagefeedback-gold
+maybe-configure-stagefeedback-gold:
+@if gold-bootstrap
+maybe-configure-stagefeedback-gold: configure-stagefeedback-gold
+configure-stagefeedback-gold:
         @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS) \
         CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
         CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
         LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/libelf ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-       cd $(HOST_SUBDIR)/libelf || exit 1; \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/gold; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libelf"; \
-       libsrcdir="$$s/libelf"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gold; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEfeedback_CONFIGURE_FLAGS) \
-         --disable-shared
-@endif libelf-bootstrap
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif gold-bootstrap
  
  
  
  
  
-.PHONY: all-libelf maybe-all-libelf
-maybe-all-libelf:
+.PHONY: all-gold maybe-all-gold
+maybe-all-gold:
  @if gcc-bootstrap
-all-libelf: stage_current
+all-gold: stage_current
  @endif gcc-bootstrap
-@if libelf
-TARGET-libelf=all
-maybe-all-libelf: all-libelf
-all-libelf: configure-libelf
+@if gold
+TARGET-gold=all
+maybe-all-gold: all-gold
+all-gold: configure-gold
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/libelf && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-libelf))
-@endif libelf
+       (cd $(HOST_SUBDIR)/gold && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-gold))
+@endif gold
  
  
  
-.PHONY: all-stage1-libelf maybe-all-stage1-libelf
-.PHONY: clean-stage1-libelf maybe-clean-stage1-libelf
-maybe-all-stage1-libelf:
-maybe-clean-stage1-libelf:
-@if libelf-bootstrap
-maybe-all-stage1-libelf: all-stage1-libelf
-all-stage1: all-stage1-libelf
-TARGET-stage1-libelf = $(TARGET-libelf)
-all-stage1-libelf: configure-stage1-libelf
+.PHONY: all-stage1-gold maybe-all-stage1-gold
+.PHONY: clean-stage1-gold maybe-clean-stage1-gold
+maybe-all-stage1-gold:
+maybe-clean-stage1-gold:
+@if gold-bootstrap
+maybe-all-stage1-gold: all-stage1-gold
+all-stage1: all-stage1-gold
+TARGET-stage1-gold = $(TARGET-gold)
+all-stage1-gold: configure-stage1-gold
         @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/gold && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -15051,41 +15695,43 @@ all-stage1-libelf: configure-stage1-libelf
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-libelf)
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
+               $(TARGET-stage1-gold)
  
-maybe-clean-stage1-libelf: clean-stage1-libelf
-clean-stage1: clean-stage1-libelf
-clean-stage1-libelf:
+maybe-clean-stage1-gold: clean-stage1-gold
+clean-stage1: clean-stage1-gold
+clean-stage1-gold:
         @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
         else \
-         [ -f $(HOST_SUBDIR)/stage1-libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage1-gold/Makefile ] || exit 0; \
           $(MAKE) stage1-start; \
         fi; \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/gold && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
-@endif libelf-bootstrap
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif gold-bootstrap
  
  
-.PHONY: all-stage2-libelf maybe-all-stage2-libelf
-.PHONY: clean-stage2-libelf maybe-clean-stage2-libelf
-maybe-all-stage2-libelf:
-maybe-clean-stage2-libelf:
-@if libelf-bootstrap
-maybe-all-stage2-libelf: all-stage2-libelf
-all-stage2: all-stage2-libelf
-TARGET-stage2-libelf = $(TARGET-libelf)
-all-stage2-libelf: configure-stage2-libelf
+.PHONY: all-stage2-gold maybe-all-stage2-gold
+.PHONY: clean-stage2-gold maybe-clean-stage2-gold
+maybe-all-stage2-gold:
+maybe-clean-stage2-gold:
+@if gold-bootstrap
+maybe-all-stage2-gold: all-stage2-gold
+all-stage2: all-stage2-gold
+TARGET-stage2-gold = $(TARGET-gold)
+all-stage2-gold: configure-stage2-gold
         @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGE2_TFLAGS)"; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/gold && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -15094,41 +15740,40 @@ all-stage2-libelf: configure-stage2-libelf
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
-               $(TARGET-stage2-libelf)
+               TFLAGS="$(STAGE2_TFLAGS)"  \
+               $(TARGET-stage2-gold)
  
-maybe-clean-stage2-libelf: clean-stage2-libelf
-clean-stage2: clean-stage2-libelf
-clean-stage2-libelf:
+maybe-clean-stage2-gold: clean-stage2-gold
+clean-stage2: clean-stage2-gold
+clean-stage2-gold:
         @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
         else \
-         [ -f $(HOST_SUBDIR)/stage2-libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage2-gold/Makefile ] || exit 0; \
           $(MAKE) stage2-start; \
         fi; \
-       cd $(HOST_SUBDIR)/libelf && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libelf-bootstrap
+       cd $(HOST_SUBDIR)/gold && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif gold-bootstrap
  
  
-.PHONY: all-stage3-libelf maybe-all-stage3-libelf
-.PHONY: clean-stage3-libelf maybe-clean-stage3-libelf
-maybe-all-stage3-libelf:
-maybe-clean-stage3-libelf:
-@if libelf-bootstrap
-maybe-all-stage3-libelf: all-stage3-libelf
-all-stage3: all-stage3-libelf
-TARGET-stage3-libelf = $(TARGET-libelf)
-all-stage3-libelf: configure-stage3-libelf
+.PHONY: all-stage3-gold maybe-all-stage3-gold
+.PHONY: clean-stage3-gold maybe-clean-stage3-gold
+maybe-all-stage3-gold:
+maybe-clean-stage3-gold:
+@if gold-bootstrap
+maybe-all-stage3-gold: all-stage3-gold
+all-stage3: all-stage3-gold
+TARGET-stage3-gold = $(TARGET-gold)
+all-stage3-gold: configure-stage3-gold
         @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGE3_TFLAGS)"; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/gold && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -15137,41 +15782,40 @@ all-stage3-libelf: configure-stage3-libelf
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
-               $(TARGET-stage3-libelf)
+               TFLAGS="$(STAGE3_TFLAGS)"  \
+               $(TARGET-stage3-gold)
  
-maybe-clean-stage3-libelf: clean-stage3-libelf
-clean-stage3: clean-stage3-libelf
-clean-stage3-libelf:
+maybe-clean-stage3-gold: clean-stage3-gold
+clean-stage3: clean-stage3-gold
+clean-stage3-gold:
         @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
         else \
-         [ -f $(HOST_SUBDIR)/stage3-libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage3-gold/Makefile ] || exit 0; \
           $(MAKE) stage3-start; \
         fi; \
-       cd $(HOST_SUBDIR)/libelf && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libelf-bootstrap
+       cd $(HOST_SUBDIR)/gold && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif gold-bootstrap
  
  
-.PHONY: all-stage4-libelf maybe-all-stage4-libelf
-.PHONY: clean-stage4-libelf maybe-clean-stage4-libelf
-maybe-all-stage4-libelf:
-maybe-clean-stage4-libelf:
-@if libelf-bootstrap
-maybe-all-stage4-libelf: all-stage4-libelf
-all-stage4: all-stage4-libelf
-TARGET-stage4-libelf = $(TARGET-libelf)
-all-stage4-libelf: configure-stage4-libelf
+.PHONY: all-stage4-gold maybe-all-stage4-gold
+.PHONY: clean-stage4-gold maybe-clean-stage4-gold
+maybe-all-stage4-gold:
+maybe-clean-stage4-gold:
+@if gold-bootstrap
+maybe-all-stage4-gold: all-stage4-gold
+all-stage4: all-stage4-gold
+TARGET-stage4-gold = $(TARGET-gold)
+all-stage4-gold: configure-stage4-gold
         @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGE4_TFLAGS)"; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/gold && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -15180,41 +15824,40 @@ all-stage4-libelf: configure-stage4-libelf
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
-               $(TARGET-stage4-libelf)
+               TFLAGS="$(STAGE4_TFLAGS)"  \
+               $(TARGET-stage4-gold)
  
-maybe-clean-stage4-libelf: clean-stage4-libelf
-clean-stage4: clean-stage4-libelf
-clean-stage4-libelf:
+maybe-clean-stage4-gold: clean-stage4-gold
+clean-stage4: clean-stage4-gold
+clean-stage4-gold:
         @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
         else \
-         [ -f $(HOST_SUBDIR)/stage4-libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage4-gold/Makefile ] || exit 0; \
           $(MAKE) stage4-start; \
         fi; \
-       cd $(HOST_SUBDIR)/libelf && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libelf-bootstrap
+       cd $(HOST_SUBDIR)/gold && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif gold-bootstrap
  
  
-.PHONY: all-stageprofile-libelf maybe-all-stageprofile-libelf
-.PHONY: clean-stageprofile-libelf maybe-clean-stageprofile-libelf
-maybe-all-stageprofile-libelf:
-maybe-clean-stageprofile-libelf:
-@if libelf-bootstrap
-maybe-all-stageprofile-libelf: all-stageprofile-libelf
-all-stageprofile: all-stageprofile-libelf
-TARGET-stageprofile-libelf = $(TARGET-libelf)
-all-stageprofile-libelf: configure-stageprofile-libelf
+.PHONY: all-stageprofile-gold maybe-all-stageprofile-gold
+.PHONY: clean-stageprofile-gold maybe-clean-stageprofile-gold
+maybe-all-stageprofile-gold:
+maybe-clean-stageprofile-gold:
+@if gold-bootstrap
+maybe-all-stageprofile-gold: all-stageprofile-gold
+all-stageprofile: all-stageprofile-gold
+TARGET-stageprofile-gold = $(TARGET-gold)
+all-stageprofile-gold: configure-stageprofile-gold
         @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGEprofile_TFLAGS)"; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/gold && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -15223,41 +15866,40 @@ all-stageprofile-libelf: configure-stageprofile-libelf
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
-               $(TARGET-stageprofile-libelf)
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
+               $(TARGET-stageprofile-gold)
  
-maybe-clean-stageprofile-libelf: clean-stageprofile-libelf
-clean-stageprofile: clean-stageprofile-libelf
-clean-stageprofile-libelf:
+maybe-clean-stageprofile-gold: clean-stageprofile-gold
+clean-stageprofile: clean-stageprofile-gold
+clean-stageprofile-gold:
         @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
         else \
-         [ -f $(HOST_SUBDIR)/stageprofile-libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageprofile-gold/Makefile ] || exit 0; \
           $(MAKE) stageprofile-start; \
         fi; \
-       cd $(HOST_SUBDIR)/libelf && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libelf-bootstrap
+       cd $(HOST_SUBDIR)/gold && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif gold-bootstrap
  
  
-.PHONY: all-stagefeedback-libelf maybe-all-stagefeedback-libelf
-.PHONY: clean-stagefeedback-libelf maybe-clean-stagefeedback-libelf
-maybe-all-stagefeedback-libelf:
-maybe-clean-stagefeedback-libelf:
-@if libelf-bootstrap
-maybe-all-stagefeedback-libelf: all-stagefeedback-libelf
-all-stagefeedback: all-stagefeedback-libelf
-TARGET-stagefeedback-libelf = $(TARGET-libelf)
-all-stagefeedback-libelf: configure-stagefeedback-libelf
+.PHONY: all-stagefeedback-gold maybe-all-stagefeedback-gold
+.PHONY: clean-stagefeedback-gold maybe-clean-stagefeedback-gold
+maybe-all-stagefeedback-gold:
+maybe-clean-stagefeedback-gold:
+@if gold-bootstrap
+maybe-all-stagefeedback-gold: all-stagefeedback-gold
+all-stagefeedback: all-stagefeedback-gold
+TARGET-stagefeedback-gold = $(TARGET-gold)
+all-stagefeedback-gold: configure-stagefeedback-gold
         @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         TFLAGS="$(STAGEfeedback_TFLAGS)"; \
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/gold && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -15266,79 +15908,89 @@ all-stagefeedback-libelf: configure-stagefeedback-libelf
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
-               $(TARGET-stagefeedback-libelf)
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
+               $(TARGET-stagefeedback-gold)
  
-maybe-clean-stagefeedback-libelf: clean-stagefeedback-libelf
-clean-stagefeedback: clean-stagefeedback-libelf
-clean-stagefeedback-libelf:
+maybe-clean-stagefeedback-gold: clean-stagefeedback-gold
+clean-stagefeedback: clean-stagefeedback-gold
+clean-stagefeedback-gold:
         @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
         else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stagefeedback-gold/Makefile ] || exit 0; \
           $(MAKE) stagefeedback-start; \
         fi; \
-       cd $(HOST_SUBDIR)/libelf && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libelf-bootstrap
+       cd $(HOST_SUBDIR)/gold && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif gold-bootstrap
  
  
  
  
  
-.PHONY: check-libelf maybe-check-libelf
-maybe-check-libelf:
-@if libelf
-maybe-check-libelf: check-libelf
+.PHONY: check-gold maybe-check-gold
+maybe-check-gold:
+@if gold
+maybe-check-gold: check-gold
  
-check-libelf:
+check-gold:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libelf && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gold && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
  
-@endif libelf
+@endif gold
  
-.PHONY: install-libelf maybe-install-libelf
-maybe-install-libelf:
-@if libelf
-maybe-install-libelf: install-libelf
+.PHONY: install-gold maybe-install-gold
+maybe-install-gold:
+@if gold
+maybe-install-gold: install-gold
  
-install-libelf:
+install-gold: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gold && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
-@endif libelf
+@endif gold
  
-.PHONY: install-strip-libelf maybe-install-strip-libelf
-maybe-install-strip-libelf:
-@if libelf
-maybe-install-strip-libelf: install-strip-libelf
+.PHONY: install-strip-gold maybe-install-strip-gold
+maybe-install-strip-gold:
+@if gold
+maybe-install-strip-gold: install-strip-gold
  
-install-strip-libelf:
+install-strip-gold: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gold && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
  
-@endif libelf
+@endif gold
  
  # Other targets (info, dvi, pdf, etc.)
  
-.PHONY: maybe-info-libelf info-libelf
-maybe-info-libelf:
-@if libelf
-maybe-info-libelf: info-libelf
+.PHONY: maybe-info-gold info-gold
+maybe-info-gold:
+@if gold
+maybe-info-gold: info-gold
  
-info-libelf: \
-    configure-libelf 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+info-gold: \
+    configure-gold 
+       @[ -f ./gold/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing info in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15346,24 +15998,24 @@ info-libelf: \
                   info) \
           || exit 1
  
-@endif libelf
+@endif gold
  
-.PHONY: maybe-dvi-libelf dvi-libelf
-maybe-dvi-libelf:
-@if libelf
-maybe-dvi-libelf: dvi-libelf
+.PHONY: maybe-dvi-gold dvi-gold
+maybe-dvi-gold:
+@if gold
+maybe-dvi-gold: dvi-gold
  
-dvi-libelf: \
-    configure-libelf 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+dvi-gold: \
+    configure-gold 
+       @[ -f ./gold/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing dvi in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15371,24 +16023,24 @@ dvi-libelf: \
                   dvi) \
           || exit 1
  
-@endif libelf
-
-.PHONY: maybe-pdf-libelf pdf-libelf
-maybe-pdf-libelf:
-@if libelf
-maybe-pdf-libelf: pdf-libelf
+@endif gold
  
-pdf-libelf: \
-    configure-libelf 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+.PHONY: maybe-pdf-gold pdf-gold
+maybe-pdf-gold:
+@if gold
+maybe-pdf-gold: pdf-gold
+
+pdf-gold: \
+    configure-gold 
+       @[ -f ./gold/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing pdf in libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing pdf in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15396,24 +16048,24 @@ pdf-libelf: \
                   pdf) \
           || exit 1
  
-@endif libelf
+@endif gold
  
-.PHONY: maybe-html-libelf html-libelf
-maybe-html-libelf:
-@if libelf
-maybe-html-libelf: html-libelf
+.PHONY: maybe-html-gold html-gold
+maybe-html-gold:
+@if gold
+maybe-html-gold: html-gold
  
-html-libelf: \
-    configure-libelf 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+html-gold: \
+    configure-gold 
+       @[ -f ./gold/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing html in libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing html in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15421,24 +16073,24 @@ html-libelf: \
                   html) \
           || exit 1
  
-@endif libelf
+@endif gold
  
-.PHONY: maybe-TAGS-libelf TAGS-libelf
-maybe-TAGS-libelf:
-@if libelf
-maybe-TAGS-libelf: TAGS-libelf
+.PHONY: maybe-TAGS-gold TAGS-gold
+maybe-TAGS-gold:
+@if gold
+maybe-TAGS-gold: TAGS-gold
  
-TAGS-libelf: \
-    configure-libelf 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+TAGS-gold: \
+    configure-gold 
+       @[ -f ./gold/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing TAGS in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15446,25 +16098,25 @@ TAGS-libelf: \
                   TAGS) \
           || exit 1
  
-@endif libelf
+@endif gold
  
-.PHONY: maybe-install-info-libelf install-info-libelf
-maybe-install-info-libelf:
-@if libelf
-maybe-install-info-libelf: install-info-libelf
+.PHONY: maybe-install-info-gold install-info-gold
+maybe-install-info-gold:
+@if gold
+maybe-install-info-gold: install-info-gold
  
-install-info-libelf: \
-    configure-libelf \
-    info-libelf 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+install-info-gold: \
+    configure-gold \
+    info-gold 
+       @[ -f ./gold/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing install-info in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15472,25 +16124,25 @@ install-info-libelf: \
                   install-info) \
           || exit 1
  
-@endif libelf
+@endif gold
  
-.PHONY: maybe-install-pdf-libelf install-pdf-libelf
-maybe-install-pdf-libelf:
-@if libelf
-maybe-install-pdf-libelf: install-pdf-libelf
+.PHONY: maybe-install-pdf-gold install-pdf-gold
+maybe-install-pdf-gold:
+@if gold
+maybe-install-pdf-gold: install-pdf-gold
  
-install-pdf-libelf: \
-    configure-libelf \
-    pdf-libelf 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+install-pdf-gold: \
+    configure-gold \
+    pdf-gold 
+       @[ -f ./gold/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-pdf in libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing install-pdf in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15498,25 +16150,25 @@ install-pdf-libelf: \
                   install-pdf) \
           || exit 1
  
-@endif libelf
+@endif gold
  
-.PHONY: maybe-install-html-libelf install-html-libelf
-maybe-install-html-libelf:
-@if libelf
-maybe-install-html-libelf: install-html-libelf
+.PHONY: maybe-install-html-gold install-html-gold
+maybe-install-html-gold:
+@if gold
+maybe-install-html-gold: install-html-gold
  
-install-html-libelf: \
-    configure-libelf \
-    html-libelf 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+install-html-gold: \
+    configure-gold \
+    html-gold 
+       @[ -f ./gold/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-html in libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing install-html in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15524,24 +16176,24 @@ install-html-libelf: \
                   install-html) \
           || exit 1
  
-@endif libelf
+@endif gold
  
-.PHONY: maybe-installcheck-libelf installcheck-libelf
-maybe-installcheck-libelf:
-@if libelf
-maybe-installcheck-libelf: installcheck-libelf
+.PHONY: maybe-installcheck-gold installcheck-gold
+maybe-installcheck-gold:
+@if gold
+maybe-installcheck-gold: installcheck-gold
  
-installcheck-libelf: \
-    configure-libelf 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+installcheck-gold: \
+    configure-gold 
+       @[ -f ./gold/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing installcheck in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15549,23 +16201,23 @@ installcheck-libelf: \
                   installcheck) \
           || exit 1
  
-@endif libelf
+@endif gold
  
-.PHONY: maybe-mostlyclean-libelf mostlyclean-libelf
-maybe-mostlyclean-libelf:
-@if libelf
-maybe-mostlyclean-libelf: mostlyclean-libelf
+.PHONY: maybe-mostlyclean-gold mostlyclean-gold
+maybe-mostlyclean-gold:
+@if gold
+maybe-mostlyclean-gold: mostlyclean-gold
  
-mostlyclean-libelf: 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+mostlyclean-gold: 
+       @[ -f ./gold/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing mostlyclean in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15573,23 +16225,23 @@ mostlyclean-libelf:
                   mostlyclean) \
           || exit 1
  
-@endif libelf
+@endif gold
  
-.PHONY: maybe-clean-libelf clean-libelf
-maybe-clean-libelf:
-@if libelf
-maybe-clean-libelf: clean-libelf
+.PHONY: maybe-clean-gold clean-gold
+maybe-clean-gold:
+@if gold
+maybe-clean-gold: clean-gold
  
-clean-libelf: 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+clean-gold: 
+       @[ -f ./gold/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing clean in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15597,23 +16249,23 @@ clean-libelf:
                   clean) \
           || exit 1
  
-@endif libelf
+@endif gold
  
-.PHONY: maybe-distclean-libelf distclean-libelf
-maybe-distclean-libelf:
-@if libelf
-maybe-distclean-libelf: distclean-libelf
+.PHONY: maybe-distclean-gold distclean-gold
+maybe-distclean-gold:
+@if gold
+maybe-distclean-gold: distclean-gold
  
-distclean-libelf: 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+distclean-gold: 
+       @[ -f ./gold/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing distclean in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15621,23 +16273,23 @@ distclean-libelf:
                   distclean) \
           || exit 1
  
-@endif libelf
+@endif gold
  
-.PHONY: maybe-maintainer-clean-libelf maintainer-clean-libelf
-maybe-maintainer-clean-libelf:
-@if libelf
-maybe-maintainer-clean-libelf: maintainer-clean-libelf
+.PHONY: maybe-maintainer-clean-gold maintainer-clean-gold
+maybe-maintainer-clean-gold:
+@if gold
+maybe-maintainer-clean-gold: maintainer-clean-gold
  
-maintainer-clean-libelf: 
-       @[ -f ./libelf/Makefile ] || exit 0; \
+maintainer-clean-gold: 
+       @[ -f ./gold/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       echo "Doing maintainer-clean in gold"; \
+       (cd $(HOST_SUBDIR)/gold && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -15645,581 +16297,129 @@ maintainer-clean-libelf:
                   maintainer-clean) \
           || exit 1
  
-@endif libelf
+@endif gold
  
  
  
-.PHONY: configure-gold maybe-configure-gold
-maybe-configure-gold:
+.PHONY: configure-gprof maybe-configure-gprof
+maybe-configure-gprof:
  @if gcc-bootstrap
-configure-gold: stage_current
+configure-gprof: stage_current
  @endif gcc-bootstrap
-@if gold
-maybe-configure-gold: configure-gold
-configure-gold: 
+@if gprof
+maybe-configure-gprof: configure-gprof
+configure-gprof: 
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
+       test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof; \
         $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/gold; \
-       cd "$(HOST_SUBDIR)/gold" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gprof; \
+       cd "$(HOST_SUBDIR)/gprof" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gprof/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gprof; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
-@endif gold
-
-
-
-.PHONY: configure-stage1-gold maybe-configure-stage1-gold
-maybe-configure-stage1-gold:
-@if gold-bootstrap
-maybe-configure-stage1-gold: configure-stage1-gold
-configure-stage1-gold:
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE1_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/gold ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
-       cd $(HOST_SUBDIR)/gold || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         $(STAGE1_CONFIGURE_FLAGS)
-@endif gold-bootstrap
+@endif gprof
  
-.PHONY: configure-stage2-gold maybe-configure-stage2-gold
-maybe-configure-stage2-gold:
-@if gold-bootstrap
-maybe-configure-stage2-gold: configure-stage2-gold
-configure-stage2-gold:
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/gold ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
-       cd $(HOST_SUBDIR)/gold || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE2_CONFIGURE_FLAGS)
-@endif gold-bootstrap
  
-.PHONY: configure-stage3-gold maybe-configure-stage3-gold
-maybe-configure-stage3-gold:
-@if gold-bootstrap
-maybe-configure-stage3-gold: configure-stage3-gold
-configure-stage3-gold:
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE3_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/gold ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
-       cd $(HOST_SUBDIR)/gold || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE3_CONFIGURE_FLAGS)
-@endif gold-bootstrap
  
-.PHONY: configure-stage4-gold maybe-configure-stage4-gold
-maybe-configure-stage4-gold:
-@if gold-bootstrap
-maybe-configure-stage4-gold: configure-stage4-gold
-configure-stage4-gold:
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE4_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/gold ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
-       cd $(HOST_SUBDIR)/gold || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE4_CONFIGURE_FLAGS)
-@endif gold-bootstrap
  
-.PHONY: configure-stageprofile-gold maybe-configure-stageprofile-gold
-maybe-configure-stageprofile-gold:
-@if gold-bootstrap
-maybe-configure-stageprofile-gold: configure-stageprofile-gold
-configure-stageprofile-gold:
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/gold ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
-       cd $(HOST_SUBDIR)/gold || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEprofile_CONFIGURE_FLAGS)
-@endif gold-bootstrap
  
-.PHONY: configure-stagefeedback-gold maybe-configure-stagefeedback-gold
-maybe-configure-stagefeedback-gold:
-@if gold-bootstrap
-maybe-configure-stagefeedback-gold: configure-stagefeedback-gold
-configure-stagefeedback-gold:
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
+.PHONY: all-gprof maybe-all-gprof
+maybe-all-gprof:
+@if gcc-bootstrap
+all-gprof: stage_current
+@endif gcc-bootstrap
+@if gprof
+TARGET-gprof=all
+maybe-all-gprof: all-gprof
+all-gprof: configure-gprof
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/gold ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
-       cd $(HOST_SUBDIR)/gold || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif gold-bootstrap
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gprof && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-gprof))
+@endif gprof
  
  
  
  
+.PHONY: check-gprof maybe-check-gprof
+maybe-check-gprof:
+@if gprof
+maybe-check-gprof: check-gprof
  
-.PHONY: all-gold maybe-all-gold
-maybe-all-gold:
-@if gcc-bootstrap
-all-gold: stage_current
-@endif gcc-bootstrap
-@if gold
-TARGET-gold=all
-maybe-all-gold: all-gold
-all-gold: configure-gold
+check-gprof:
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/gold && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-gold))
-@endif gold
+       (cd $(HOST_SUBDIR)/gprof && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
+@endif gprof
  
+.PHONY: install-gprof maybe-install-gprof
+maybe-install-gprof:
+@if gprof
+maybe-install-gprof: install-gprof
  
-.PHONY: all-stage1-gold maybe-all-stage1-gold
-.PHONY: clean-stage1-gold maybe-clean-stage1-gold
-maybe-all-stage1-gold:
-maybe-clean-stage1-gold:
-@if gold-bootstrap
-maybe-all-stage1-gold: all-stage1-gold
-all-stage1: all-stage1-gold
-TARGET-stage1-gold = $(TARGET-gold)
-all-stage1-gold: configure-stage1-gold
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+install-gprof: installdirs
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE1_TFLAGS)"; \
-       $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" \
-               CXXFLAGS="$(STAGE1_CXXFLAGS)" \
-               LIBCFLAGS="$(LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-gold)
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gprof && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
-maybe-clean-stage1-gold: clean-stage1-gold
-clean-stage1: clean-stage1-gold
-clean-stage1-gold:
-       @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage1-gold/Makefile ] || exit 0; \
-         $(MAKE) stage1-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
-@endif gold-bootstrap
+@endif gprof
  
+.PHONY: install-strip-gprof maybe-install-strip-gprof
+maybe-install-strip-gprof:
+@if gprof
+maybe-install-strip-gprof: install-strip-gprof
  
-.PHONY: all-stage2-gold maybe-all-stage2-gold
-.PHONY: clean-stage2-gold maybe-clean-stage2-gold
-maybe-all-stage2-gold:
-maybe-clean-stage2-gold:
-@if gold-bootstrap
-maybe-all-stage2-gold: all-stage2-gold
-all-stage2: all-stage2-gold
-TARGET-stage2-gold = $(TARGET-gold)
-all-stage2-gold: configure-stage2-gold
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+install-strip-gprof: installdirs
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
         $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS)" \
-               CXXFLAGS="$(STAGE2_CXXFLAGS)" \
-               LIBCFLAGS="$(STAGE2_CFLAGS)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
-               $(TARGET-stage2-gold)
+       (cd $(HOST_SUBDIR)/gprof && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
  
-maybe-clean-stage2-gold: clean-stage2-gold
-clean-stage2: clean-stage2-gold
-clean-stage2-gold:
-       @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage2-gold/Makefile ] || exit 0; \
-         $(MAKE) stage2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gold-bootstrap
+@endif gprof
  
+# Other targets (info, dvi, pdf, etc.)
  
-.PHONY: all-stage3-gold maybe-all-stage3-gold
-.PHONY: clean-stage3-gold maybe-clean-stage3-gold
-maybe-all-stage3-gold:
-maybe-clean-stage3-gold:
-@if gold-bootstrap
-maybe-all-stage3-gold: all-stage3-gold
-all-stage3: all-stage3-gold
-TARGET-stage3-gold = $(TARGET-gold)
-all-stage3-gold: configure-stage3-gold
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE3_TFLAGS)"; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS)" \
-               CXXFLAGS="$(STAGE3_CXXFLAGS)" \
-               LIBCFLAGS="$(STAGE3_CFLAGS)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
-               $(TARGET-stage3-gold)
-
-maybe-clean-stage3-gold: clean-stage3-gold
-clean-stage3: clean-stage3-gold
-clean-stage3-gold:
-       @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage3-gold/Makefile ] || exit 0; \
-         $(MAKE) stage3-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gold-bootstrap
-
-
-.PHONY: all-stage4-gold maybe-all-stage4-gold
-.PHONY: clean-stage4-gold maybe-clean-stage4-gold
-maybe-all-stage4-gold:
-maybe-clean-stage4-gold:
-@if gold-bootstrap
-maybe-all-stage4-gold: all-stage4-gold
-all-stage4: all-stage4-gold
-TARGET-stage4-gold = $(TARGET-gold)
-all-stage4-gold: configure-stage4-gold
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE4_TFLAGS)"; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE4_CFLAGS)" \
-               CXXFLAGS="$(STAGE4_CXXFLAGS)" \
-               LIBCFLAGS="$(STAGE4_CFLAGS)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
-               $(TARGET-stage4-gold)
-
-maybe-clean-stage4-gold: clean-stage4-gold
-clean-stage4: clean-stage4-gold
-clean-stage4-gold:
-       @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage4-gold/Makefile ] || exit 0; \
-         $(MAKE) stage4-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gold-bootstrap
-
-
-.PHONY: all-stageprofile-gold maybe-all-stageprofile-gold
-.PHONY: clean-stageprofile-gold maybe-clean-stageprofile-gold
-maybe-all-stageprofile-gold:
-maybe-clean-stageprofile-gold:
-@if gold-bootstrap
-maybe-all-stageprofile-gold: all-stageprofile-gold
-all-stageprofile: all-stageprofile-gold
-TARGET-stageprofile-gold = $(TARGET-gold)
-all-stageprofile-gold: configure-stageprofile-gold
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGEprofile_CFLAGS)" \
-               CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
-               LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
-               $(TARGET-stageprofile-gold)
-
-maybe-clean-stageprofile-gold: clean-stageprofile-gold
-clean-stageprofile: clean-stageprofile-gold
-clean-stageprofile-gold:
-       @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageprofile-gold/Makefile ] || exit 0; \
-         $(MAKE) stageprofile-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gold-bootstrap
-
-
-.PHONY: all-stagefeedback-gold maybe-all-stagefeedback-gold
-.PHONY: clean-stagefeedback-gold maybe-clean-stagefeedback-gold
-maybe-all-stagefeedback-gold:
-maybe-clean-stagefeedback-gold:
-@if gold-bootstrap
-maybe-all-stagefeedback-gold: all-stagefeedback-gold
-all-stagefeedback: all-stagefeedback-gold
-TARGET-stagefeedback-gold = $(TARGET-gold)
-all-stagefeedback-gold: configure-stagefeedback-gold
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGEfeedback_CFLAGS)" \
-               CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
-               LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
-               $(TARGET-stagefeedback-gold)
-
-maybe-clean-stagefeedback-gold: clean-stagefeedback-gold
-clean-stagefeedback: clean-stagefeedback-gold
-clean-stagefeedback-gold:
-       @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-gold/Makefile ] || exit 0; \
-         $(MAKE) stagefeedback-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gold-bootstrap
-
-
-
-
-
-.PHONY: check-gold maybe-check-gold
-maybe-check-gold:
-@if gold
-maybe-check-gold: check-gold
-
-check-gold:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gold && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif gold
-
-.PHONY: install-gold maybe-install-gold
-maybe-install-gold:
-@if gold
-maybe-install-gold: install-gold
-
-install-gold: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gold && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif gold
-
-.PHONY: install-strip-gold maybe-install-strip-gold
-maybe-install-strip-gold:
-@if gold
-maybe-install-strip-gold: install-strip-gold
-
-install-strip-gold: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gold && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif gold
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-gold info-gold
-maybe-info-gold:
-@if gold
-maybe-info-gold: info-gold
-
-info-gold: \
-    configure-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: maybe-info-gprof info-gprof
+maybe-info-gprof:
+@if gprof
+maybe-info-gprof: info-gprof
+
+info-gprof: \
+    configure-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing info in gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing info in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16227,24 +16427,25 @@ info-gold: \
                   info) \
           || exit 1
  
-@endif gold
+@endif gprof
  
-.PHONY: maybe-dvi-gold dvi-gold
-maybe-dvi-gold:
-@if gold
-maybe-dvi-gold: dvi-gold
+.PHONY: maybe-dvi-gprof dvi-gprof
+maybe-dvi-gprof:
+@if gprof
+maybe-dvi-gprof: dvi-gprof
  
-dvi-gold: \
-    configure-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+dvi-gprof: \
+    configure-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing dvi in gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing dvi in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16252,24 +16453,25 @@ dvi-gold: \
                   dvi) \
           || exit 1
  
-@endif gold
+@endif gprof
  
-.PHONY: maybe-pdf-gold pdf-gold
-maybe-pdf-gold:
-@if gold
-maybe-pdf-gold: pdf-gold
+.PHONY: maybe-pdf-gprof pdf-gprof
+maybe-pdf-gprof:
+@if gprof
+maybe-pdf-gprof: pdf-gprof
  
-pdf-gold: \
-    configure-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+pdf-gprof: \
+    configure-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing pdf in gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing pdf in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16277,24 +16479,25 @@ pdf-gold: \
                   pdf) \
           || exit 1
  
-@endif gold
+@endif gprof
  
-.PHONY: maybe-html-gold html-gold
-maybe-html-gold:
-@if gold
-maybe-html-gold: html-gold
+.PHONY: maybe-html-gprof html-gprof
+maybe-html-gprof:
+@if gprof
+maybe-html-gprof: html-gprof
  
-html-gold: \
-    configure-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+html-gprof: \
+    configure-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing html in gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing html in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16302,24 +16505,25 @@ html-gold: \
                   html) \
           || exit 1
  
-@endif gold
+@endif gprof
  
-.PHONY: maybe-TAGS-gold TAGS-gold
-maybe-TAGS-gold:
-@if gold
-maybe-TAGS-gold: TAGS-gold
+.PHONY: maybe-TAGS-gprof TAGS-gprof
+maybe-TAGS-gprof:
+@if gprof
+maybe-TAGS-gprof: TAGS-gprof
  
-TAGS-gold: \
-    configure-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+TAGS-gprof: \
+    configure-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing TAGS in gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing TAGS in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16327,25 +16531,26 @@ TAGS-gold: \
                   TAGS) \
           || exit 1
  
-@endif gold
+@endif gprof
  
-.PHONY: maybe-install-info-gold install-info-gold
-maybe-install-info-gold:
-@if gold
-maybe-install-info-gold: install-info-gold
+.PHONY: maybe-install-info-gprof install-info-gprof
+maybe-install-info-gprof:
+@if gprof
+maybe-install-info-gprof: install-info-gprof
  
-install-info-gold: \
-    configure-gold \
-    info-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+install-info-gprof: \
+    configure-gprof \
+    info-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-info in gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing install-info in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16353,25 +16558,26 @@ install-info-gold: \
                   install-info) \
           || exit 1
  
-@endif gold
+@endif gprof
  
-.PHONY: maybe-install-pdf-gold install-pdf-gold
-maybe-install-pdf-gold:
-@if gold
-maybe-install-pdf-gold: install-pdf-gold
+.PHONY: maybe-install-pdf-gprof install-pdf-gprof
+maybe-install-pdf-gprof:
+@if gprof
+maybe-install-pdf-gprof: install-pdf-gprof
  
-install-pdf-gold: \
-    configure-gold \
-    pdf-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+install-pdf-gprof: \
+    configure-gprof \
+    pdf-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-pdf in gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing install-pdf in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16379,25 +16585,26 @@ install-pdf-gold: \
                   install-pdf) \
           || exit 1
  
-@endif gold
+@endif gprof
  
-.PHONY: maybe-install-html-gold install-html-gold
-maybe-install-html-gold:
-@if gold
-maybe-install-html-gold: install-html-gold
+.PHONY: maybe-install-html-gprof install-html-gprof
+maybe-install-html-gprof:
+@if gprof
+maybe-install-html-gprof: install-html-gprof
  
-install-html-gold: \
-    configure-gold \
-    html-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+install-html-gprof: \
+    configure-gprof \
+    html-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing install-html in gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing install-html in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16405,24 +16612,25 @@ install-html-gold: \
                   install-html) \
           || exit 1
  
-@endif gold
+@endif gprof
  
-.PHONY: maybe-installcheck-gold installcheck-gold
-maybe-installcheck-gold:
-@if gold
-maybe-installcheck-gold: installcheck-gold
+.PHONY: maybe-installcheck-gprof installcheck-gprof
+maybe-installcheck-gprof:
+@if gprof
+maybe-installcheck-gprof: installcheck-gprof
  
-installcheck-gold: \
-    configure-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+installcheck-gprof: \
+    configure-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing installcheck in gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing installcheck in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16430,23 +16638,24 @@ installcheck-gold: \
                   installcheck) \
           || exit 1
  
-@endif gold
+@endif gprof
  
-.PHONY: maybe-mostlyclean-gold mostlyclean-gold
-maybe-mostlyclean-gold:
-@if gold
-maybe-mostlyclean-gold: mostlyclean-gold
+.PHONY: maybe-mostlyclean-gprof mostlyclean-gprof
+maybe-mostlyclean-gprof:
+@if gprof
+maybe-mostlyclean-gprof: mostlyclean-gprof
  
-mostlyclean-gold: 
-       @[ -f ./gold/Makefile ] || exit 0; \
+mostlyclean-gprof: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing mostlyclean in gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing mostlyclean in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16454,23 +16663,24 @@ mostlyclean-gold:
                   mostlyclean) \
           || exit 1
  
-@endif gold
+@endif gprof
  
-.PHONY: maybe-clean-gold clean-gold
-maybe-clean-gold:
-@if gold
-maybe-clean-gold: clean-gold
+.PHONY: maybe-clean-gprof clean-gprof
+maybe-clean-gprof:
+@if gprof
+maybe-clean-gprof: clean-gprof
  
-clean-gold: 
-       @[ -f ./gold/Makefile ] || exit 0; \
+clean-gprof: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing clean in gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing clean in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16478,23 +16688,24 @@ clean-gold:
                   clean) \
           || exit 1
  
-@endif gold
+@endif gprof
  
-.PHONY: maybe-distclean-gold distclean-gold
-maybe-distclean-gold:
-@if gold
-maybe-distclean-gold: distclean-gold
+.PHONY: maybe-distclean-gprof distclean-gprof
+maybe-distclean-gprof:
+@if gprof
+maybe-distclean-gprof: distclean-gprof
  
-distclean-gold: 
-       @[ -f ./gold/Makefile ] || exit 0; \
+distclean-gprof: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing distclean in gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing distclean in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16502,23 +16713,24 @@ distclean-gold:
                   distclean) \
           || exit 1
  
-@endif gold
+@endif gprof
  
-.PHONY: maybe-maintainer-clean-gold maintainer-clean-gold
-maybe-maintainer-clean-gold:
-@if gold
-maybe-maintainer-clean-gold: maintainer-clean-gold
+.PHONY: maybe-maintainer-clean-gprof maintainer-clean-gprof
+maybe-maintainer-clean-gprof:
+@if gprof
+maybe-maintainer-clean-gprof: maintainer-clean-gprof
  
-maintainer-clean-gold: 
-       @[ -f ./gold/Makefile ] || exit 0; \
+maintainer-clean-gprof: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       echo "Doing maintainer-clean in gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       echo "Doing maintainer-clean in gprof"; \
+       (cd $(HOST_SUBDIR)/gprof && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -16526,508 +16738,70 @@ maintainer-clean-gold:
                   maintainer-clean) \
           || exit 1
  
-@endif gold
+@endif gprof
  
  
  
-.PHONY: configure-gprof maybe-configure-gprof
-maybe-configure-gprof:
+.PHONY: configure-intl maybe-configure-intl
+maybe-configure-intl:
  @if gcc-bootstrap
-configure-gprof: stage_current
+configure-intl: stage_current
  @endif gcc-bootstrap
-@if gprof
-maybe-configure-gprof: configure-gprof
-configure-gprof: 
-       @: $(MAKE); $(unstage)
+@if intl
+maybe-configure-intl: configure-intl
+configure-intl: 
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof ; \
+       test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \
         $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/gprof; \
-       cd "$(HOST_SUBDIR)/gprof" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/intl; \
+       cd "$(HOST_SUBDIR)/intl" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gprof/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gprof"; \
-       libsrcdir="$$s/gprof"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=intl; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
-@endif gprof
-
-
-
-
-
-.PHONY: all-gprof maybe-all-gprof
-maybe-all-gprof:
-@if gcc-bootstrap
-all-gprof: stage_current
-@endif gcc-bootstrap
-@if gprof
-TARGET-gprof=all
-maybe-all-gprof: all-gprof
-all-gprof: configure-gprof
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-gprof))
-@endif gprof
-
-
+@endif intl
  
  
-.PHONY: check-gprof maybe-check-gprof
-maybe-check-gprof:
-@if gprof
-maybe-check-gprof: check-gprof
  
-check-gprof:
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage1-intl maybe-configure-stage1-intl
+maybe-configure-stage1-intl:
+@if intl-bootstrap
+maybe-configure-stage1-intl: configure-stage1-intl
+configure-stage1-intl:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif gprof
-
-.PHONY: install-gprof maybe-install-gprof
-maybe-install-gprof:
-@if gprof
-maybe-install-gprof: install-gprof
-
-install-gprof: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif gprof
-
-.PHONY: install-strip-gprof maybe-install-strip-gprof
-maybe-install-strip-gprof:
-@if gprof
-maybe-install-strip-gprof: install-strip-gprof
-
-install-strip-gprof: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif gprof
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-gprof info-gprof
-maybe-info-gprof:
-@if gprof
-maybe-info-gprof: info-gprof
-
-info-gprof: \
-    configure-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing info in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 info) \
-         || exit 1
-
-@endif gprof
-
-.PHONY: maybe-dvi-gprof dvi-gprof
-maybe-dvi-gprof:
-@if gprof
-maybe-dvi-gprof: dvi-gprof
-
-dvi-gprof: \
-    configure-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing dvi in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 dvi) \
-         || exit 1
-
-@endif gprof
-
-.PHONY: maybe-pdf-gprof pdf-gprof
-maybe-pdf-gprof:
-@if gprof
-maybe-pdf-gprof: pdf-gprof
-
-pdf-gprof: \
-    configure-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing pdf in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 pdf) \
-         || exit 1
-
-@endif gprof
-
-.PHONY: maybe-html-gprof html-gprof
-maybe-html-gprof:
-@if gprof
-maybe-html-gprof: html-gprof
-
-html-gprof: \
-    configure-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing html in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 html) \
-         || exit 1
-
-@endif gprof
-
-.PHONY: maybe-TAGS-gprof TAGS-gprof
-maybe-TAGS-gprof:
-@if gprof
-maybe-TAGS-gprof: TAGS-gprof
-
-TAGS-gprof: \
-    configure-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing TAGS in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 TAGS) \
-         || exit 1
-
-@endif gprof
-
-.PHONY: maybe-install-info-gprof install-info-gprof
-maybe-install-info-gprof:
-@if gprof
-maybe-install-info-gprof: install-info-gprof
-
-install-info-gprof: \
-    configure-gprof \
-    info-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing install-info in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-info) \
-         || exit 1
-
-@endif gprof
-
-.PHONY: maybe-install-pdf-gprof install-pdf-gprof
-maybe-install-pdf-gprof:
-@if gprof
-maybe-install-pdf-gprof: install-pdf-gprof
-
-install-pdf-gprof: \
-    configure-gprof \
-    pdf-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing install-pdf in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-pdf) \
-         || exit 1
-
-@endif gprof
-
-.PHONY: maybe-install-html-gprof install-html-gprof
-maybe-install-html-gprof:
-@if gprof
-maybe-install-html-gprof: install-html-gprof
-
-install-html-gprof: \
-    configure-gprof \
-    html-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing install-html in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-html) \
-         || exit 1
-
-@endif gprof
-
-.PHONY: maybe-installcheck-gprof installcheck-gprof
-maybe-installcheck-gprof:
-@if gprof
-maybe-installcheck-gprof: installcheck-gprof
-
-installcheck-gprof: \
-    configure-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing installcheck in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 installcheck) \
-         || exit 1
-
-@endif gprof
-
-.PHONY: maybe-mostlyclean-gprof mostlyclean-gprof
-maybe-mostlyclean-gprof:
-@if gprof
-maybe-mostlyclean-gprof: mostlyclean-gprof
-
-mostlyclean-gprof: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing mostlyclean in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 mostlyclean) \
-         || exit 1
-
-@endif gprof
-
-.PHONY: maybe-clean-gprof clean-gprof
-maybe-clean-gprof:
-@if gprof
-maybe-clean-gprof: clean-gprof
-
-clean-gprof: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing clean in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 clean) \
-         || exit 1
-
-@endif gprof
-
-.PHONY: maybe-distclean-gprof distclean-gprof
-maybe-distclean-gprof:
-@if gprof
-maybe-distclean-gprof: distclean-gprof
-
-distclean-gprof: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing distclean in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 distclean) \
-         || exit 1
-
-@endif gprof
-
-.PHONY: maybe-maintainer-clean-gprof maintainer-clean-gprof
-maybe-maintainer-clean-gprof:
-@if gprof
-maybe-maintainer-clean-gprof: maintainer-clean-gprof
-
-maintainer-clean-gprof: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing maintainer-clean in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 maintainer-clean) \
-         || exit 1
-
-@endif gprof
-
-
-
-.PHONY: configure-intl maybe-configure-intl
-maybe-configure-intl:
-@if gcc-bootstrap
-configure-intl: stage_current
-@endif gcc-bootstrap
-@if intl
-maybe-configure-intl: configure-intl
-configure-intl: 
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
-       $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/intl; \
-       cd "$(HOST_SUBDIR)/intl" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif intl
-
-
-
-.PHONY: configure-stage1-intl maybe-configure-stage1-intl
-maybe-configure-stage1-intl:
-@if intl-bootstrap
-maybe-configure-stage1-intl: configure-stage1-intl
-configure-stage1-intl:
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE1_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
         $(HOST_EXPORTS) \
         CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
         CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
         LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/intl; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \
         cd $(HOST_SUBDIR)/intl || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=intl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
           $(STAGE1_CONFIGURE_FLAGS)
  @endif intl-bootstrap
  
@@ -17047,19 +16821,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=intl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE2_CONFIGURE_FLAGS)
  @endif intl-bootstrap
@@ -17080,19 +16854,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=intl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE3_CONFIGURE_FLAGS)
  @endif intl-bootstrap
@@ -17113,19 +16887,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=intl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE4_CONFIGURE_FLAGS)
  @endif intl-bootstrap
@@ -17146,19 +16920,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=intl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEprofile_CONFIGURE_FLAGS)
  @endif intl-bootstrap
@@ -17179,19 +16953,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=intl; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEfeedback_CONFIGURE_FLAGS)
  @endif intl-bootstrap
@@ -17213,7 +16987,7 @@ all-intl: configure-intl
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/intl && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-intl))
  @endif intl
  
@@ -17234,6 +17008,7 @@ all-stage1-intl: configure-stage1-intl
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/intl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -17241,8 +17016,9 @@ all-stage1-intl: configure-stage1-intl
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-intl)
  
  maybe-clean-stage1-intl: clean-stage1-intl
@@ -17256,7 +17032,7 @@ clean-stage1-intl:
         fi; \
         cd $(HOST_SUBDIR)/intl && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
  @endif intl-bootstrap
  
  
@@ -17276,6 +17052,7 @@ all-stage2-intl: configure-stage2-intl
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/intl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -17284,7 +17061,7 @@ all-stage2-intl: configure-stage2-intl
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-intl)
  
  maybe-clean-stage2-intl: clean-stage2-intl
@@ -17297,9 +17074,7 @@ clean-stage2-intl:
           $(MAKE) stage2-start; \
         fi; \
         cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif intl-bootstrap
  
  
@@ -17319,6 +17094,7 @@ all-stage3-intl: configure-stage3-intl
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/intl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -17327,7 +17103,7 @@ all-stage3-intl: configure-stage3-intl
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-intl)
  
  maybe-clean-stage3-intl: clean-stage3-intl
@@ -17340,9 +17116,7 @@ clean-stage3-intl:
           $(MAKE) stage3-start; \
         fi; \
         cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif intl-bootstrap
  
  
@@ -17362,6 +17136,7 @@ all-stage4-intl: configure-stage4-intl
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/intl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -17370,7 +17145,7 @@ all-stage4-intl: configure-stage4-intl
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-intl)
  
  maybe-clean-stage4-intl: clean-stage4-intl
@@ -17383,9 +17158,7 @@ clean-stage4-intl:
           $(MAKE) stage4-start; \
         fi; \
         cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif intl-bootstrap
  
  
@@ -17405,6 +17178,7 @@ all-stageprofile-intl: configure-stageprofile-intl
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/intl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -17413,7 +17187,7 @@ all-stageprofile-intl: configure-stageprofile-intl
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-intl)
  
  maybe-clean-stageprofile-intl: clean-stageprofile-intl
@@ -17426,9 +17200,7 @@ clean-stageprofile-intl:
           $(MAKE) stageprofile-start; \
         fi; \
         cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif intl-bootstrap
  
  
@@ -17448,6 +17220,7 @@ all-stagefeedback-intl: configure-stagefeedback-intl
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/intl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -17456,7 +17229,7 @@ all-stagefeedback-intl: configure-stagefeedback-intl
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-intl)
  
  maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
@@ -17469,9 +17242,7 @@ clean-stagefeedback-intl:
           $(MAKE) stagefeedback-start; \
         fi; \
         cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif intl-bootstrap
  
  
@@ -17487,9 +17258,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
  
@@ -17539,7 +17310,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}" \
@@ -17564,7 +17335,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}" \
@@ -17589,7 +17360,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}" \
@@ -17614,7 +17385,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}" \
@@ -17639,7 +17410,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}" \
@@ -17665,7 +17436,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}" \
@@ -17691,7 +17462,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}" \
@@ -17717,7 +17488,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}" \
@@ -17742,7 +17513,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}" \
@@ -17766,7 +17537,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}" \
@@ -17790,7 +17561,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}" \
@@ -17814,7 +17585,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}" \
@@ -17838,7 +17609,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}" \
@@ -17863,7 +17634,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; \
@@ -17872,11 +17643,12 @@ configure-tcl:
           *) topdir=`echo $(HOST_SUBDIR)/tcl/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/tcl"; \
-       libsrcdir="$$s/tcl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=tcl; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif tcl
  
@@ -17898,7 +17670,7 @@ all-tcl: configure-tcl
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/tcl && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-tcl))
  @endif tcl
  
@@ -17914,7 +17686,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)
  
@@ -17967,7 +17739,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}" \
@@ -17993,7 +17765,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}" \
@@ -18019,7 +17791,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}" \
@@ -18045,7 +17817,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}" \
@@ -18071,7 +17843,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}" \
@@ -18098,7 +17870,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}" \
@@ -18125,7 +17897,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}" \
@@ -18152,7 +17924,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}" \
@@ -18178,7 +17950,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}" \
@@ -18213,7 +17985,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}" \
@@ -18238,7 +18010,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}" \
@@ -18263,7 +18035,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}" \
@@ -18288,7 +18060,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; \
@@ -18297,11 +18069,12 @@ configure-itcl:
           *) topdir=`echo $(HOST_SUBDIR)/itcl/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/itcl"; \
-       libsrcdir="$$s/itcl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=itcl; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif itcl
  
@@ -18323,7 +18096,7 @@ all-itcl: configure-itcl
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/itcl && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-itcl))
  @endif itcl
  
@@ -18339,7 +18112,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)
  
@@ -18392,7 +18165,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}" \
@@ -18418,7 +18191,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}" \
@@ -18444,7 +18217,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}" \
@@ -18470,7 +18243,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}" \
@@ -18496,7 +18269,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}" \
@@ -18523,7 +18296,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}" \
@@ -18550,7 +18323,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}" \
@@ -18577,7 +18350,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}" \
@@ -18603,7 +18376,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}" \
@@ -18628,7 +18401,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}" \
@@ -18653,7 +18426,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}" \
@@ -18678,7 +18451,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}" \
@@ -18703,7 +18476,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}" \
@@ -18727,7 +18500,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; \
@@ -18736,11 +18509,12 @@ configure-ld:
           *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=ld; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif ld
  
@@ -18761,19 +18535,20 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=ld; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
           $(STAGE1_CONFIGURE_FLAGS)
  @endif ld-bootstrap
  
@@ -18793,19 +18568,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=ld; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE2_CONFIGURE_FLAGS)
  @endif ld-bootstrap
@@ -18826,19 +18601,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=ld; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE3_CONFIGURE_FLAGS)
  @endif ld-bootstrap
@@ -18859,19 +18634,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=ld; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE4_CONFIGURE_FLAGS)
  @endif ld-bootstrap
@@ -18892,19 +18667,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=ld; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEprofile_CONFIGURE_FLAGS)
  @endif ld-bootstrap
@@ -18925,19 +18700,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=ld; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEfeedback_CONFIGURE_FLAGS)
  @endif ld-bootstrap
@@ -18959,7 +18734,7 @@ all-ld: configure-ld
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/ld && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-ld))
  @endif ld
  
@@ -18980,6 +18755,7 @@ all-stage1-ld: configure-stage1-ld
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/ld && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -18987,8 +18763,9 @@ all-stage1-ld: configure-stage1-ld
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-ld)
  
  maybe-clean-stage1-ld: clean-stage1-ld
@@ -19002,7 +18779,7 @@ clean-stage1-ld:
         fi; \
         cd $(HOST_SUBDIR)/ld && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
  @endif ld-bootstrap
  
  
@@ -19022,6 +18799,7 @@ all-stage2-ld: configure-stage2-ld
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/ld && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -19030,7 +18808,7 @@ all-stage2-ld: configure-stage2-ld
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-ld)
  
  maybe-clean-stage2-ld: clean-stage2-ld
@@ -19043,9 +18821,7 @@ clean-stage2-ld:
           $(MAKE) stage2-start; \
         fi; \
         cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif ld-bootstrap
  
  
@@ -19065,6 +18841,7 @@ all-stage3-ld: configure-stage3-ld
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/ld && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -19073,7 +18850,7 @@ all-stage3-ld: configure-stage3-ld
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-ld)
  
  maybe-clean-stage3-ld: clean-stage3-ld
@@ -19086,9 +18863,7 @@ clean-stage3-ld:
           $(MAKE) stage3-start; \
         fi; \
         cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif ld-bootstrap
  
  
@@ -19108,6 +18883,7 @@ all-stage4-ld: configure-stage4-ld
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/ld && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -19116,7 +18892,7 @@ all-stage4-ld: configure-stage4-ld
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-ld)
  
  maybe-clean-stage4-ld: clean-stage4-ld
@@ -19129,9 +18905,7 @@ clean-stage4-ld:
           $(MAKE) stage4-start; \
         fi; \
         cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif ld-bootstrap
  
  
@@ -19151,6 +18925,7 @@ all-stageprofile-ld: configure-stageprofile-ld
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/ld && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -19159,7 +18934,7 @@ all-stageprofile-ld: configure-stageprofile-ld
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-ld)
  
  maybe-clean-stageprofile-ld: clean-stageprofile-ld
@@ -19172,9 +18947,7 @@ clean-stageprofile-ld:
           $(MAKE) stageprofile-start; \
         fi; \
         cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif ld-bootstrap
  
  
@@ -19194,6 +18967,7 @@ all-stagefeedback-ld: configure-stagefeedback-ld
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/ld && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -19202,7 +18976,7 @@ all-stagefeedback-ld: configure-stagefeedback-ld
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-ld)
  
  maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
@@ -19215,9 +18989,7 @@ clean-stagefeedback-ld:
           $(MAKE) stagefeedback-start; \
         fi; \
         cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif ld-bootstrap
  
  
@@ -19233,9 +19005,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
  
@@ -19285,7 +19057,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}" \
@@ -19310,7 +19082,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}" \
@@ -19335,7 +19107,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}" \
@@ -19360,7 +19132,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}" \
@@ -19385,7 +19157,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}" \
@@ -19411,7 +19183,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}" \
@@ -19437,7 +19209,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}" \
@@ -19463,7 +19235,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}" \
@@ -19488,7 +19260,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}" \
@@ -19512,7 +19284,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}" \
@@ -19536,7 +19308,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}" \
@@ -19560,7 +19332,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}" \
@@ -19584,7 +19356,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}" \
@@ -19608,7 +19380,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; \
@@ -19617,11 +19389,12 @@ configure-libbacktrace:
           *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libbacktrace"; \
-       libsrcdir="$$s/libbacktrace"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libbacktrace; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif libbacktrace
  
@@ -19642,19 +19415,20 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libbacktrace"; \
-       libsrcdir="$$s/libbacktrace"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libbacktrace; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
           $(STAGE1_CONFIGURE_FLAGS)
  @endif libbacktrace-bootstrap
  
@@ -19674,19 +19448,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libbacktrace"; \
-       libsrcdir="$$s/libbacktrace"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libbacktrace; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE2_CONFIGURE_FLAGS)
  @endif libbacktrace-bootstrap
@@ -19707,19 +19481,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libbacktrace"; \
-       libsrcdir="$$s/libbacktrace"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libbacktrace; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE3_CONFIGURE_FLAGS)
  @endif libbacktrace-bootstrap
@@ -19740,19 +19514,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libbacktrace"; \
-       libsrcdir="$$s/libbacktrace"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libbacktrace; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE4_CONFIGURE_FLAGS)
  @endif libbacktrace-bootstrap
@@ -19773,19 +19547,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libbacktrace"; \
-       libsrcdir="$$s/libbacktrace"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libbacktrace; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEprofile_CONFIGURE_FLAGS)
  @endif libbacktrace-bootstrap
@@ -19806,19 +19580,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libbacktrace"; \
-       libsrcdir="$$s/libbacktrace"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libbacktrace; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEfeedback_CONFIGURE_FLAGS)
  @endif libbacktrace-bootstrap
@@ -19840,7 +19614,7 @@ all-libbacktrace: configure-libbacktrace
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/libbacktrace && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-libbacktrace))
  @endif libbacktrace
  
@@ -19861,6 +19635,7 @@ all-stage1-libbacktrace: configure-stage1-libbacktrace
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libbacktrace && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -19868,8 +19643,9 @@ all-stage1-libbacktrace: configure-stage1-libbacktrace
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-libbacktrace)
  
  maybe-clean-stage1-libbacktrace: clean-stage1-libbacktrace
@@ -19883,7 +19659,7 @@ clean-stage1-libbacktrace:
         fi; \
         cd $(HOST_SUBDIR)/libbacktrace && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
  @endif libbacktrace-bootstrap
  
  
@@ -19903,6 +19679,7 @@ all-stage2-libbacktrace: configure-stage2-libbacktrace
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libbacktrace && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -19911,7 +19688,7 @@ all-stage2-libbacktrace: configure-stage2-libbacktrace
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-libbacktrace)
  
  maybe-clean-stage2-libbacktrace: clean-stage2-libbacktrace
@@ -19924,9 +19701,7 @@ clean-stage2-libbacktrace:
           $(MAKE) stage2-start; \
         fi; \
         cd $(HOST_SUBDIR)/libbacktrace && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif libbacktrace-bootstrap
  
  
@@ -19946,6 +19721,7 @@ all-stage3-libbacktrace: configure-stage3-libbacktrace
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libbacktrace && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -19954,7 +19730,7 @@ all-stage3-libbacktrace: configure-stage3-libbacktrace
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-libbacktrace)
  
  maybe-clean-stage3-libbacktrace: clean-stage3-libbacktrace
@@ -19967,9 +19743,7 @@ clean-stage3-libbacktrace:
           $(MAKE) stage3-start; \
         fi; \
         cd $(HOST_SUBDIR)/libbacktrace && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif libbacktrace-bootstrap
  
  
@@ -19989,6 +19763,7 @@ all-stage4-libbacktrace: configure-stage4-libbacktrace
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libbacktrace && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -19997,7 +19772,7 @@ all-stage4-libbacktrace: configure-stage4-libbacktrace
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-libbacktrace)
  
  maybe-clean-stage4-libbacktrace: clean-stage4-libbacktrace
@@ -20010,9 +19785,7 @@ clean-stage4-libbacktrace:
           $(MAKE) stage4-start; \
         fi; \
         cd $(HOST_SUBDIR)/libbacktrace && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif libbacktrace-bootstrap
  
  
@@ -20032,6 +19805,7 @@ all-stageprofile-libbacktrace: configure-stageprofile-libbacktrace
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libbacktrace && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -20040,7 +19814,7 @@ all-stageprofile-libbacktrace: configure-stageprofile-libbacktrace
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-libbacktrace)
  
  maybe-clean-stageprofile-libbacktrace: clean-stageprofile-libbacktrace
@@ -20053,9 +19827,7 @@ clean-stageprofile-libbacktrace:
           $(MAKE) stageprofile-start; \
         fi; \
         cd $(HOST_SUBDIR)/libbacktrace && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif libbacktrace-bootstrap
  
  
@@ -20075,6 +19847,7 @@ all-stagefeedback-libbacktrace: configure-stagefeedback-libbacktrace
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libbacktrace && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -20083,7 +19856,7 @@ all-stagefeedback-libbacktrace: configure-stagefeedback-libbacktrace
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-libbacktrace)
  
  maybe-clean-stagefeedback-libbacktrace: clean-stagefeedback-libbacktrace
@@ -20096,9 +19869,7 @@ clean-stagefeedback-libbacktrace:
           $(MAKE) stagefeedback-start; \
         fi; \
         cd $(HOST_SUBDIR)/libbacktrace && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif libbacktrace-bootstrap
  
  
@@ -20114,9 +19885,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
  
@@ -20166,7 +19937,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}" \
@@ -20191,7 +19962,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}" \
@@ -20216,7 +19987,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}" \
@@ -20241,7 +20012,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}" \
@@ -20266,7 +20037,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}" \
@@ -20292,7 +20063,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}" \
@@ -20318,7 +20089,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}" \
@@ -20344,7 +20115,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}" \
@@ -20369,7 +20140,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}" \
@@ -20393,7 +20164,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}" \
@@ -20417,7 +20188,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}" \
@@ -20441,7 +20212,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}" \
@@ -20465,7 +20236,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}" \
@@ -20489,7 +20260,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; \
@@ -20498,11 +20269,12 @@ configure-libcpp:
           *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libcpp; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif libcpp
  
@@ -20523,19 +20295,20 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libcpp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
           $(STAGE1_CONFIGURE_FLAGS)
  @endif libcpp-bootstrap
  
@@ -20555,19 +20328,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libcpp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE2_CONFIGURE_FLAGS)
  @endif libcpp-bootstrap
@@ -20588,19 +20361,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libcpp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE3_CONFIGURE_FLAGS)
  @endif libcpp-bootstrap
@@ -20621,19 +20394,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libcpp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE4_CONFIGURE_FLAGS)
  @endif libcpp-bootstrap
@@ -20654,19 +20427,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libcpp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEprofile_CONFIGURE_FLAGS)
  @endif libcpp-bootstrap
@@ -20687,19 +20460,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libcpp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEfeedback_CONFIGURE_FLAGS)
  @endif libcpp-bootstrap
@@ -20721,7 +20494,7 @@ all-libcpp: configure-libcpp
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/libcpp && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-libcpp))
  @endif libcpp
  
@@ -20742,6 +20515,7 @@ all-stage1-libcpp: configure-stage1-libcpp
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libcpp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -20749,8 +20523,9 @@ all-stage1-libcpp: configure-stage1-libcpp
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-libcpp)
  
  maybe-clean-stage1-libcpp: clean-stage1-libcpp
@@ -20764,7 +20539,7 @@ clean-stage1-libcpp:
         fi; \
         cd $(HOST_SUBDIR)/libcpp && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
  @endif libcpp-bootstrap
  
  
@@ -20784,6 +20559,7 @@ all-stage2-libcpp: configure-stage2-libcpp
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libcpp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -20792,7 +20568,7 @@ all-stage2-libcpp: configure-stage2-libcpp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-libcpp)
  
  maybe-clean-stage2-libcpp: clean-stage2-libcpp
@@ -20805,9 +20581,7 @@ clean-stage2-libcpp:
           $(MAKE) stage2-start; \
         fi; \
         cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif libcpp-bootstrap
  
  
@@ -20827,6 +20601,7 @@ all-stage3-libcpp: configure-stage3-libcpp
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libcpp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -20835,7 +20610,7 @@ all-stage3-libcpp: configure-stage3-libcpp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-libcpp)
  
  maybe-clean-stage3-libcpp: clean-stage3-libcpp
@@ -20848,9 +20623,7 @@ clean-stage3-libcpp:
           $(MAKE) stage3-start; \
         fi; \
         cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif libcpp-bootstrap
  
  
@@ -20870,6 +20643,7 @@ all-stage4-libcpp: configure-stage4-libcpp
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libcpp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -20878,7 +20652,7 @@ all-stage4-libcpp: configure-stage4-libcpp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-libcpp)
  
  maybe-clean-stage4-libcpp: clean-stage4-libcpp
@@ -20891,9 +20665,7 @@ clean-stage4-libcpp:
           $(MAKE) stage4-start; \
         fi; \
         cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif libcpp-bootstrap
  
  
@@ -20913,6 +20685,7 @@ all-stageprofile-libcpp: configure-stageprofile-libcpp
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libcpp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -20921,7 +20694,7 @@ all-stageprofile-libcpp: configure-stageprofile-libcpp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-libcpp)
  
  maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
@@ -20934,9 +20707,7 @@ clean-stageprofile-libcpp:
           $(MAKE) stageprofile-start; \
         fi; \
         cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif libcpp-bootstrap
  
  
@@ -20956,6 +20727,7 @@ all-stagefeedback-libcpp: configure-stagefeedback-libcpp
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libcpp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -20964,7 +20736,7 @@ all-stagefeedback-libcpp: configure-stagefeedback-libcpp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-libcpp)
  
  maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
@@ -20977,9 +20749,7 @@ clean-stagefeedback-libcpp:
           $(MAKE) stagefeedback-start; \
         fi; \
         cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif libcpp-bootstrap
  
  
@@ -20995,9 +20765,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
  
@@ -21047,7 +20817,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}" \
@@ -21072,7 +20842,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}" \
@@ -21097,7 +20867,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}" \
@@ -21122,7 +20892,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}" \
@@ -21147,7 +20917,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}" \
@@ -21173,7 +20943,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}" \
@@ -21199,7 +20969,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}" \
@@ -21225,7 +20995,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}" \
@@ -21250,7 +21020,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}" \
@@ -21274,7 +21044,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}" \
@@ -21298,7 +21068,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}" \
@@ -21322,7 +21092,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}" \
@@ -21346,7 +21116,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}" \
@@ -21370,7 +21140,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; \
@@ -21379,11 +21149,12 @@ configure-libdecnumber:
           *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libdecnumber; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif libdecnumber
  
@@ -21404,19 +21175,20 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libdecnumber; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
           $(STAGE1_CONFIGURE_FLAGS)
  @endif libdecnumber-bootstrap
  
@@ -21436,19 +21208,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libdecnumber; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE2_CONFIGURE_FLAGS)
  @endif libdecnumber-bootstrap
@@ -21469,19 +21241,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libdecnumber; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE3_CONFIGURE_FLAGS)
  @endif libdecnumber-bootstrap
@@ -21502,19 +21274,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libdecnumber; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE4_CONFIGURE_FLAGS)
  @endif libdecnumber-bootstrap
@@ -21535,19 +21307,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libdecnumber; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEprofile_CONFIGURE_FLAGS)
  @endif libdecnumber-bootstrap
@@ -21568,19 +21340,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libdecnumber; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEfeedback_CONFIGURE_FLAGS)
  @endif libdecnumber-bootstrap
@@ -21602,7 +21374,7 @@ all-libdecnumber: configure-libdecnumber
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/libdecnumber && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-libdecnumber))
  @endif libdecnumber
  
@@ -21623,6 +21395,7 @@ all-stage1-libdecnumber: configure-stage1-libdecnumber
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libdecnumber && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -21630,8 +21403,9 @@ all-stage1-libdecnumber: configure-stage1-libdecnumber
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-libdecnumber)
  
  maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber
@@ -21645,7 +21419,7 @@ clean-stage1-libdecnumber:
         fi; \
         cd $(HOST_SUBDIR)/libdecnumber && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
  @endif libdecnumber-bootstrap
  
  
@@ -21665,6 +21439,7 @@ all-stage2-libdecnumber: configure-stage2-libdecnumber
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libdecnumber && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -21673,7 +21448,7 @@ all-stage2-libdecnumber: configure-stage2-libdecnumber
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-libdecnumber)
  
  maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber
@@ -21686,9 +21461,7 @@ clean-stage2-libdecnumber:
           $(MAKE) stage2-start; \
         fi; \
         cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif libdecnumber-bootstrap
  
  
@@ -21708,6 +21481,7 @@ all-stage3-libdecnumber: configure-stage3-libdecnumber
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libdecnumber && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -21716,7 +21490,7 @@ all-stage3-libdecnumber: configure-stage3-libdecnumber
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-libdecnumber)
  
  maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber
@@ -21729,9 +21503,7 @@ clean-stage3-libdecnumber:
           $(MAKE) stage3-start; \
         fi; \
         cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif libdecnumber-bootstrap
  
  
@@ -21751,6 +21523,7 @@ all-stage4-libdecnumber: configure-stage4-libdecnumber
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libdecnumber && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -21759,7 +21532,7 @@ all-stage4-libdecnumber: configure-stage4-libdecnumber
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-libdecnumber)
  
  maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber
@@ -21772,9 +21545,7 @@ clean-stage4-libdecnumber:
           $(MAKE) stage4-start; \
         fi; \
         cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif libdecnumber-bootstrap
  
  
@@ -21794,6 +21565,7 @@ all-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libdecnumber && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -21802,7 +21574,7 @@ all-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-libdecnumber)
  
  maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber
@@ -21815,9 +21587,7 @@ clean-stageprofile-libdecnumber:
           $(MAKE) stageprofile-start; \
         fi; \
         cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif libdecnumber-bootstrap
  
  
@@ -21837,6 +21607,7 @@ all-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libdecnumber && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -21845,7 +21616,7 @@ all-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-libdecnumber)
  
  maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber
@@ -21858,9 +21629,7 @@ clean-stagefeedback-libdecnumber:
           $(MAKE) stagefeedback-start; \
         fi; \
         cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif libdecnumber-bootstrap
  
  
@@ -21876,9 +21645,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
  
@@ -21928,7 +21697,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}" \
@@ -21953,7 +21722,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}" \
@@ -21978,7 +21747,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}" \
@@ -22003,7 +21772,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}" \
@@ -22028,7 +21797,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}" \
@@ -22054,7 +21823,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}" \
@@ -22080,7 +21849,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}" \
@@ -22106,7 +21875,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}" \
@@ -22131,7 +21900,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}" \
@@ -22155,7 +21924,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}" \
@@ -22179,7 +21948,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}" \
@@ -22203,7 +21972,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}" \
@@ -22227,7 +21996,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}" \
@@ -22252,7 +22021,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; \
@@ -22261,11 +22030,12 @@ configure-libgui:
           *) topdir=`echo $(HOST_SUBDIR)/libgui/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libgui"; \
-       libsrcdir="$$s/libgui"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgui; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif libgui
  
@@ -22287,7 +22057,7 @@ all-libgui: configure-libgui
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/libgui && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-libgui))
  @endif libgui
  
@@ -22303,7 +22073,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)
  
@@ -22356,7 +22126,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}" \
@@ -22382,7 +22152,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}" \
@@ -22408,7 +22178,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}" \
@@ -22434,7 +22204,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}" \
@@ -22460,7 +22230,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}" \
@@ -22487,7 +22257,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}" \
@@ -22514,7 +22284,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}" \
@@ -22541,7 +22311,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}" \
@@ -22567,7 +22337,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}" \
@@ -22592,7 +22362,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}" \
@@ -22617,7 +22387,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}" \
@@ -22642,7 +22412,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}" \
@@ -22667,7 +22437,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}" \
@@ -22691,7 +22461,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; \
@@ -22700,11 +22470,12 @@ configure-libiberty:
           *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libiberty; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} @extra_host_libiberty_configure_flags@ \
+         --target=${target_alias} @extra_host_libiberty_configure_flags@ \
           || exit 1
  @endif libiberty
  
@@ -22725,19 +22496,20 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
           $(STAGE1_CONFIGURE_FLAGS) \
           @extra_host_libiberty_configure_flags@
  @endif libiberty-bootstrap
@@ -22758,19 +22530,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE2_CONFIGURE_FLAGS) \
           @extra_host_libiberty_configure_flags@
@@ -22792,19 +22564,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE3_CONFIGURE_FLAGS) \
           @extra_host_libiberty_configure_flags@
@@ -22826,19 +22598,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE4_CONFIGURE_FLAGS) \
           @extra_host_libiberty_configure_flags@
@@ -22860,19 +22632,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEprofile_CONFIGURE_FLAGS) \
           @extra_host_libiberty_configure_flags@
@@ -22894,19 +22666,19 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEfeedback_CONFIGURE_FLAGS) \
           @extra_host_libiberty_configure_flags@
@@ -22929,7 +22701,7 @@ all-libiberty: configure-libiberty
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/libiberty && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-libiberty))
  @endif libiberty
  
@@ -22950,6 +22722,7 @@ all-stage1-libiberty: configure-stage1-libiberty
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiberty && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -22957,8 +22730,9 @@ all-stage1-libiberty: configure-stage1-libiberty
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-libiberty)
  
  maybe-clean-stage1-libiberty: clean-stage1-libiberty
@@ -22972,7 +22746,7 @@ clean-stage1-libiberty:
         fi; \
         cd $(HOST_SUBDIR)/libiberty && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
  @endif libiberty-bootstrap
  
  
@@ -22992,6 +22766,7 @@ all-stage2-libiberty: configure-stage2-libiberty
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiberty && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -23000,7 +22775,7 @@ all-stage2-libiberty: configure-stage2-libiberty
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-libiberty)
  
  maybe-clean-stage2-libiberty: clean-stage2-libiberty
@@ -23013,9 +22788,7 @@ clean-stage2-libiberty:
           $(MAKE) stage2-start; \
         fi; \
         cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif libiberty-bootstrap
  
  
@@ -23035,6 +22808,7 @@ all-stage3-libiberty: configure-stage3-libiberty
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiberty && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -23043,7 +22817,7 @@ all-stage3-libiberty: configure-stage3-libiberty
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-libiberty)
  
  maybe-clean-stage3-libiberty: clean-stage3-libiberty
@@ -23056,9 +22830,7 @@ clean-stage3-libiberty:
           $(MAKE) stage3-start; \
         fi; \
         cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif libiberty-bootstrap
  
  
@@ -23078,6 +22850,7 @@ all-stage4-libiberty: configure-stage4-libiberty
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiberty && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -23086,7 +22859,7 @@ all-stage4-libiberty: configure-stage4-libiberty
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-libiberty)
  
  maybe-clean-stage4-libiberty: clean-stage4-libiberty
@@ -23099,9 +22872,7 @@ clean-stage4-libiberty:
           $(MAKE) stage4-start; \
         fi; \
         cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif libiberty-bootstrap
  
  
@@ -23121,6 +22892,7 @@ all-stageprofile-libiberty: configure-stageprofile-libiberty
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiberty && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -23129,7 +22901,7 @@ all-stageprofile-libiberty: configure-stageprofile-libiberty
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-libiberty)
  
  maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
@@ -23142,9 +22914,7 @@ clean-stageprofile-libiberty:
           $(MAKE) stageprofile-start; \
         fi; \
         cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif libiberty-bootstrap
  
  
@@ -23164,6 +22934,7 @@ all-stagefeedback-libiberty: configure-stagefeedback-libiberty
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiberty && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -23172,7 +22943,7 @@ all-stagefeedback-libiberty: configure-stagefeedback-libiberty
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-libiberty)
  
  maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
@@ -23185,9 +22956,7 @@ clean-stagefeedback-libiberty:
           $(MAKE) stagefeedback-start; \
         fi; \
         cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif libiberty-bootstrap
  
  
@@ -23203,9 +22972,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
  
@@ -23255,7 +23024,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}" \
@@ -23280,7 +23049,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}" \
@@ -23305,7 +23074,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}" \
@@ -23330,7 +23099,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}" \
@@ -23355,7 +23124,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}" \
@@ -23381,7 +23150,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}" \
@@ -23407,7 +23176,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}" \
@@ -23433,7 +23202,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}" \
@@ -23458,7 +23227,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}" \
@@ -23482,7 +23251,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}" \
@@ -23506,7 +23275,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}" \
@@ -23530,7 +23299,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}" \
@@ -23554,7 +23323,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}" \
@@ -23567,112 +23336,582 @@ maintainer-clean-libiberty:
  
  
  
-.PHONY: configure-libiconv maybe-configure-libiconv
-maybe-configure-libiconv:
+.PHONY: configure-libiberty-linker-plugin maybe-configure-libiberty-linker-plugin
+maybe-configure-libiberty-linker-plugin:
  @if gcc-bootstrap
-configure-libiconv: stage_current
+configure-libiberty-linker-plugin: stage_current
  @endif gcc-bootstrap
-@if libiconv
-maybe-configure-libiconv: configure-libiconv
-configure-libiconv: 
-       @: $(MAKE); $(unstage)
+@if libiberty-linker-plugin
+maybe-configure-libiberty-linker-plugin: configure-libiberty-linker-plugin
+configure-libiberty-linker-plugin: 
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libiconv/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv ; \
+       test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \
         $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/libiconv; \
-       cd "$(HOST_SUBDIR)/libiconv" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       cd "$(HOST_SUBDIR)/libiberty-linker-plugin" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libiconv"; \
-       libsrcdir="$$s/libiconv"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libiberty; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} --disable-shared \
+         --target=${target_alias} @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ \
           || exit 1
-@endif libiconv
+@endif libiberty-linker-plugin
+
+
+
+.PHONY: configure-stage1-libiberty-linker-plugin maybe-configure-stage1-libiberty-linker-plugin
+maybe-configure-stage1-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-configure-stage1-libiberty-linker-plugin: configure-stage1-libiberty-linker-plugin
+configure-stage1-libiberty-linker-plugin:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif libiberty-linker-plugin-bootstrap
+
+.PHONY: configure-stage2-libiberty-linker-plugin maybe-configure-stage2-libiberty-linker-plugin
+maybe-configure-stage2-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-configure-stage2-libiberty-linker-plugin: configure-stage2-libiberty-linker-plugin
+configure-stage2-libiberty-linker-plugin:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE2_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif libiberty-linker-plugin-bootstrap
+
+.PHONY: configure-stage3-libiberty-linker-plugin maybe-configure-stage3-libiberty-linker-plugin
+maybe-configure-stage3-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-configure-stage3-libiberty-linker-plugin: configure-stage3-libiberty-linker-plugin
+configure-stage3-libiberty-linker-plugin:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE3_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif libiberty-linker-plugin-bootstrap
+
+.PHONY: configure-stage4-libiberty-linker-plugin maybe-configure-stage4-libiberty-linker-plugin
+maybe-configure-stage4-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-configure-stage4-libiberty-linker-plugin: configure-stage4-libiberty-linker-plugin
+configure-stage4-libiberty-linker-plugin:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE4_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif libiberty-linker-plugin-bootstrap
+
+.PHONY: configure-stageprofile-libiberty-linker-plugin maybe-configure-stageprofile-libiberty-linker-plugin
+maybe-configure-stageprofile-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-configure-stageprofile-libiberty-linker-plugin: configure-stageprofile-libiberty-linker-plugin
+configure-stageprofile-libiberty-linker-plugin:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage profile in $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEprofile_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif libiberty-linker-plugin-bootstrap
+
+.PHONY: configure-stagefeedback-libiberty-linker-plugin maybe-configure-stagefeedback-libiberty-linker-plugin
+maybe-configure-stagefeedback-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-configure-stagefeedback-libiberty-linker-plugin: configure-stagefeedback-libiberty-linker-plugin
+configure-stagefeedback-libiberty-linker-plugin:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEfeedback_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif libiberty-linker-plugin-bootstrap
  
  
  
  
  
-.PHONY: all-libiconv maybe-all-libiconv
-maybe-all-libiconv:
+.PHONY: all-libiberty-linker-plugin maybe-all-libiberty-linker-plugin
+maybe-all-libiberty-linker-plugin:
  @if gcc-bootstrap
-all-libiconv: stage_current
+all-libiberty-linker-plugin: stage_current
  @endif gcc-bootstrap
-@if libiconv
-TARGET-libiconv=all
-maybe-all-libiconv: all-libiconv
-all-libiconv: configure-libiconv
-       @: $(MAKE); $(unstage)
+@if libiberty-linker-plugin
+TARGET-libiberty-linker-plugin=all
+maybe-all-libiberty-linker-plugin: all-libiberty-linker-plugin
+all-libiberty-linker-plugin: configure-libiberty-linker-plugin
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/libiconv && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-libiconv))
-@endif libiconv
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               $(TARGET-libiberty-linker-plugin))
+@endif libiberty-linker-plugin
+
+
+
+.PHONY: all-stage1-libiberty-linker-plugin maybe-all-stage1-libiberty-linker-plugin
+.PHONY: clean-stage1-libiberty-linker-plugin maybe-clean-stage1-libiberty-linker-plugin
+maybe-all-stage1-libiberty-linker-plugin:
+maybe-clean-stage1-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-all-stage1-libiberty-linker-plugin: all-stage1-libiberty-linker-plugin
+all-stage1: all-stage1-libiberty-linker-plugin
+TARGET-stage1-libiberty-linker-plugin = $(TARGET-libiberty-linker-plugin)
+all-stage1-libiberty-linker-plugin: configure-stage1-libiberty-linker-plugin
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE1_CFLAGS)" \
+               CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+               LIBCFLAGS="$(LIBCFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
+               $(TARGET-stage1-libiberty-linker-plugin)
+
+maybe-clean-stage1-libiberty-linker-plugin: clean-stage1-libiberty-linker-plugin
+clean-stage1: clean-stage1-libiberty-linker-plugin
+clean-stage1-libiberty-linker-plugin:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-libiberty-linker-plugin/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+       $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif libiberty-linker-plugin-bootstrap
+
+
+.PHONY: all-stage2-libiberty-linker-plugin maybe-all-stage2-libiberty-linker-plugin
+.PHONY: clean-stage2-libiberty-linker-plugin maybe-clean-stage2-libiberty-linker-plugin
+maybe-all-stage2-libiberty-linker-plugin:
+maybe-clean-stage2-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-all-stage2-libiberty-linker-plugin: all-stage2-libiberty-linker-plugin
+all-stage2: all-stage2-libiberty-linker-plugin
+TARGET-stage2-libiberty-linker-plugin = $(TARGET-libiberty-linker-plugin)
+all-stage2-libiberty-linker-plugin: configure-stage2-libiberty-linker-plugin
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE2_CFLAGS)" \
+               CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGE2_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
+               $(TARGET-stage2-libiberty-linker-plugin)
+
+maybe-clean-stage2-libiberty-linker-plugin: clean-stage2-libiberty-linker-plugin
+clean-stage2: clean-stage2-libiberty-linker-plugin
+clean-stage2-libiberty-linker-plugin:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-libiberty-linker-plugin/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif libiberty-linker-plugin-bootstrap
+
+
+.PHONY: all-stage3-libiberty-linker-plugin maybe-all-stage3-libiberty-linker-plugin
+.PHONY: clean-stage3-libiberty-linker-plugin maybe-clean-stage3-libiberty-linker-plugin
+maybe-all-stage3-libiberty-linker-plugin:
+maybe-clean-stage3-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-all-stage3-libiberty-linker-plugin: all-stage3-libiberty-linker-plugin
+all-stage3: all-stage3-libiberty-linker-plugin
+TARGET-stage3-libiberty-linker-plugin = $(TARGET-libiberty-linker-plugin)
+all-stage3-libiberty-linker-plugin: configure-stage3-libiberty-linker-plugin
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE3_CFLAGS)" \
+               CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGE3_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
+               $(TARGET-stage3-libiberty-linker-plugin)
+
+maybe-clean-stage3-libiberty-linker-plugin: clean-stage3-libiberty-linker-plugin
+clean-stage3: clean-stage3-libiberty-linker-plugin
+clean-stage3-libiberty-linker-plugin:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-libiberty-linker-plugin/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif libiberty-linker-plugin-bootstrap
+
+
+.PHONY: all-stage4-libiberty-linker-plugin maybe-all-stage4-libiberty-linker-plugin
+.PHONY: clean-stage4-libiberty-linker-plugin maybe-clean-stage4-libiberty-linker-plugin
+maybe-all-stage4-libiberty-linker-plugin:
+maybe-clean-stage4-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-all-stage4-libiberty-linker-plugin: all-stage4-libiberty-linker-plugin
+all-stage4: all-stage4-libiberty-linker-plugin
+TARGET-stage4-libiberty-linker-plugin = $(TARGET-libiberty-linker-plugin)
+all-stage4-libiberty-linker-plugin: configure-stage4-libiberty-linker-plugin
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE4_CFLAGS)" \
+               CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGE4_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
+               $(TARGET-stage4-libiberty-linker-plugin)
+
+maybe-clean-stage4-libiberty-linker-plugin: clean-stage4-libiberty-linker-plugin
+clean-stage4: clean-stage4-libiberty-linker-plugin
+clean-stage4-libiberty-linker-plugin:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-libiberty-linker-plugin/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif libiberty-linker-plugin-bootstrap
+
+
+.PHONY: all-stageprofile-libiberty-linker-plugin maybe-all-stageprofile-libiberty-linker-plugin
+.PHONY: clean-stageprofile-libiberty-linker-plugin maybe-clean-stageprofile-libiberty-linker-plugin
+maybe-all-stageprofile-libiberty-linker-plugin:
+maybe-clean-stageprofile-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-all-stageprofile-libiberty-linker-plugin: all-stageprofile-libiberty-linker-plugin
+all-stageprofile: all-stageprofile-libiberty-linker-plugin
+TARGET-stageprofile-libiberty-linker-plugin = $(TARGET-libiberty-linker-plugin)
+all-stageprofile-libiberty-linker-plugin: configure-stageprofile-libiberty-linker-plugin
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGEprofile_CFLAGS)" \
+               CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
+               $(TARGET-stageprofile-libiberty-linker-plugin)
+
+maybe-clean-stageprofile-libiberty-linker-plugin: clean-stageprofile-libiberty-linker-plugin
+clean-stageprofile: clean-stageprofile-libiberty-linker-plugin
+clean-stageprofile-libiberty-linker-plugin:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-libiberty-linker-plugin/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif libiberty-linker-plugin-bootstrap
+
+
+.PHONY: all-stagefeedback-libiberty-linker-plugin maybe-all-stagefeedback-libiberty-linker-plugin
+.PHONY: clean-stagefeedback-libiberty-linker-plugin maybe-clean-stagefeedback-libiberty-linker-plugin
+maybe-all-stagefeedback-libiberty-linker-plugin:
+maybe-clean-stagefeedback-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-all-stagefeedback-libiberty-linker-plugin: all-stagefeedback-libiberty-linker-plugin
+all-stagefeedback: all-stagefeedback-libiberty-linker-plugin
+TARGET-stagefeedback-libiberty-linker-plugin = $(TARGET-libiberty-linker-plugin)
+all-stagefeedback-libiberty-linker-plugin: configure-stagefeedback-libiberty-linker-plugin
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
+               $(TARGET-stagefeedback-libiberty-linker-plugin)
  
+maybe-clean-stagefeedback-libiberty-linker-plugin: clean-stagefeedback-libiberty-linker-plugin
+clean-stagefeedback: clean-stagefeedback-libiberty-linker-plugin
+clean-stagefeedback-libiberty-linker-plugin:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-libiberty-linker-plugin/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif libiberty-linker-plugin-bootstrap
  
  
  
-.PHONY: check-libiconv maybe-check-libiconv
-maybe-check-libiconv:
-@if libiconv
-maybe-check-libiconv: check-libiconv
  
-check-libiconv:
+
+.PHONY: check-libiberty-linker-plugin maybe-check-libiberty-linker-plugin
+maybe-check-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-check-libiberty-linker-plugin: check-libiberty-linker-plugin
+
+check-libiberty-linker-plugin:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libiconv && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ $(EXTRA_BOOTSTRAP_FLAGS) check)
  
-@endif libiconv
+@endif libiberty-linker-plugin
  
-.PHONY: install-libiconv maybe-install-libiconv
-maybe-install-libiconv:
-@if libiconv
-maybe-install-libiconv: install-libiconv
+.PHONY: install-libiberty-linker-plugin maybe-install-libiberty-linker-plugin
+maybe-install-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-install-libiberty-linker-plugin: install-libiberty-linker-plugin
  
-install-libiconv:
+install-libiberty-linker-plugin: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ install)
  
-@endif libiconv
+@endif libiberty-linker-plugin
  
-.PHONY: install-strip-libiconv maybe-install-strip-libiconv
-maybe-install-strip-libiconv:
-@if libiconv
-maybe-install-strip-libiconv: install-strip-libiconv
+.PHONY: install-strip-libiberty-linker-plugin maybe-install-strip-libiberty-linker-plugin
+maybe-install-strip-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-install-strip-libiberty-linker-plugin: install-strip-libiberty-linker-plugin
  
-install-strip-libiconv:
+install-strip-libiberty-linker-plugin: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ install-strip)
  
-@endif libiconv
+@endif libiberty-linker-plugin
  
  # Other targets (info, dvi, pdf, etc.)
  
-.PHONY: maybe-info-libiconv info-libiconv
-maybe-info-libiconv:
-@if libiconv
-maybe-info-libiconv: info-libiconv
+.PHONY: maybe-info-libiberty-linker-plugin info-libiberty-linker-plugin
+maybe-info-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-info-libiberty-linker-plugin: info-libiberty-linker-plugin
  
-info-libiconv: \
-    configure-libiconv 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/Makefile ] || exit 0; \
+info-libiberty-linker-plugin: \
+    configure-libiberty-linker-plugin 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       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 libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
+       echo "Doing info in libiberty-linker-plugin"; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -23680,25 +23919,24 @@ info-libiconv: \
                   info) \
           || exit 1
  
-@endif libiconv
+@endif libiberty-linker-plugin
  
-.PHONY: maybe-dvi-libiconv dvi-libiconv
-maybe-dvi-libiconv:
-@if libiconv
-maybe-dvi-libiconv: dvi-libiconv
+.PHONY: maybe-dvi-libiberty-linker-plugin dvi-libiberty-linker-plugin
+maybe-dvi-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-dvi-libiberty-linker-plugin: dvi-libiberty-linker-plugin
  
-dvi-libiconv: \
-    configure-libiconv 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/Makefile ] || exit 0; \
+dvi-libiberty-linker-plugin: \
+    configure-libiberty-linker-plugin 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       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 libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
+       echo "Doing dvi in libiberty-linker-plugin"; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -23706,25 +23944,24 @@ dvi-libiconv: \
                   dvi) \
           || exit 1
  
-@endif libiconv
+@endif libiberty-linker-plugin
  
-.PHONY: maybe-pdf-libiconv pdf-libiconv
-maybe-pdf-libiconv:
-@if libiconv
-maybe-pdf-libiconv: pdf-libiconv
+.PHONY: maybe-pdf-libiberty-linker-plugin pdf-libiberty-linker-plugin
+maybe-pdf-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-pdf-libiberty-linker-plugin: pdf-libiberty-linker-plugin
  
-pdf-libiconv: \
-    configure-libiconv 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/Makefile ] || exit 0; \
+pdf-libiberty-linker-plugin: \
+    configure-libiberty-linker-plugin 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       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 libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
+       echo "Doing pdf in libiberty-linker-plugin"; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -23732,25 +23969,24 @@ pdf-libiconv: \
                   pdf) \
           || exit 1
  
-@endif libiconv
+@endif libiberty-linker-plugin
  
-.PHONY: maybe-html-libiconv html-libiconv
-maybe-html-libiconv:
-@if libiconv
-maybe-html-libiconv: html-libiconv
+.PHONY: maybe-html-libiberty-linker-plugin html-libiberty-linker-plugin
+maybe-html-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-html-libiberty-linker-plugin: html-libiberty-linker-plugin
  
-html-libiconv: \
-    configure-libiconv 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/Makefile ] || exit 0; \
+html-libiberty-linker-plugin: \
+    configure-libiberty-linker-plugin 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       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 libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
+       echo "Doing html in libiberty-linker-plugin"; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -23758,25 +23994,24 @@ html-libiconv: \
                   html) \
           || exit 1
  
-@endif libiconv
+@endif libiberty-linker-plugin
  
-.PHONY: maybe-TAGS-libiconv TAGS-libiconv
-maybe-TAGS-libiconv:
-@if libiconv
-maybe-TAGS-libiconv: TAGS-libiconv
+.PHONY: maybe-TAGS-libiberty-linker-plugin TAGS-libiberty-linker-plugin
+maybe-TAGS-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-TAGS-libiberty-linker-plugin: TAGS-libiberty-linker-plugin
  
-TAGS-libiconv: \
-    configure-libiconv 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/Makefile ] || exit 0; \
+TAGS-libiberty-linker-plugin: \
+    configure-libiberty-linker-plugin 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       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 libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
+       echo "Doing TAGS in libiberty-linker-plugin"; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -23784,55 +24019,102 @@ TAGS-libiconv: \
                   TAGS) \
           || exit 1
  
-@endif libiconv
+@endif libiberty-linker-plugin
  
-.PHONY: maybe-install-info-libiconv install-info-libiconv
-maybe-install-info-libiconv:
-@if libiconv
-maybe-install-info-libiconv: install-info-libiconv
+.PHONY: maybe-install-info-libiberty-linker-plugin install-info-libiberty-linker-plugin
+maybe-install-info-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-install-info-libiberty-linker-plugin: install-info-libiberty-linker-plugin
  
-# libiconv doesn't support install-info.
-install-info-libiconv:
+install-info-libiberty-linker-plugin: \
+    configure-libiberty-linker-plugin \
+    info-libiberty-linker-plugin 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing install-info in libiberty-linker-plugin"; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 install-info) \
+         || exit 1
  
-@endif libiconv
+@endif libiberty-linker-plugin
  
-.PHONY: maybe-install-pdf-libiconv install-pdf-libiconv
-maybe-install-pdf-libiconv:
-@if libiconv
-maybe-install-pdf-libiconv: install-pdf-libiconv
+.PHONY: maybe-install-pdf-libiberty-linker-plugin install-pdf-libiberty-linker-plugin
+maybe-install-pdf-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-install-pdf-libiberty-linker-plugin: install-pdf-libiberty-linker-plugin
  
-# libiconv doesn't support install-pdf.
-install-pdf-libiconv:
+install-pdf-libiberty-linker-plugin: \
+    configure-libiberty-linker-plugin \
+    pdf-libiberty-linker-plugin 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing install-pdf in libiberty-linker-plugin"; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 install-pdf) \
+         || exit 1
  
-@endif libiconv
+@endif libiberty-linker-plugin
  
-.PHONY: maybe-install-html-libiconv install-html-libiconv
-maybe-install-html-libiconv:
-@if libiconv
-maybe-install-html-libiconv: install-html-libiconv
+.PHONY: maybe-install-html-libiberty-linker-plugin install-html-libiberty-linker-plugin
+maybe-install-html-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-install-html-libiberty-linker-plugin: install-html-libiberty-linker-plugin
  
-# libiconv doesn't support install-html.
-install-html-libiconv:
+install-html-libiberty-linker-plugin: \
+    configure-libiberty-linker-plugin \
+    html-libiberty-linker-plugin 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing install-html in libiberty-linker-plugin"; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 install-html) \
+         || exit 1
  
-@endif libiconv
+@endif libiberty-linker-plugin
  
-.PHONY: maybe-installcheck-libiconv installcheck-libiconv
-maybe-installcheck-libiconv:
-@if libiconv
-maybe-installcheck-libiconv: installcheck-libiconv
+.PHONY: maybe-installcheck-libiberty-linker-plugin installcheck-libiberty-linker-plugin
+maybe-installcheck-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-installcheck-libiberty-linker-plugin: installcheck-libiberty-linker-plugin
  
-installcheck-libiconv: \
-    configure-libiconv 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/Makefile ] || exit 0; \
+installcheck-libiberty-linker-plugin: \
+    configure-libiberty-linker-plugin 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       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 libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
+       echo "Doing installcheck in libiberty-linker-plugin"; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -23840,24 +24122,23 @@ installcheck-libiconv: \
                   installcheck) \
           || exit 1
  
-@endif libiconv
+@endif libiberty-linker-plugin
  
-.PHONY: maybe-mostlyclean-libiconv mostlyclean-libiconv
-maybe-mostlyclean-libiconv:
-@if libiconv
-maybe-mostlyclean-libiconv: mostlyclean-libiconv
+.PHONY: maybe-mostlyclean-libiberty-linker-plugin mostlyclean-libiberty-linker-plugin
+maybe-mostlyclean-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-mostlyclean-libiberty-linker-plugin: mostlyclean-libiberty-linker-plugin
  
-mostlyclean-libiconv: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/Makefile ] || exit 0; \
+mostlyclean-libiberty-linker-plugin: 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       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 libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
+       echo "Doing mostlyclean in libiberty-linker-plugin"; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -23865,24 +24146,23 @@ mostlyclean-libiconv:
                   mostlyclean) \
           || exit 1
  
-@endif libiconv
+@endif libiberty-linker-plugin
  
-.PHONY: maybe-clean-libiconv clean-libiconv
-maybe-clean-libiconv:
-@if libiconv
-maybe-clean-libiconv: clean-libiconv
+.PHONY: maybe-clean-libiberty-linker-plugin clean-libiberty-linker-plugin
+maybe-clean-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-clean-libiberty-linker-plugin: clean-libiberty-linker-plugin
  
-clean-libiconv: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/Makefile ] || exit 0; \
+clean-libiberty-linker-plugin: 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       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 libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
+       echo "Doing clean in libiberty-linker-plugin"; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -23890,24 +24170,23 @@ clean-libiconv:
                   clean) \
           || exit 1
  
-@endif libiconv
+@endif libiberty-linker-plugin
  
-.PHONY: maybe-distclean-libiconv distclean-libiconv
-maybe-distclean-libiconv:
-@if libiconv
-maybe-distclean-libiconv: distclean-libiconv
+.PHONY: maybe-distclean-libiberty-linker-plugin distclean-libiberty-linker-plugin
+maybe-distclean-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-distclean-libiberty-linker-plugin: distclean-libiberty-linker-plugin
  
-distclean-libiconv: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/Makefile ] || exit 0; \
+distclean-libiberty-linker-plugin: 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       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 libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
+       echo "Doing distclean in libiberty-linker-plugin"; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -23915,24 +24194,23 @@ distclean-libiconv:
                   distclean) \
           || exit 1
  
-@endif libiconv
+@endif libiberty-linker-plugin
  
-.PHONY: maybe-maintainer-clean-libiconv maintainer-clean-libiconv
-maybe-maintainer-clean-libiconv:
-@if libiconv
-maybe-maintainer-clean-libiconv: maintainer-clean-libiconv
+.PHONY: maybe-maintainer-clean-libiberty-linker-plugin maintainer-clean-libiberty-linker-plugin
+maybe-maintainer-clean-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-maintainer-clean-libiberty-linker-plugin: maintainer-clean-libiberty-linker-plugin
  
-maintainer-clean-libiconv: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/Makefile ] || exit 0; \
+maintainer-clean-libiberty-linker-plugin: 
+       @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       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 libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
+       echo "Doing maintainer-clean in libiberty-linker-plugin"; \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -23940,302 +24218,1084 @@ maintainer-clean-libiconv:
                   maintainer-clean) \
           || exit 1
  
-@endif libiconv
+@endif libiberty-linker-plugin
  
  
  
-.PHONY: configure-m4 maybe-configure-m4
-maybe-configure-m4:
+.PHONY: configure-libiconv maybe-configure-libiconv
+maybe-configure-libiconv:
  @if gcc-bootstrap
-configure-m4: stage_current
+configure-libiconv: stage_current
  @endif gcc-bootstrap
-@if m4
-maybe-configure-m4: configure-m4
-configure-m4: 
-       @: $(MAKE); $(unstage)
+@if libiconv
+maybe-configure-libiconv: configure-libiconv
+configure-libiconv: 
         @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 ; \
+       test ! -f $(HOST_SUBDIR)/libiconv/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv; \
         $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/m4; \
-       cd "$(HOST_SUBDIR)/m4" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libiconv; \
+       cd "$(HOST_SUBDIR)/libiconv" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/m4/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/m4"; \
-       libsrcdir="$$s/m4"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libiconv; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias} --disable-shared \
           || exit 1
-@endif m4
+@endif 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: all-m4 maybe-all-m4
-maybe-all-m4:
+.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
+maybe-all-libiconv:
  @if gcc-bootstrap
-all-m4: stage_current
+all-libiconv: stage_current
  @endif gcc-bootstrap
-@if m4
-TARGET-m4=all
-maybe-all-m4: all-m4
-all-m4: configure-m4
-       @: $(MAKE); $(unstage)
+@if libiconv
+TARGET-libiconv=all
+maybe-all-libiconv: all-libiconv
+all-libiconv: configure-libiconv
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/m4 && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-m4))
-@endif m4
-
+       (cd $(HOST_SUBDIR)/libiconv && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-libiconv))
+@endif libiconv
  
  
  
-.PHONY: check-m4 maybe-check-m4
-maybe-check-m4:
-@if m4
-maybe-check-m4: check-m4
+.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)
  
-check-m4:
-       @: $(MAKE); $(unstage)
+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) \
-       (cd $(HOST_SUBDIR)/m4 && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       $(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)
  
-@endif m4
+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)
  
-.PHONY: install-m4 maybe-install-m4
-maybe-install-m4:
-@if m4
-maybe-install-m4: install-m4
+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)
  
-install-m4: installdirs
-       @: $(MAKE); $(unstage)
+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) \
-       (cd $(HOST_SUBDIR)/m4 && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+       $(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)
  
-@endif m4
+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: install-strip-m4 maybe-install-strip-m4
-maybe-install-strip-m4:
-@if m4
-maybe-install-strip-m4: install-strip-m4
  
-install-strip-m4: installdirs
+
+
+
+.PHONY: check-libiconv maybe-check-libiconv
+maybe-check-libiconv:
+@if libiconv
+maybe-check-libiconv: check-libiconv
+
+check-libiconv:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/m4 && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libiconv && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
  
-@endif m4
+@endif libiconv
+
+.PHONY: install-libiconv maybe-install-libiconv
+maybe-install-libiconv:
+@if libiconv
+maybe-install-libiconv: install-libiconv
+
+install-libiconv:
+
+@endif libiconv
+
+.PHONY: install-strip-libiconv maybe-install-strip-libiconv
+maybe-install-strip-libiconv:
+@if libiconv
+maybe-install-strip-libiconv: install-strip-libiconv
+
+install-strip-libiconv:
+
+@endif libiconv
  
  # Other targets (info, dvi, pdf, etc.)
  
-.PHONY: maybe-info-m4 info-m4
-maybe-info-m4:
-@if m4
-maybe-info-m4: info-m4
+.PHONY: maybe-info-libiconv info-libiconv
+maybe-info-libiconv:
+@if libiconv
+maybe-info-libiconv: info-libiconv
  
-info-m4: \
-    configure-m4 
-       @: $(MAKE); $(unstage)
-       @[ -f ./m4/Makefile ] || exit 0; \
+# libiconv doesn't support info.
+info-libiconv:
+
+@endif libiconv
+
+.PHONY: maybe-dvi-libiconv dvi-libiconv
+maybe-dvi-libiconv:
+@if libiconv
+maybe-dvi-libiconv: dvi-libiconv
+
+dvi-libiconv: \
+    configure-libiconv 
+       @[ -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 m4" ; \
-       (cd $(HOST_SUBDIR)/m4 && \
+       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}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 info) \
+                 dvi) \
           || exit 1
  
-@endif m4
+@endif libiconv
  
-.PHONY: maybe-dvi-m4 dvi-m4
-maybe-dvi-m4:
-@if m4
-maybe-dvi-m4: dvi-m4
+.PHONY: maybe-pdf-libiconv pdf-libiconv
+maybe-pdf-libiconv:
+@if libiconv
+maybe-pdf-libiconv: pdf-libiconv
  
-dvi-m4: \
-    configure-m4 
-       @: $(MAKE); $(unstage)
-       @[ -f ./m4/Makefile ] || exit 0; \
+# libiconv doesn't support pdf.
+pdf-libiconv:
+
+@endif libiconv
+
+.PHONY: maybe-html-libiconv html-libiconv
+maybe-html-libiconv:
+@if libiconv
+maybe-html-libiconv: html-libiconv
+
+# libiconv doesn't support html.
+html-libiconv:
+
+@endif libiconv
+
+.PHONY: maybe-TAGS-libiconv TAGS-libiconv
+maybe-TAGS-libiconv:
+@if libiconv
+maybe-TAGS-libiconv: TAGS-libiconv
+
+TAGS-libiconv: \
+    configure-libiconv 
+       @[ -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 dvi in m4" ; \
-       (cd $(HOST_SUBDIR)/m4 && \
+       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}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 dvi) \
+                 TAGS) \
           || exit 1
  
-@endif m4
+@endif libiconv
  
-.PHONY: maybe-pdf-m4 pdf-m4
-maybe-pdf-m4:
-@if m4
-maybe-pdf-m4: pdf-m4
+.PHONY: maybe-install-info-libiconv install-info-libiconv
+maybe-install-info-libiconv:
+@if libiconv
+maybe-install-info-libiconv: install-info-libiconv
  
-pdf-m4: \
-    configure-m4 
-       @: $(MAKE); $(unstage)
-       @[ -f ./m4/Makefile ] || exit 0; \
+# libiconv doesn't support install-info.
+install-info-libiconv:
+
+@endif libiconv
+
+.PHONY: maybe-install-pdf-libiconv install-pdf-libiconv
+maybe-install-pdf-libiconv:
+@if libiconv
+maybe-install-pdf-libiconv: install-pdf-libiconv
+
+# libiconv doesn't support install-pdf.
+install-pdf-libiconv:
+
+@endif libiconv
+
+.PHONY: maybe-install-html-libiconv install-html-libiconv
+maybe-install-html-libiconv:
+@if libiconv
+maybe-install-html-libiconv: install-html-libiconv
+
+# libiconv doesn't support install-html.
+install-html-libiconv:
+
+@endif libiconv
+
+.PHONY: maybe-installcheck-libiconv installcheck-libiconv
+maybe-installcheck-libiconv:
+@if libiconv
+maybe-installcheck-libiconv: installcheck-libiconv
+
+installcheck-libiconv: \
+    configure-libiconv 
+       @[ -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 m4" ; \
-       (cd $(HOST_SUBDIR)/m4 && \
+       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}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 pdf) \
+                 installcheck) \
           || exit 1
  
-@endif m4
+@endif libiconv
  
-.PHONY: maybe-html-m4 html-m4
-maybe-html-m4:
-@if m4
-maybe-html-m4: html-m4
+.PHONY: maybe-mostlyclean-libiconv mostlyclean-libiconv
+maybe-mostlyclean-libiconv:
+@if libiconv
+maybe-mostlyclean-libiconv: mostlyclean-libiconv
  
-html-m4: \
-    configure-m4 
-       @: $(MAKE); $(unstage)
-       @[ -f ./m4/Makefile ] || exit 0; \
+mostlyclean-libiconv: 
+       @[ -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 m4" ; \
-       (cd $(HOST_SUBDIR)/m4 && \
+       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}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 html) \
+                 mostlyclean) \
           || exit 1
  
-@endif m4
+@endif libiconv
  
-.PHONY: maybe-TAGS-m4 TAGS-m4
-maybe-TAGS-m4:
-@if m4
-maybe-TAGS-m4: TAGS-m4
+.PHONY: maybe-clean-libiconv clean-libiconv
+maybe-clean-libiconv:
+@if libiconv
+maybe-clean-libiconv: clean-libiconv
  
-TAGS-m4: \
-    configure-m4 
-       @: $(MAKE); $(unstage)
-       @[ -f ./m4/Makefile ] || exit 0; \
+clean-libiconv: 
+       @[ -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 TAGS in m4" ; \
-       (cd $(HOST_SUBDIR)/m4 && \
+       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}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 TAGS) \
+                 clean) \
           || exit 1
  
-@endif m4
+@endif libiconv
  
-.PHONY: maybe-install-info-m4 install-info-m4
-maybe-install-info-m4:
-@if m4
-maybe-install-info-m4: install-info-m4
+.PHONY: maybe-distclean-libiconv distclean-libiconv
+maybe-distclean-libiconv:
+@if libiconv
+maybe-distclean-libiconv: distclean-libiconv
  
-install-info-m4: \
-    configure-m4 \
-    info-m4 
-       @: $(MAKE); $(unstage)
-       @[ -f ./m4/Makefile ] || exit 0; \
+distclean-libiconv: 
+       @[ -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 install-info in m4" ; \
-       (cd $(HOST_SUBDIR)/m4 && \
+       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}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-info) \
+                 distclean) \
           || exit 1
  
-@endif m4
+@endif libiconv
  
-.PHONY: maybe-install-pdf-m4 install-pdf-m4
-maybe-install-pdf-m4:
-@if m4
-maybe-install-pdf-m4: install-pdf-m4
+.PHONY: maybe-maintainer-clean-libiconv maintainer-clean-libiconv
+maybe-maintainer-clean-libiconv:
+@if libiconv
+maybe-maintainer-clean-libiconv: maintainer-clean-libiconv
  
-install-pdf-m4: \
-    configure-m4 \
-    pdf-m4 
-       @: $(MAKE); $(unstage)
-       @[ -f ./m4/Makefile ] || exit 0; \
+maintainer-clean-libiconv: 
+       @[ -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 install-pdf in m4" ; \
-       (cd $(HOST_SUBDIR)/m4 && \
+       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}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-pdf) \
+                 maintainer-clean) \
           || exit 1
  
-@endif m4
+@endif libiconv
  
-.PHONY: maybe-install-html-m4 install-html-m4
-maybe-install-html-m4:
-@if m4
-maybe-install-html-m4: install-html-m4
  
-install-html-m4: \
-    configure-m4 \
+
+.PHONY: configure-m4 maybe-configure-m4
+maybe-configure-m4:
+@if gcc-bootstrap
+configure-m4: stage_current
+@endif gcc-bootstrap
+@if m4
+maybe-configure-m4: configure-m4
+configure-m4: 
+       @: $(MAKE); $(unstage)
+       @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; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/m4; \
+       cd "$(HOST_SUBDIR)/m4" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/m4/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=m4; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias}  \
+         || exit 1
+@endif m4
+
+
+
+
+
+.PHONY: all-m4 maybe-all-m4
+maybe-all-m4:
+@if gcc-bootstrap
+all-m4: stage_current
+@endif gcc-bootstrap
+@if m4
+TARGET-m4=all
+maybe-all-m4: all-m4
+all-m4: configure-m4
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/m4 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-m4))
+@endif m4
+
+
+
+
+.PHONY: check-m4 maybe-check-m4
+maybe-check-m4:
+@if m4
+maybe-check-m4: check-m4
+
+check-m4:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/m4 && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif m4
+
+.PHONY: install-m4 maybe-install-m4
+maybe-install-m4:
+@if m4
+maybe-install-m4: install-m4
+
+install-m4: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/m4 && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif m4
+
+.PHONY: install-strip-m4 maybe-install-strip-m4
+maybe-install-strip-m4:
+@if m4
+maybe-install-strip-m4: install-strip-m4
+
+install-strip-m4: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/m4 && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif m4
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-m4 info-m4
+maybe-info-m4:
+@if m4
+maybe-info-m4: info-m4
+
+info-m4: \
+    configure-m4 
+       @: $(MAKE); $(unstage)
+       @[ -f ./m4/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 m4"; \
+       (cd $(HOST_SUBDIR)/m4 && \
+         $(MAKE) $(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 m4
+
+.PHONY: maybe-dvi-m4 dvi-m4
+maybe-dvi-m4:
+@if m4
+maybe-dvi-m4: dvi-m4
+
+dvi-m4: \
+    configure-m4 
+       @: $(MAKE); $(unstage)
+       @[ -f ./m4/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 m4"; \
+       (cd $(HOST_SUBDIR)/m4 && \
+         $(MAKE) $(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 m4
+
+.PHONY: maybe-pdf-m4 pdf-m4
+maybe-pdf-m4:
+@if m4
+maybe-pdf-m4: pdf-m4
+
+pdf-m4: \
+    configure-m4 
+       @: $(MAKE); $(unstage)
+       @[ -f ./m4/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 m4"; \
+       (cd $(HOST_SUBDIR)/m4 && \
+         $(MAKE) $(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 m4
+
+.PHONY: maybe-html-m4 html-m4
+maybe-html-m4:
+@if m4
+maybe-html-m4: html-m4
+
+html-m4: \
+    configure-m4 
+       @: $(MAKE); $(unstage)
+       @[ -f ./m4/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 m4"; \
+       (cd $(HOST_SUBDIR)/m4 && \
+         $(MAKE) $(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 m4
+
+.PHONY: maybe-TAGS-m4 TAGS-m4
+maybe-TAGS-m4:
+@if m4
+maybe-TAGS-m4: TAGS-m4
+
+TAGS-m4: \
+    configure-m4 
+       @: $(MAKE); $(unstage)
+       @[ -f ./m4/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 m4"; \
+       (cd $(HOST_SUBDIR)/m4 && \
+         $(MAKE) $(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 m4
+
+.PHONY: maybe-install-info-m4 install-info-m4
+maybe-install-info-m4:
+@if m4
+maybe-install-info-m4: install-info-m4
+
+install-info-m4: \
+    configure-m4 \
+    info-m4 
+       @: $(MAKE); $(unstage)
+       @[ -f ./m4/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 m4"; \
+       (cd $(HOST_SUBDIR)/m4 && \
+         $(MAKE) $(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 m4
+
+.PHONY: maybe-install-pdf-m4 install-pdf-m4
+maybe-install-pdf-m4:
+@if m4
+maybe-install-pdf-m4: install-pdf-m4
+
+install-pdf-m4: \
+    configure-m4 \
+    pdf-m4 
+       @: $(MAKE); $(unstage)
+       @[ -f ./m4/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 m4"; \
+       (cd $(HOST_SUBDIR)/m4 && \
+         $(MAKE) $(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 m4
+
+.PHONY: maybe-install-html-m4 install-html-m4
+maybe-install-html-m4:
+@if m4
+maybe-install-html-m4: install-html-m4
+
+install-html-m4: \
+    configure-m4 \
      html-m4 
         @: $(MAKE); $(unstage)
         @[ -f ./m4/Makefile ] || exit 0; \
@@ -24245,7 +25305,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}" \
@@ -24271,7 +25331,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}" \
@@ -24296,7 +25356,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}" \
@@ -24321,7 +25381,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}" \
@@ -24346,7 +25406,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}" \
@@ -24371,7 +25431,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}" \
@@ -24396,7 +25456,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; \
@@ -24405,11 +25465,12 @@ configure-readline:
           *) topdir=`echo $(HOST_SUBDIR)/readline/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/readline"; \
-       libsrcdir="$$s/readline"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=readline; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif readline
  
@@ -24431,7 +25492,7 @@ all-readline: configure-readline
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/readline && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-readline))
  @endif readline
  
@@ -24447,7 +25508,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)
  
@@ -24500,7 +25561,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}" \
@@ -24526,7 +25587,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}" \
@@ -24552,7 +25613,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}" \
@@ -24578,7 +25639,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}" \
@@ -24604,7 +25665,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}" \
@@ -24631,7 +25692,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}" \
@@ -24658,7 +25719,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}" \
@@ -24685,7 +25746,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}" \
@@ -24711,7 +25772,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}" \
@@ -24736,7 +25797,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}" \
@@ -24761,7 +25822,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}" \
@@ -24786,7 +25847,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}" \
@@ -24811,7 +25872,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}" \
@@ -24836,7 +25897,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; \
@@ -24845,11 +25906,12 @@ configure-sid:
           *) topdir=`echo $(HOST_SUBDIR)/sid/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/sid"; \
-       libsrcdir="$$s/sid"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=sid; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif sid
  
@@ -24871,7 +25933,7 @@ all-sid: configure-sid
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/sid && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-sid))
  @endif sid
  
@@ -24887,7 +25949,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)
  
@@ -24940,7 +26002,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}" \
@@ -24966,7 +26028,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}" \
@@ -24992,7 +26054,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}" \
@@ -25018,7 +26080,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}" \
@@ -25044,7 +26106,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}" \
@@ -25071,7 +26133,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}" \
@@ -25098,7 +26160,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}" \
@@ -25125,7 +26187,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}" \
@@ -25151,7 +26213,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}" \
@@ -25176,7 +26238,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}" \
@@ -25201,7 +26263,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}" \
@@ -25226,7 +26288,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}" \
@@ -25251,7 +26313,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}" \
@@ -25276,7 +26338,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; \
@@ -25285,11 +26347,12 @@ configure-sim:
           *) topdir=`echo $(HOST_SUBDIR)/sim/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/sim"; \
-       libsrcdir="$$s/sim"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=sim; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif sim
  
@@ -25311,7 +26374,7 @@ all-sim: configure-sim
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/sim && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-sim))
  @endif sim
  
@@ -25327,7 +26390,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)
  
@@ -25380,7 +26443,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}" \
@@ -25406,7 +26469,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}" \
@@ -25432,7 +26495,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}" \
@@ -25458,7 +26521,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}" \
@@ -25484,7 +26547,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}" \
@@ -25511,7 +26574,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}" \
@@ -25538,7 +26601,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}" \
@@ -25565,7 +26628,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}" \
@@ -25591,7 +26654,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}" \
@@ -25616,7 +26679,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}" \
@@ -25641,7 +26704,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}" \
@@ -25666,7 +26729,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}" \
@@ -25691,7 +26754,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}" \
@@ -25716,7 +26779,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; \
@@ -25725,11 +26788,12 @@ configure-texinfo:
           *) topdir=`echo $(HOST_SUBDIR)/texinfo/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/texinfo"; \
-       libsrcdir="$$s/texinfo"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=texinfo; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif texinfo
  
@@ -25751,7 +26815,7 @@ all-texinfo: configure-texinfo
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/texinfo && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-texinfo))
  @endif texinfo
  
@@ -25767,7 +26831,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)
  
@@ -25808,7 +26872,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}" \
@@ -25834,7 +26898,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}" \
@@ -25860,7 +26924,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}" \
@@ -25886,7 +26950,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}" \
@@ -25912,7 +26976,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}" \
@@ -25939,7 +27003,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}" \
@@ -25966,7 +27030,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}" \
@@ -25993,7 +27057,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}" \
@@ -26019,7 +27083,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}" \
@@ -26044,7 +27108,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}" \
@@ -26069,7 +27133,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}" \
@@ -26094,7 +27158,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}" \
@@ -26119,7 +27183,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}" \
@@ -26143,7 +27207,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; \
@@ -26152,11 +27216,12 @@ configure-zlib:
           *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=zlib; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias} @extra_host_zlib_configure_flags@ \
           || exit 1
  @endif zlib
  
@@ -26177,20 +27242,22 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=zlib; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         $(STAGE1_CONFIGURE_FLAGS)
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS) \
+         @extra_host_zlib_configure_flags@
  @endif zlib-bootstrap
  
  .PHONY: configure-stage2-zlib maybe-configure-stage2-zlib
@@ -26209,21 +27276,22 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=zlib; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE2_CONFIGURE_FLAGS)
+         $(STAGE2_CONFIGURE_FLAGS) \
+         @extra_host_zlib_configure_flags@
  @endif zlib-bootstrap
  
  .PHONY: configure-stage3-zlib maybe-configure-stage3-zlib
@@ -26242,21 +27310,22 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=zlib; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE3_CONFIGURE_FLAGS)
+         $(STAGE3_CONFIGURE_FLAGS) \
+         @extra_host_zlib_configure_flags@
  @endif zlib-bootstrap
  
  .PHONY: configure-stage4-zlib maybe-configure-stage4-zlib
@@ -26275,21 +27344,22 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=zlib; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE4_CONFIGURE_FLAGS)
+         $(STAGE4_CONFIGURE_FLAGS) \
+         @extra_host_zlib_configure_flags@
  @endif zlib-bootstrap
  
  .PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib
@@ -26308,21 +27378,22 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=zlib; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEprofile_CONFIGURE_FLAGS)
+         $(STAGEprofile_CONFIGURE_FLAGS) \
+         @extra_host_zlib_configure_flags@
  @endif zlib-bootstrap
  
  .PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib
@@ -26341,21 +27412,22 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=zlib; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEfeedback_CONFIGURE_FLAGS)
+         $(STAGEfeedback_CONFIGURE_FLAGS) \
+         @extra_host_zlib_configure_flags@
  @endif zlib-bootstrap
  
  
@@ -26375,7 +27447,7 @@ all-zlib: configure-zlib
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/zlib && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-zlib))
  @endif zlib
  
@@ -26396,6 +27468,7 @@ all-stage1-zlib: configure-stage1-zlib
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/zlib && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -26403,8 +27476,9 @@ all-stage1-zlib: configure-stage1-zlib
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-zlib)
  
  maybe-clean-stage1-zlib: clean-stage1-zlib
@@ -26418,7 +27492,7 @@ clean-stage1-zlib:
         fi; \
         cd $(HOST_SUBDIR)/zlib && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
  @endif zlib-bootstrap
  
  
@@ -26438,6 +27512,7 @@ all-stage2-zlib: configure-stage2-zlib
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/zlib && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -26446,7 +27521,7 @@ all-stage2-zlib: configure-stage2-zlib
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-zlib)
  
  maybe-clean-stage2-zlib: clean-stage2-zlib
@@ -26459,9 +27534,7 @@ clean-stage2-zlib:
           $(MAKE) stage2-start; \
         fi; \
         cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif zlib-bootstrap
  
  
@@ -26481,6 +27554,7 @@ all-stage3-zlib: configure-stage3-zlib
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/zlib && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -26489,7 +27563,7 @@ all-stage3-zlib: configure-stage3-zlib
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-zlib)
  
  maybe-clean-stage3-zlib: clean-stage3-zlib
@@ -26502,9 +27576,7 @@ clean-stage3-zlib:
           $(MAKE) stage3-start; \
         fi; \
         cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif zlib-bootstrap
  
  
@@ -26524,6 +27596,7 @@ all-stage4-zlib: configure-stage4-zlib
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/zlib && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -26532,7 +27605,7 @@ all-stage4-zlib: configure-stage4-zlib
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-zlib)
  
  maybe-clean-stage4-zlib: clean-stage4-zlib
@@ -26545,9 +27618,7 @@ clean-stage4-zlib:
           $(MAKE) stage4-start; \
         fi; \
         cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif zlib-bootstrap
  
  
@@ -26567,6 +27638,7 @@ all-stageprofile-zlib: configure-stageprofile-zlib
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/zlib && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -26575,7 +27647,7 @@ all-stageprofile-zlib: configure-stageprofile-zlib
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-zlib)
  
  maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
@@ -26588,9 +27660,7 @@ clean-stageprofile-zlib:
           $(MAKE) stageprofile-start; \
         fi; \
         cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif zlib-bootstrap
  
  
@@ -26610,6 +27680,7 @@ all-stagefeedback-zlib: configure-stagefeedback-zlib
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/zlib && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -26618,7 +27689,7 @@ all-stagefeedback-zlib: configure-stagefeedback-zlib
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-zlib)
  
  maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
@@ -26631,9 +27702,7 @@ clean-stagefeedback-zlib:
           $(MAKE) stagefeedback-start; \
         fi; \
         cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
  @endif zlib-bootstrap
  
  
@@ -26683,7 +27752,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}" \
@@ -26708,7 +27777,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}" \
@@ -26733,7 +27802,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}" \
@@ -26758,7 +27827,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}" \
@@ -26783,7 +27852,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}" \
@@ -26809,7 +27878,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}" \
@@ -26835,7 +27904,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}" \
@@ -26861,7 +27930,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}" \
@@ -26886,7 +27955,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}" \
@@ -26910,7 +27979,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}" \
@@ -26934,7 +28003,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}" \
@@ -26958,7 +28027,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}" \
@@ -26982,7 +28051,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}" \
@@ -27007,7 +28076,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; \
@@ -27016,11 +28085,12 @@ configure-gdb:
           *) topdir=`echo $(HOST_SUBDIR)/gdb/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gdb"; \
-       libsrcdir="$$s/gdb"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gdb; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif gdb
  
@@ -27042,7 +28112,7 @@ all-gdb: configure-gdb
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/gdb && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-gdb))
  @endif gdb
  
@@ -27058,7 +28128,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)
  
@@ -27111,7 +28181,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}" \
@@ -27137,7 +28207,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}" \
@@ -27163,7 +28233,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}" \
@@ -27189,7 +28259,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}" \
@@ -27215,7 +28285,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}" \
@@ -27242,7 +28312,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}" \
@@ -27269,7 +28339,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}" \
@@ -27296,7 +28366,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}" \
@@ -27322,7 +28392,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}" \
@@ -27347,7 +28417,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}" \
@@ -27372,7 +28442,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}" \
@@ -27397,7 +28467,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}" \
@@ -27422,7 +28492,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}" \
@@ -27447,7 +28517,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; \
@@ -27456,11 +28526,12 @@ configure-expect:
           *) topdir=`echo $(HOST_SUBDIR)/expect/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/expect"; \
-       libsrcdir="$$s/expect"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=expect; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif expect
  
@@ -27482,7 +28553,7 @@ all-expect: configure-expect
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/expect && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-expect))
  @endif expect
  
@@ -27498,7 +28569,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)
  
@@ -27551,7 +28622,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}" \
@@ -27577,7 +28648,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}" \
@@ -27603,7 +28674,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}" \
@@ -27629,7 +28700,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}" \
@@ -27655,7 +28726,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}" \
@@ -27682,7 +28753,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}" \
@@ -27709,7 +28780,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}" \
@@ -27736,7 +28807,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}" \
@@ -27762,7 +28833,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}" \
@@ -27787,7 +28858,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}" \
@@ -27812,7 +28883,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}" \
@@ -27837,7 +28908,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}" \
@@ -27862,7 +28933,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}" \
@@ -27887,7 +28958,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; \
@@ -27896,11 +28967,12 @@ configure-guile:
           *) topdir=`echo $(HOST_SUBDIR)/guile/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/guile"; \
-       libsrcdir="$$s/guile"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=guile; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif guile
  
@@ -27922,7 +28994,7 @@ all-guile: configure-guile
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/guile && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-guile))
  @endif guile
  
@@ -27938,7 +29010,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)
  
@@ -27991,7 +29063,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}" \
@@ -28017,7 +29089,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}" \
@@ -28043,7 +29115,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}" \
@@ -28069,7 +29141,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}" \
@@ -28095,7 +29167,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}" \
@@ -28122,7 +29194,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}" \
@@ -28149,7 +29221,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}" \
@@ -28176,7 +29248,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}" \
@@ -28202,7 +29274,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}" \
@@ -28227,7 +29299,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}" \
@@ -28252,7 +29324,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}" \
@@ -28277,7 +29349,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}" \
@@ -28302,7 +29374,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}" \
@@ -28327,7 +29399,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; \
@@ -28336,11 +29408,12 @@ configure-tk:
           *) topdir=`echo $(HOST_SUBDIR)/tk/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/tk"; \
-       libsrcdir="$$s/tk"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=tk; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif tk
  
@@ -28362,7 +29435,7 @@ all-tk: configure-tk
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/tk && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-tk))
  @endif tk
  
@@ -28378,7 +29451,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)
  
@@ -28431,7 +29504,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}" \
@@ -28457,7 +29530,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}" \
@@ -28483,7 +29556,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}" \
@@ -28509,7 +29582,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}" \
@@ -28535,7 +29608,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}" \
@@ -28562,7 +29635,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}" \
@@ -28589,7 +29662,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}" \
@@ -28616,7 +29689,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}" \
@@ -28642,7 +29715,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}" \
@@ -28667,7 +29740,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}" \
@@ -28692,7 +29765,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}" \
@@ -28717,7 +29790,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}" \
@@ -28742,7 +29815,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}" \
@@ -28767,7 +29840,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; \
@@ -28776,11 +29849,12 @@ configure-libtermcap:
           *) topdir=`echo $(HOST_SUBDIR)/libtermcap/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libtermcap"; \
-       libsrcdir="$$s/libtermcap"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libtermcap; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif libtermcap
  
@@ -28802,7 +29876,7 @@ all-libtermcap: configure-libtermcap
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/libtermcap && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-libtermcap))
  @endif libtermcap
  
@@ -28865,7 +29939,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}" \
@@ -28891,7 +29965,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}" \
@@ -28917,7 +29991,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}" \
@@ -28943,7 +30017,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}" \
@@ -28969,7 +30043,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}" \
@@ -28996,7 +30070,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}" \
@@ -29023,7 +30097,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}" \
@@ -29050,7 +30124,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}" \
@@ -29076,7 +30150,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}" \
@@ -29141,7 +30215,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; \
@@ -29150,11 +30224,12 @@ configure-utils:
           *) topdir=`echo $(HOST_SUBDIR)/utils/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/utils"; \
-       libsrcdir="$$s/utils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=utils; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif utils
  
@@ -29176,7 +30251,7 @@ all-utils: configure-utils
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/utils && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-utils))
  @endif utils
  
@@ -29239,7 +30314,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}" \
@@ -29265,7 +30340,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}" \
@@ -29291,7 +30366,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}" \
@@ -29317,7 +30392,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}" \
@@ -29343,7 +30418,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}" \
@@ -29370,7 +30445,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}" \
@@ -29397,7 +30472,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}" \
@@ -29424,7 +30499,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}" \
@@ -29450,7 +30525,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}" \
@@ -29475,7 +30550,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}" \
@@ -29500,7 +30575,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}" \
@@ -29525,7 +30600,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}" \
@@ -29550,7 +30625,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}" \
@@ -29575,7 +30650,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; \
@@ -29584,11 +30659,12 @@ configure-gnattools:
           *) topdir=`echo $(HOST_SUBDIR)/gnattools/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/gnattools"; \
-       libsrcdir="$$s/gnattools"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gnattools; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif gnattools
  
@@ -29610,7 +30686,7 @@ all-gnattools: configure-gnattools
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/gnattools && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
                 $(TARGET-gnattools))
  @endif gnattools
  
@@ -29626,7 +30702,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)
  
@@ -29679,7 +30755,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}" \
@@ -29705,7 +30781,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}" \
@@ -29731,7 +30807,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}" \
@@ -29757,7 +30833,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}" \
@@ -29783,7 +30859,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}" \
@@ -29810,7 +30886,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}" \
@@ -29837,7 +30913,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}" \
@@ -29864,7 +30940,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}" \
@@ -29890,7 +30966,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}" \
@@ -29915,7 +30991,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}" \
@@ -29940,7 +31016,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}" \
@@ -29965,7 +31041,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}" \
@@ -29990,7 +31066,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}" \
@@ -30014,7 +31090,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; \
@@ -30023,11 +31099,12 @@ configure-lto-plugin:
           *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
-       libsrcdir="$$s/lto-plugin"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=lto-plugin; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} --enable-shared \
+         --target=${target_alias} --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ \
           || exit 1
  @endif lto-plugin
  
@@ -30048,21 +31125,22 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
-       libsrcdir="$$s/lto-plugin"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=lto-plugin; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
           $(STAGE1_CONFIGURE_FLAGS) \
-         --enable-shared
+         --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
  @endif lto-plugin-bootstrap
  
  .PHONY: configure-stage2-lto-plugin maybe-configure-stage2-lto-plugin
@@ -30081,22 +31159,22 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
-       libsrcdir="$$s/lto-plugin"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=lto-plugin; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE2_CONFIGURE_FLAGS) \
-         --enable-shared
+         --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
  @endif lto-plugin-bootstrap
  
  .PHONY: configure-stage3-lto-plugin maybe-configure-stage3-lto-plugin
@@ -30115,22 +31193,22 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
-       libsrcdir="$$s/lto-plugin"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=lto-plugin; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE3_CONFIGURE_FLAGS) \
-         --enable-shared
+         --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
  @endif lto-plugin-bootstrap
  
  .PHONY: configure-stage4-lto-plugin maybe-configure-stage4-lto-plugin
@@ -30149,22 +31227,22 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
-       libsrcdir="$$s/lto-plugin"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=lto-plugin; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE4_CONFIGURE_FLAGS) \
-         --enable-shared
+         --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
  @endif lto-plugin-bootstrap
  
  .PHONY: configure-stageprofile-lto-plugin maybe-configure-stageprofile-lto-plugin
@@ -30183,22 +31261,22 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
-       libsrcdir="$$s/lto-plugin"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=lto-plugin; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEprofile_CONFIGURE_FLAGS) \
-         --enable-shared
+         --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
  @endif lto-plugin-bootstrap
  
  .PHONY: configure-stagefeedback-lto-plugin maybe-configure-stagefeedback-lto-plugin
@@ -30217,22 +31295,22 @@ 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) ;; \
           *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
-       libsrcdir="$$s/lto-plugin"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=lto-plugin; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEfeedback_CONFIGURE_FLAGS) \
-         --enable-shared
+         --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
  @endif lto-plugin-bootstrap
  
  
@@ -30252,7 +31330,7 @@ all-lto-plugin: configure-lto-plugin
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
                 $(TARGET-lto-plugin))
  @endif lto-plugin
  
@@ -30273,6 +31351,7 @@ all-stage1-lto-plugin: configure-stage1-lto-plugin
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/lto-plugin && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -30280,8 +31359,9 @@ all-stage1-lto-plugin: configure-stage1-lto-plugin
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-lto-plugin)
  
  maybe-clean-stage1-lto-plugin: clean-stage1-lto-plugin
@@ -30295,7 +31375,7 @@ clean-stage1-lto-plugin:
         fi; \
         cd $(HOST_SUBDIR)/lto-plugin && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
  @endif lto-plugin-bootstrap
  
  
@@ -30315,6 +31395,7 @@ all-stage2-lto-plugin: configure-stage2-lto-plugin
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/lto-plugin && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -30322,8 +31403,8 @@ all-stage2-lto-plugin: configure-stage2-lto-plugin
                 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)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-lto-plugin)
  
  maybe-clean-stage2-lto-plugin: clean-stage2-lto-plugin
@@ -30336,9 +31417,7 @@ clean-stage2-lto-plugin:
           $(MAKE) stage2-start; \
         fi; \
         cd $(HOST_SUBDIR)/lto-plugin && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
  @endif lto-plugin-bootstrap
  
  
@@ -30358,6 +31437,7 @@ all-stage3-lto-plugin: configure-stage3-lto-plugin
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/lto-plugin && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -30365,8 +31445,8 @@ all-stage3-lto-plugin: configure-stage3-lto-plugin
                 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)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-lto-plugin)
  
  maybe-clean-stage3-lto-plugin: clean-stage3-lto-plugin
@@ -30379,9 +31459,7 @@ clean-stage3-lto-plugin:
           $(MAKE) stage3-start; \
         fi; \
         cd $(HOST_SUBDIR)/lto-plugin && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
  @endif lto-plugin-bootstrap
  
  
@@ -30401,6 +31479,7 @@ all-stage4-lto-plugin: configure-stage4-lto-plugin
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/lto-plugin && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -30408,8 +31487,8 @@ all-stage4-lto-plugin: configure-stage4-lto-plugin
                 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)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-lto-plugin)
  
  maybe-clean-stage4-lto-plugin: clean-stage4-lto-plugin
@@ -30422,9 +31501,7 @@ clean-stage4-lto-plugin:
           $(MAKE) stage4-start; \
         fi; \
         cd $(HOST_SUBDIR)/lto-plugin && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
  @endif lto-plugin-bootstrap
  
  
@@ -30444,6 +31521,7 @@ all-stageprofile-lto-plugin: configure-stageprofile-lto-plugin
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/lto-plugin && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -30451,8 +31529,8 @@ all-stageprofile-lto-plugin: configure-stageprofile-lto-plugin
                 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)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-lto-plugin)
  
  maybe-clean-stageprofile-lto-plugin: clean-stageprofile-lto-plugin
@@ -30465,9 +31543,7 @@ clean-stageprofile-lto-plugin:
           $(MAKE) stageprofile-start; \
         fi; \
         cd $(HOST_SUBDIR)/lto-plugin && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
  @endif lto-plugin-bootstrap
  
  
@@ -30487,6 +31563,7 @@ all-stagefeedback-lto-plugin: configure-stagefeedback-lto-plugin
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/lto-plugin && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -30494,8 +31571,8 @@ all-stagefeedback-lto-plugin: configure-stagefeedback-lto-plugin
                 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)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-lto-plugin)
  
  maybe-clean-stagefeedback-lto-plugin: clean-stagefeedback-lto-plugin
@@ -30508,9 +31585,7 @@ clean-stagefeedback-lto-plugin:
           $(MAKE) stagefeedback-start; \
         fi; \
         cd $(HOST_SUBDIR)/lto-plugin && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
  @endif lto-plugin-bootstrap
  
  
@@ -30526,9 +31601,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)  check)
+         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ $(EXTRA_BOOTSTRAP_FLAGS) check)
  
  @endif lto-plugin
  
@@ -30543,7 +31618,7 @@ install-lto-plugin: installdirs
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ install)
  
  @endif lto-plugin
  
@@ -30558,7 +31633,7 @@ install-strip-lto-plugin: installdirs
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ install-strip)
  
  @endif lto-plugin
  
@@ -30575,10 +31650,10 @@ info-lto-plugin: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) @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}" \
@@ -30600,10 +31675,10 @@ dvi-lto-plugin: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) @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}" \
@@ -30625,10 +31700,10 @@ pdf-lto-plugin: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) @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}" \
@@ -30650,10 +31725,10 @@ html-lto-plugin: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) @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}" \
@@ -30675,10 +31750,10 @@ TAGS-lto-plugin: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) @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}" \
@@ -30701,10 +31776,10 @@ install-info-lto-plugin: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) @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}" \
@@ -30727,10 +31802,10 @@ install-pdf-lto-plugin: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) @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}" \
@@ -30753,10 +31828,10 @@ install-html-lto-plugin: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) @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}" \
@@ -30778,10 +31853,10 @@ installcheck-lto-plugin: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) @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}" \
@@ -30802,10 +31877,10 @@ mostlyclean-lto-plugin:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) @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}" \
@@ -30826,10 +31901,10 @@ clean-lto-plugin:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) @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}" \
@@ -30850,10 +31925,10 @@ distclean-lto-plugin:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) @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}" \
@@ -30874,10 +31949,10 @@ maintainer-clean-lto-plugin:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) @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}" \
@@ -30890,1690 +31965,1657 @@ maintainer-clean-lto-plugin:
  
  
  
-# ---------------------------------------
-# Modules which run on the target machine
-# ---------------------------------------
-
-
-
-
-.PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3
-maybe-configure-target-libstdc++-v3:
+.PHONY: configure-libcc1 maybe-configure-libcc1
+maybe-configure-libcc1:
  @if gcc-bootstrap
-configure-target-libstdc++-v3: stage_current
+configure-libcc1: stage_current
  @endif gcc-bootstrap
-@if target-libstdc++-v3
-maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3
-configure-target-libstdc++-v3: 
+@if libcc1
+maybe-configure-libcc1: configure-libcc1
+configure-libcc1: 
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for libstdc++-v3..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       $(RAW_CXX_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
-       cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/libcc1/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/libcc1; \
+       cd "$(HOST_SUBDIR)/libcc1" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libcc1/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-       libsrcdir="$$s/libstdc++-v3"; \
-       rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+       module_srcdir=libcc1; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} --enable-shared \
           || exit 1
-@endif target-libstdc++-v3
+@endif libcc1
  
  
  
-.PHONY: configure-stage1-target-libstdc++-v3 maybe-configure-stage1-target-libstdc++-v3
-maybe-configure-stage1-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3
-configure-stage1-target-libstdc++-v3:
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE1_TFLAGS)"; \
-       echo "Checking multilib configuration for libstdc++-v3..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-       libsrcdir="$$s/libstdc++-v3"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         $(STAGE1_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
  
-.PHONY: configure-stage2-target-libstdc++-v3 maybe-configure-stage2-target-libstdc++-v3
-maybe-configure-stage2-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stage2-target-libstdc++-v3: configure-stage2-target-libstdc++-v3
-configure-stage2-target-libstdc++-v3:
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+
+.PHONY: all-libcc1 maybe-all-libcc1
+maybe-all-libcc1:
+@if gcc-bootstrap
+all-libcc1: stage_current
+@endif gcc-bootstrap
+@if libcc1
+TARGET-libcc1=all
+maybe-all-libcc1: all-libcc1
+all-libcc1: configure-libcc1
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
-       echo "Checking multilib configuration for libstdc++-v3..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-        \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-       libsrcdir="$$s/libstdc++-v3"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE2_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-libcc1))
+@endif libcc1
  
-.PHONY: configure-stage3-target-libstdc++-v3 maybe-configure-stage3-target-libstdc++-v3
-maybe-configure-stage3-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stage3-target-libstdc++-v3: configure-stage3-target-libstdc++-v3
-configure-stage3-target-libstdc++-v3:
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+
+
+
+.PHONY: check-libcc1 maybe-check-libcc1
+maybe-check-libcc1:
+@if libcc1
+maybe-check-libcc1: check-libcc1
+
+check-libcc1:
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE3_TFLAGS)"; \
-       echo "Checking multilib configuration for libstdc++-v3..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-        \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-       libsrcdir="$$s/libstdc++-v3"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE3_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
-.PHONY: configure-stage4-target-libstdc++-v3 maybe-configure-stage4-target-libstdc++-v3
-maybe-configure-stage4-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stage4-target-libstdc++-v3: configure-stage4-target-libstdc++-v3
-configure-stage4-target-libstdc++-v3:
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+@endif libcc1
+
+.PHONY: install-libcc1 maybe-install-libcc1
+maybe-install-libcc1:
+@if libcc1
+maybe-install-libcc1: install-libcc1
+
+install-libcc1: installdirs
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE4_TFLAGS)"; \
-       echo "Checking multilib configuration for libstdc++-v3..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-        \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-       libsrcdir="$$s/libstdc++-v3"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE4_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
-.PHONY: configure-stageprofile-target-libstdc++-v3 maybe-configure-stageprofile-target-libstdc++-v3
-maybe-configure-stageprofile-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stageprofile-target-libstdc++-v3: configure-stageprofile-target-libstdc++-v3
-configure-stageprofile-target-libstdc++-v3:
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+@endif libcc1
+
+.PHONY: install-strip-libcc1 maybe-install-strip-libcc1
+maybe-install-strip-libcc1:
+@if libcc1
+maybe-install-strip-libcc1: install-strip-libcc1
+
+install-strip-libcc1: installdirs
+       @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       echo "Checking multilib configuration for libstdc++-v3..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-        \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-       libsrcdir="$$s/libstdc++-v3"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEprofile_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
  
-.PHONY: configure-stagefeedback-target-libstdc++-v3 maybe-configure-stagefeedback-target-libstdc++-v3
-maybe-configure-stagefeedback-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stagefeedback-target-libstdc++-v3: configure-stagefeedback-target-libstdc++-v3
-configure-stagefeedback-target-libstdc++-v3:
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
-       @r=`${PWD_COMMAND}`; export r; \
+@endif libcc1
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-libcc1 info-libcc1
+maybe-info-libcc1:
+@if libcc1
+maybe-info-libcc1: info-libcc1
+
+info-libcc1: \
+    configure-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       echo "Checking multilib configuration for libstdc++-v3..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-        \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-       libsrcdir="$$s/libstdc++-v3"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing info in libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 info) \
+         || exit 1
  
+@endif libcc1
  
+.PHONY: maybe-dvi-libcc1 dvi-libcc1
+maybe-dvi-libcc1:
+@if libcc1
+maybe-dvi-libcc1: dvi-libcc1
+
+dvi-libcc1: \
+    configure-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing dvi in libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 dvi) \
+         || exit 1
  
+@endif libcc1
  
+.PHONY: maybe-pdf-libcc1 pdf-libcc1
+maybe-pdf-libcc1:
+@if libcc1
+maybe-pdf-libcc1: pdf-libcc1
  
-.PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3
-maybe-all-target-libstdc++-v3:
-@if gcc-bootstrap
-all-target-libstdc++-v3: stage_current
-@endif gcc-bootstrap
-@if target-libstdc++-v3
-TARGET-target-libstdc++-v3=all
-maybe-all-target-libstdc++-v3: all-target-libstdc++-v3
-all-target-libstdc++-v3: configure-target-libstdc++-v3
-       @r=`${PWD_COMMAND}`; export r; \
+pdf-libcc1: \
+    configure-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
-               $(TARGET-target-libstdc++-v3))
-@endif target-libstdc++-v3
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing pdf in libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 pdf) \
+         || exit 1
  
+@endif libcc1
  
+.PHONY: maybe-html-libcc1 html-libcc1
+maybe-html-libcc1:
+@if libcc1
+maybe-html-libcc1: html-libcc1
  
-.PHONY: all-stage1-target-libstdc++-v3 maybe-all-stage1-target-libstdc++-v3
-.PHONY: clean-stage1-target-libstdc++-v3 maybe-clean-stage1-target-libstdc++-v3
-maybe-all-stage1-target-libstdc++-v3:
-maybe-clean-stage1-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-all-stage1-target-libstdc++-v3: all-stage1-target-libstdc++-v3
-all-stage1: all-stage1-target-libstdc++-v3
-TARGET-stage1-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
-all-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @r=`${PWD_COMMAND}`; export r; \
+html-libcc1: \
+    configure-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE1_TFLAGS)"; \
-       $(RAW_CXX_TARGET_EXPORTS)  \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-target-libstdc++-v3)
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing html in libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 html) \
+         || exit 1
  
-maybe-clean-stage1-target-libstdc++-v3: clean-stage1-target-libstdc++-v3
-clean-stage1: clean-stage1-target-libstdc++-v3
-clean-stage1-target-libstdc++-v3:
-       @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
-       else \
-         [ -f $(TARGET_SUBDIR)/stage1-libstdc++-v3/Makefile ] || exit 0; \
-         $(MAKE) stage1-start; \
-       fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
-                clean
-@endif target-libstdc++-v3-bootstrap
+@endif libcc1
  
+.PHONY: maybe-TAGS-libcc1 TAGS-libcc1
+maybe-TAGS-libcc1:
+@if libcc1
+maybe-TAGS-libcc1: TAGS-libcc1
  
-.PHONY: all-stage2-target-libstdc++-v3 maybe-all-stage2-target-libstdc++-v3
-.PHONY: clean-stage2-target-libstdc++-v3 maybe-clean-stage2-target-libstdc++-v3
-maybe-all-stage2-target-libstdc++-v3:
-maybe-clean-stage2-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-all-stage2-target-libstdc++-v3: all-stage2-target-libstdc++-v3
-all-stage2: all-stage2-target-libstdc++-v3
-TARGET-stage2-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
-all-stage2-target-libstdc++-v3: configure-stage2-target-libstdc++-v3
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @r=`${PWD_COMMAND}`; export r; \
+TAGS-libcc1: \
+    configure-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-         \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-               TFLAGS="$(STAGE2_TFLAGS)" \
-               $(TARGET-stage2-target-libstdc++-v3)
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing TAGS in libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 TAGS) \
+         || exit 1
  
-maybe-clean-stage2-target-libstdc++-v3: clean-stage2-target-libstdc++-v3
-clean-stage2: clean-stage2-target-libstdc++-v3
-clean-stage2-target-libstdc++-v3:
-       @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
-       else \
-         [ -f $(TARGET_SUBDIR)/stage2-libstdc++-v3/Makefile ] || exit 0; \
-         $(MAKE) stage2-start; \
-       fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
-                 \
-                clean
-@endif target-libstdc++-v3-bootstrap
+@endif libcc1
  
+.PHONY: maybe-install-info-libcc1 install-info-libcc1
+maybe-install-info-libcc1:
+@if libcc1
+maybe-install-info-libcc1: install-info-libcc1
  
-.PHONY: all-stage3-target-libstdc++-v3 maybe-all-stage3-target-libstdc++-v3
-.PHONY: clean-stage3-target-libstdc++-v3 maybe-clean-stage3-target-libstdc++-v3
-maybe-all-stage3-target-libstdc++-v3:
-maybe-clean-stage3-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-all-stage3-target-libstdc++-v3: all-stage3-target-libstdc++-v3
-all-stage3: all-stage3-target-libstdc++-v3
-TARGET-stage3-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
-all-stage3-target-libstdc++-v3: configure-stage3-target-libstdc++-v3
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @r=`${PWD_COMMAND}`; export r; \
+install-info-libcc1: \
+    configure-libcc1 \
+    info-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE3_TFLAGS)"; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-         \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-               TFLAGS="$(STAGE3_TFLAGS)" \
-               $(TARGET-stage3-target-libstdc++-v3)
-
-maybe-clean-stage3-target-libstdc++-v3: clean-stage3-target-libstdc++-v3
-clean-stage3: clean-stage3-target-libstdc++-v3
-clean-stage3-target-libstdc++-v3:
-       @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
-       else \
-         [ -f $(TARGET_SUBDIR)/stage3-libstdc++-v3/Makefile ] || exit 0; \
-         $(MAKE) stage3-start; \
-       fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
-                 \
-                clean
-@endif target-libstdc++-v3-bootstrap
-
-
-.PHONY: all-stage4-target-libstdc++-v3 maybe-all-stage4-target-libstdc++-v3
-.PHONY: clean-stage4-target-libstdc++-v3 maybe-clean-stage4-target-libstdc++-v3
-maybe-all-stage4-target-libstdc++-v3:
-maybe-clean-stage4-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-all-stage4-target-libstdc++-v3: all-stage4-target-libstdc++-v3
-all-stage4: all-stage4-target-libstdc++-v3
-TARGET-stage4-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
-all-stage4-target-libstdc++-v3: configure-stage4-target-libstdc++-v3
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE4_TFLAGS)"; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-         \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-               TFLAGS="$(STAGE4_TFLAGS)" \
-               $(TARGET-stage4-target-libstdc++-v3)
-
-maybe-clean-stage4-target-libstdc++-v3: clean-stage4-target-libstdc++-v3
-clean-stage4: clean-stage4-target-libstdc++-v3
-clean-stage4-target-libstdc++-v3:
-       @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
-       else \
-         [ -f $(TARGET_SUBDIR)/stage4-libstdc++-v3/Makefile ] || exit 0; \
-         $(MAKE) stage4-start; \
-       fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
-                 \
-                clean
-@endif target-libstdc++-v3-bootstrap
-
-
-.PHONY: all-stageprofile-target-libstdc++-v3 maybe-all-stageprofile-target-libstdc++-v3
-.PHONY: clean-stageprofile-target-libstdc++-v3 maybe-clean-stageprofile-target-libstdc++-v3
-maybe-all-stageprofile-target-libstdc++-v3:
-maybe-clean-stageprofile-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-all-stageprofile-target-libstdc++-v3: all-stageprofile-target-libstdc++-v3
-all-stageprofile: all-stageprofile-target-libstdc++-v3
-TARGET-stageprofile-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
-all-stageprofile-target-libstdc++-v3: configure-stageprofile-target-libstdc++-v3
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-         \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
-               $(TARGET-stageprofile-target-libstdc++-v3)
-
-maybe-clean-stageprofile-target-libstdc++-v3: clean-stageprofile-target-libstdc++-v3
-clean-stageprofile: clean-stageprofile-target-libstdc++-v3
-clean-stageprofile-target-libstdc++-v3:
-       @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
-       else \
-         [ -f $(TARGET_SUBDIR)/stageprofile-libstdc++-v3/Makefile ] || exit 0; \
-         $(MAKE) stageprofile-start; \
-       fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
-                 \
-                clean
-@endif target-libstdc++-v3-bootstrap
-
-
-.PHONY: all-stagefeedback-target-libstdc++-v3 maybe-all-stagefeedback-target-libstdc++-v3
-.PHONY: clean-stagefeedback-target-libstdc++-v3 maybe-clean-stagefeedback-target-libstdc++-v3
-maybe-all-stagefeedback-target-libstdc++-v3:
-maybe-clean-stagefeedback-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-all-stagefeedback-target-libstdc++-v3: all-stagefeedback-target-libstdc++-v3
-all-stagefeedback: all-stagefeedback-target-libstdc++-v3
-TARGET-stagefeedback-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
-all-stagefeedback-target-libstdc++-v3: configure-stagefeedback-target-libstdc++-v3
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-         \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
-               $(TARGET-stagefeedback-target-libstdc++-v3)
-
-maybe-clean-stagefeedback-target-libstdc++-v3: clean-stagefeedback-target-libstdc++-v3
-clean-stagefeedback: clean-stagefeedback-target-libstdc++-v3
-clean-stagefeedback-target-libstdc++-v3:
-       @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
-       else \
-         [ -f $(TARGET_SUBDIR)/stagefeedback-libstdc++-v3/Makefile ] || exit 0; \
-         $(MAKE) stagefeedback-start; \
-       fi; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
-                 \
-                clean
-@endif target-libstdc++-v3-bootstrap
-
-
-
-
-
-
-.PHONY: check-target-libstdc++-v3 maybe-check-target-libstdc++-v3
-maybe-check-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-check-target-libstdc++-v3: check-target-libstdc++-v3
-
-check-target-libstdc++-v3:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
-
-@endif target-libstdc++-v3
-
-.PHONY: install-target-libstdc++-v3 maybe-install-target-libstdc++-v3
-maybe-install-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-install-target-libstdc++-v3: install-target-libstdc++-v3
-
-install-target-libstdc++-v3: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libstdc++-v3
-
-.PHONY: install-strip-target-libstdc++-v3 maybe-install-strip-target-libstdc++-v3
-maybe-install-strip-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-install-strip-target-libstdc++-v3: install-strip-target-libstdc++-v3
-
-install-strip-target-libstdc++-v3: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
-
-@endif target-libstdc++-v3
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-target-libstdc++-v3 info-target-libstdc++-v3
-maybe-info-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-info-target-libstdc++-v3: info-target-libstdc++-v3
-
-info-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  info) \
-         || exit 1
-
-@endif target-libstdc++-v3
-
-.PHONY: maybe-dvi-target-libstdc++-v3 dvi-target-libstdc++-v3
-maybe-dvi-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-dvi-target-libstdc++-v3: dvi-target-libstdc++-v3
-
-dvi-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  dvi) \
-         || exit 1
-
-@endif target-libstdc++-v3
-
-.PHONY: maybe-pdf-target-libstdc++-v3 pdf-target-libstdc++-v3
-maybe-pdf-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-pdf-target-libstdc++-v3: pdf-target-libstdc++-v3
-
-pdf-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  pdf) \
-         || exit 1
-
-@endif target-libstdc++-v3
-
-.PHONY: maybe-html-target-libstdc++-v3 html-target-libstdc++-v3
-maybe-html-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-html-target-libstdc++-v3: html-target-libstdc++-v3
-
-html-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  html) \
-         || exit 1
-
-@endif target-libstdc++-v3
-
-.PHONY: maybe-TAGS-target-libstdc++-v3 TAGS-target-libstdc++-v3
-maybe-TAGS-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-TAGS-target-libstdc++-v3: TAGS-target-libstdc++-v3
-
-TAGS-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  TAGS) \
-         || exit 1
-
-@endif target-libstdc++-v3
-
-.PHONY: maybe-install-info-target-libstdc++-v3 install-info-target-libstdc++-v3
-maybe-install-info-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-install-info-target-libstdc++-v3: install-info-target-libstdc++-v3
-
-install-info-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 \
-    info-target-libstdc++-v3 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       echo "Doing install-info in libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  install-info) \
+                 install-info) \
           || exit 1
  
-@endif target-libstdc++-v3
+@endif libcc1
  
-.PHONY: maybe-install-pdf-target-libstdc++-v3 install-pdf-target-libstdc++-v3
-maybe-install-pdf-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-install-pdf-target-libstdc++-v3: install-pdf-target-libstdc++-v3
+.PHONY: maybe-install-pdf-libcc1 install-pdf-libcc1
+maybe-install-pdf-libcc1:
+@if libcc1
+maybe-install-pdf-libcc1: install-pdf-libcc1
  
-install-pdf-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 \
-    pdf-target-libstdc++-v3 
+install-pdf-libcc1: \
+    configure-libcc1 \
+    pdf-libcc1 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f ./libcc1/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing install-pdf in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       echo "Doing install-pdf in libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  install-pdf) \
+                 install-pdf) \
           || exit 1
  
-@endif target-libstdc++-v3
+@endif libcc1
  
-.PHONY: maybe-install-html-target-libstdc++-v3 install-html-target-libstdc++-v3
-maybe-install-html-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-install-html-target-libstdc++-v3: install-html-target-libstdc++-v3
+.PHONY: maybe-install-html-libcc1 install-html-libcc1
+maybe-install-html-libcc1:
+@if libcc1
+maybe-install-html-libcc1: install-html-libcc1
  
-install-html-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 \
-    html-target-libstdc++-v3 
+install-html-libcc1: \
+    configure-libcc1 \
+    html-libcc1 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f ./libcc1/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing install-html in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       echo "Doing install-html in libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  install-html) \
+                 install-html) \
           || exit 1
  
-@endif target-libstdc++-v3
+@endif libcc1
  
-.PHONY: maybe-installcheck-target-libstdc++-v3 installcheck-target-libstdc++-v3
-maybe-installcheck-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-installcheck-target-libstdc++-v3: installcheck-target-libstdc++-v3
+.PHONY: maybe-installcheck-libcc1 installcheck-libcc1
+maybe-installcheck-libcc1:
+@if libcc1
+maybe-installcheck-libcc1: installcheck-libcc1
  
-installcheck-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
+installcheck-libcc1: \
+    configure-libcc1 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f ./libcc1/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       echo "Doing installcheck in libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  installcheck) \
+                 installcheck) \
           || exit 1
  
-@endif target-libstdc++-v3
+@endif libcc1
  
-.PHONY: maybe-mostlyclean-target-libstdc++-v3 mostlyclean-target-libstdc++-v3
-maybe-mostlyclean-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-mostlyclean-target-libstdc++-v3: mostlyclean-target-libstdc++-v3
+.PHONY: maybe-mostlyclean-libcc1 mostlyclean-libcc1
+maybe-mostlyclean-libcc1:
+@if libcc1
+maybe-mostlyclean-libcc1: mostlyclean-libcc1
  
-mostlyclean-target-libstdc++-v3: 
+mostlyclean-libcc1: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f ./libcc1/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       echo "Doing mostlyclean in libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  mostlyclean) \
+                 mostlyclean) \
           || exit 1
  
-@endif target-libstdc++-v3
+@endif libcc1
  
-.PHONY: maybe-clean-target-libstdc++-v3 clean-target-libstdc++-v3
-maybe-clean-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-clean-target-libstdc++-v3: clean-target-libstdc++-v3
+.PHONY: maybe-clean-libcc1 clean-libcc1
+maybe-clean-libcc1:
+@if libcc1
+maybe-clean-libcc1: clean-libcc1
  
-clean-target-libstdc++-v3: 
+clean-libcc1: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f ./libcc1/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       echo "Doing clean in libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  clean) \
+                 clean) \
           || exit 1
  
-@endif target-libstdc++-v3
+@endif libcc1
  
-.PHONY: maybe-distclean-target-libstdc++-v3 distclean-target-libstdc++-v3
-maybe-distclean-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-distclean-target-libstdc++-v3: distclean-target-libstdc++-v3
+.PHONY: maybe-distclean-libcc1 distclean-libcc1
+maybe-distclean-libcc1:
+@if libcc1
+maybe-distclean-libcc1: distclean-libcc1
  
-distclean-target-libstdc++-v3: 
+distclean-libcc1: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f ./libcc1/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       echo "Doing distclean in libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  distclean) \
+                 distclean) \
           || exit 1
  
-@endif target-libstdc++-v3
+@endif libcc1
  
-.PHONY: maybe-maintainer-clean-target-libstdc++-v3 maintainer-clean-target-libstdc++-v3
-maybe-maintainer-clean-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-maintainer-clean-target-libstdc++-v3: maintainer-clean-target-libstdc++-v3
+.PHONY: maybe-maintainer-clean-libcc1 maintainer-clean-libcc1
+maybe-maintainer-clean-libcc1:
+@if libcc1
+maybe-maintainer-clean-libcc1: maintainer-clean-libcc1
  
-maintainer-clean-target-libstdc++-v3: 
+maintainer-clean-libcc1: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f ./libcc1/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       echo "Doing maintainer-clean in libcc1"; \
+       (cd $(HOST_SUBDIR)/libcc1 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
                   "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  maintainer-clean) \
+                 maintainer-clean) \
           || exit 1
  
-@endif target-libstdc++-v3
-
+@endif libcc1
  
  
  
-
-.PHONY: configure-target-libmudflap maybe-configure-target-libmudflap
-maybe-configure-target-libmudflap:
+.PHONY: configure-gotools maybe-configure-gotools
+maybe-configure-gotools:
  @if gcc-bootstrap
-configure-target-libmudflap: stage_current
+configure-gotools: stage_current
  @endif gcc-bootstrap
-@if target-libmudflap
-maybe-configure-target-libmudflap: configure-target-libmudflap
-configure-target-libmudflap: 
+@if gotools
+maybe-configure-gotools: configure-gotools
+configure-gotools: 
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for libmudflap..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmudflap/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libmudflap/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libmudflap/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libmudflap/Makefile; \
-           mv $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libmudflap/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libmudflap; \
-       cd "$(TARGET_SUBDIR)/libmudflap" || exit 1; \
+       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 $(TARGET_SUBDIR)/libmudflap/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gotools/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libmudflap"; \
-       libsrcdir="$$s/libmudflap"; \
-       rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+       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 target-libmudflap
+@endif gotools
  
  
  
  
  
-.PHONY: all-target-libmudflap maybe-all-target-libmudflap
-maybe-all-target-libmudflap:
+.PHONY: all-gotools maybe-all-gotools
+maybe-all-gotools:
  @if gcc-bootstrap
-all-target-libmudflap: stage_current
+all-gotools: stage_current
  @endif gcc-bootstrap
-@if target-libmudflap
-TARGET-target-libmudflap=all
-maybe-all-target-libmudflap: all-target-libmudflap
-all-target-libmudflap: configure-target-libmudflap
+@if 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; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libmudflap))
-@endif target-libmudflap
-
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-gotools))
+@endif gotools
  
  
  
  
-.PHONY: check-target-libmudflap maybe-check-target-libmudflap
-maybe-check-target-libmudflap:
-@if target-libmudflap
-maybe-check-target-libmudflap: check-target-libmudflap
+.PHONY: check-gotools maybe-check-gotools
+maybe-check-gotools:
+@if gotools
+maybe-check-gotools: check-gotools
  
-check-target-libmudflap:
+check-gotools:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
  
-@endif target-libmudflap
+@endif gotools
  
-.PHONY: install-target-libmudflap maybe-install-target-libmudflap
-maybe-install-target-libmudflap:
-@if target-libmudflap
-maybe-install-target-libmudflap: install-target-libmudflap
+.PHONY: install-gotools maybe-install-gotools
+maybe-install-gotools:
+@if gotools
+maybe-install-gotools: install-gotools
  
-install-target-libmudflap: installdirs
+install-gotools: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
  
-@endif target-libmudflap
+@endif gotools
  
-.PHONY: install-strip-target-libmudflap maybe-install-strip-target-libmudflap
-maybe-install-strip-target-libmudflap:
-@if target-libmudflap
-maybe-install-strip-target-libmudflap: install-strip-target-libmudflap
+.PHONY: install-strip-gotools maybe-install-strip-gotools
+maybe-install-strip-gotools:
+@if gotools
+maybe-install-strip-gotools: install-strip-gotools
  
-install-strip-target-libmudflap: installdirs
+install-strip-gotools: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
  
-@endif target-libmudflap
+@endif gotools
  
  # Other targets (info, dvi, pdf, etc.)
  
-.PHONY: maybe-info-target-libmudflap info-target-libmudflap
-maybe-info-target-libmudflap:
-@if target-libmudflap
-maybe-info-target-libmudflap: info-target-libmudflap
+.PHONY: maybe-info-gotools info-gotools
+maybe-info-gotools:
+@if gotools
+maybe-info-gotools: info-gotools
  
-info-target-libmudflap: \
-    configure-target-libmudflap 
+info-gotools: \
+    configure-gotools 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
+       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) \
+                 info) \
           || exit 1
  
-@endif target-libmudflap
+@endif gotools
  
-.PHONY: maybe-dvi-target-libmudflap dvi-target-libmudflap
-maybe-dvi-target-libmudflap:
-@if target-libmudflap
-maybe-dvi-target-libmudflap: dvi-target-libmudflap
+.PHONY: maybe-dvi-gotools dvi-gotools
+maybe-dvi-gotools:
+@if gotools
+maybe-dvi-gotools: dvi-gotools
  
-dvi-target-libmudflap: \
-    configure-target-libmudflap 
+dvi-gotools: \
+    configure-gotools 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
+       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) \
+                 dvi) \
           || exit 1
  
-@endif target-libmudflap
+@endif gotools
  
-.PHONY: maybe-pdf-target-libmudflap pdf-target-libmudflap
-maybe-pdf-target-libmudflap:
-@if target-libmudflap
-maybe-pdf-target-libmudflap: pdf-target-libmudflap
+.PHONY: maybe-pdf-gotools pdf-gotools
+maybe-pdf-gotools:
+@if gotools
+maybe-pdf-gotools: pdf-gotools
  
-pdf-target-libmudflap: \
-    configure-target-libmudflap 
+pdf-gotools: \
+    configure-gotools 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
+       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) \
+                 pdf) \
           || exit 1
  
-@endif target-libmudflap
+@endif gotools
  
-.PHONY: maybe-html-target-libmudflap html-target-libmudflap
-maybe-html-target-libmudflap:
-@if target-libmudflap
-maybe-html-target-libmudflap: html-target-libmudflap
+.PHONY: maybe-html-gotools html-gotools
+maybe-html-gotools:
+@if gotools
+maybe-html-gotools: html-gotools
  
-html-target-libmudflap: \
-    configure-target-libmudflap 
+html-gotools: \
+    configure-gotools 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
+       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) \
+                 html) \
           || exit 1
  
-@endif target-libmudflap
+@endif gotools
  
-.PHONY: maybe-TAGS-target-libmudflap TAGS-target-libmudflap
-maybe-TAGS-target-libmudflap:
-@if target-libmudflap
-maybe-TAGS-target-libmudflap: TAGS-target-libmudflap
+.PHONY: maybe-TAGS-gotools TAGS-gotools
+maybe-TAGS-gotools:
+@if gotools
+maybe-TAGS-gotools: TAGS-gotools
  
-TAGS-target-libmudflap: \
-    configure-target-libmudflap 
+TAGS-gotools: \
+    configure-gotools 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
+       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) \
+                 TAGS) \
           || exit 1
  
-@endif target-libmudflap
+@endif gotools
  
-.PHONY: maybe-install-info-target-libmudflap install-info-target-libmudflap
-maybe-install-info-target-libmudflap:
-@if target-libmudflap
-maybe-install-info-target-libmudflap: install-info-target-libmudflap
+.PHONY: maybe-install-info-gotools install-info-gotools
+maybe-install-info-gotools:
+@if gotools
+maybe-install-info-gotools: install-info-gotools
  
-install-info-target-libmudflap: \
-    configure-target-libmudflap \
-    info-target-libmudflap 
+install-info-gotools: \
+    configure-gotools \
+    info-gotools 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
+       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) \
+                 install-info) \
           || exit 1
  
-@endif target-libmudflap
+@endif gotools
  
-.PHONY: maybe-install-pdf-target-libmudflap install-pdf-target-libmudflap
-maybe-install-pdf-target-libmudflap:
-@if target-libmudflap
-maybe-install-pdf-target-libmudflap: install-pdf-target-libmudflap
+.PHONY: maybe-install-pdf-gotools install-pdf-gotools
+maybe-install-pdf-gotools:
+@if gotools
+maybe-install-pdf-gotools: install-pdf-gotools
  
-install-pdf-target-libmudflap: \
-    configure-target-libmudflap \
-    pdf-target-libmudflap 
+install-pdf-gotools: \
+    configure-gotools \
+    pdf-gotools 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-pdf in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
+       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) \
+                 install-pdf) \
           || exit 1
  
-@endif target-libmudflap
+@endif gotools
  
-.PHONY: maybe-install-html-target-libmudflap install-html-target-libmudflap
-maybe-install-html-target-libmudflap:
-@if target-libmudflap
-maybe-install-html-target-libmudflap: install-html-target-libmudflap
+.PHONY: maybe-install-html-gotools install-html-gotools
+maybe-install-html-gotools:
+@if gotools
+maybe-install-html-gotools: install-html-gotools
  
-install-html-target-libmudflap: \
-    configure-target-libmudflap \
-    html-target-libmudflap 
+install-html-gotools: \
+    configure-gotools \
+    html-gotools 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-html in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
+       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) \
+                 install-html) \
           || exit 1
  
-@endif target-libmudflap
+@endif gotools
  
-.PHONY: maybe-installcheck-target-libmudflap installcheck-target-libmudflap
-maybe-installcheck-target-libmudflap:
-@if target-libmudflap
-maybe-installcheck-target-libmudflap: installcheck-target-libmudflap
+.PHONY: maybe-installcheck-gotools installcheck-gotools
+maybe-installcheck-gotools:
+@if gotools
+maybe-installcheck-gotools: installcheck-gotools
  
-installcheck-target-libmudflap: \
-    configure-target-libmudflap 
+installcheck-gotools: \
+    configure-gotools 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
+       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) \
+                 installcheck) \
           || exit 1
  
-@endif target-libmudflap
+@endif gotools
  
-.PHONY: maybe-mostlyclean-target-libmudflap mostlyclean-target-libmudflap
-maybe-mostlyclean-target-libmudflap:
-@if target-libmudflap
-maybe-mostlyclean-target-libmudflap: mostlyclean-target-libmudflap
+.PHONY: maybe-mostlyclean-gotools mostlyclean-gotools
+maybe-mostlyclean-gotools:
+@if gotools
+maybe-mostlyclean-gotools: mostlyclean-gotools
  
-mostlyclean-target-libmudflap: 
+mostlyclean-gotools: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
+       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) \
+                 mostlyclean) \
           || exit 1
  
-@endif target-libmudflap
+@endif gotools
  
-.PHONY: maybe-clean-target-libmudflap clean-target-libmudflap
-maybe-clean-target-libmudflap:
-@if target-libmudflap
-maybe-clean-target-libmudflap: clean-target-libmudflap
+.PHONY: maybe-clean-gotools clean-gotools
+maybe-clean-gotools:
+@if gotools
+maybe-clean-gotools: clean-gotools
  
-clean-target-libmudflap: 
+clean-gotools: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
+       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) \
+                 clean) \
           || exit 1
  
-@endif target-libmudflap
+@endif gotools
  
-.PHONY: maybe-distclean-target-libmudflap distclean-target-libmudflap
-maybe-distclean-target-libmudflap:
-@if target-libmudflap
-maybe-distclean-target-libmudflap: distclean-target-libmudflap
+.PHONY: maybe-distclean-gotools distclean-gotools
+maybe-distclean-gotools:
+@if gotools
+maybe-distclean-gotools: distclean-gotools
  
-distclean-target-libmudflap: 
+distclean-gotools: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
+       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) \
+                 distclean) \
           || exit 1
  
-@endif target-libmudflap
+@endif gotools
  
-.PHONY: maybe-maintainer-clean-target-libmudflap maintainer-clean-target-libmudflap
-maybe-maintainer-clean-target-libmudflap:
-@if target-libmudflap
-maybe-maintainer-clean-target-libmudflap: maintainer-clean-target-libmudflap
+.PHONY: maybe-maintainer-clean-gotools maintainer-clean-gotools
+maybe-maintainer-clean-gotools:
+@if gotools
+maybe-maintainer-clean-gotools: maintainer-clean-gotools
  
-maintainer-clean-target-libmudflap: 
+maintainer-clean-gotools: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
+       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) \
+                 maintainer-clean) \
           || exit 1
  
-@endif target-libmudflap
+@endif gotools
+
  
  
+# ---------------------------------------
+# Modules which run on the target machine
+# ---------------------------------------
  
  
  
-.PHONY: configure-target-libssp maybe-configure-target-libssp
-maybe-configure-target-libssp:
+
+.PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3
+maybe-configure-target-libstdc++-v3:
  @if gcc-bootstrap
-configure-target-libssp: stage_current
+configure-target-libstdc++-v3: stage_current
  @endif gcc-bootstrap
-@if target-libssp
-maybe-configure-target-libssp: configure-target-libssp
-configure-target-libssp: 
-       @: $(MAKE); $(unstage)
+@if target-libstdc++-v3
+maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3
+configure-target-libstdc++-v3: 
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for libssp..."; \
-       $(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; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
           else \
-           rm -f $(TARGET_SUBDIR)/libssp/Makefile; \
-           mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
           fi; \
         else \
-         mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
         fi; \
-       test ! -f $(TARGET_SUBDIR)/libssp/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libssp; \
-       cd "$(TARGET_SUBDIR)/libssp" || exit 1; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(RAW_CXX_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libssp/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libssp"; \
-       libsrcdir="$$s/libssp"; \
+       module_srcdir=libstdc++-v3; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
-@endif target-libssp
-
-
+@endif target-libstdc++-v3
  
  
  
-.PHONY: all-target-libssp maybe-all-target-libssp
-maybe-all-target-libssp:
-@if gcc-bootstrap
-all-target-libssp: stage_current
-@endif gcc-bootstrap
-@if target-libssp
-TARGET-target-libssp=all
-maybe-all-target-libssp: all-target-libssp
-all-target-libssp: configure-target-libssp
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage1-target-libstdc++-v3 maybe-configure-stage1-target-libstdc++-v3
+maybe-configure-stage1-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3
+configure-stage1-target-libstdc++-v3:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libssp && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libssp))
-@endif target-libssp
-
-
-
-
-
-.PHONY: check-target-libssp maybe-check-target-libssp
-maybe-check-target-libssp:
-@if target-libssp
-maybe-check-target-libssp: check-target-libssp
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 1 in $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libstdc++-v3; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-bootstrap
  
-check-target-libssp:
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage2-target-libstdc++-v3 maybe-configure-stage2-target-libstdc++-v3
+maybe-configure-stage2-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stage2-target-libstdc++-v3: configure-stage2-target-libstdc++-v3
+configure-stage2-target-libstdc++-v3:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libssp && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-libssp
-
-.PHONY: install-target-libssp maybe-install-target-libssp
-maybe-install-target-libssp:
-@if target-libssp
-maybe-install-target-libssp: install-target-libssp
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 2 in $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libstdc++-v3; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-bootstrap
  
-install-target-libssp: installdirs
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage3-target-libstdc++-v3 maybe-configure-stage3-target-libstdc++-v3
+maybe-configure-stage3-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stage3-target-libstdc++-v3: configure-stage3-target-libstdc++-v3
+configure-stage3-target-libstdc++-v3:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libssp && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libssp
-
-.PHONY: install-strip-target-libssp maybe-install-strip-target-libssp
-maybe-install-strip-target-libssp:
-@if target-libssp
-maybe-install-strip-target-libssp: install-strip-target-libssp
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 3 in $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libstdc++-v3; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-bootstrap
  
-install-strip-target-libssp: installdirs
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage4-target-libstdc++-v3 maybe-configure-stage4-target-libstdc++-v3
+maybe-configure-stage4-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stage4-target-libstdc++-v3: configure-stage4-target-libstdc++-v3
+configure-stage4-target-libstdc++-v3:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libssp && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 4 in $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libstdc++-v3; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-bootstrap
  
-@endif target-libssp
+.PHONY: configure-stageprofile-target-libstdc++-v3 maybe-configure-stageprofile-target-libstdc++-v3
+maybe-configure-stageprofile-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stageprofile-target-libstdc++-v3: configure-stageprofile-target-libstdc++-v3
+configure-stageprofile-target-libstdc++-v3:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage profile in $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libstdc++-v3; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-bootstrap
  
-# Other targets (info, dvi, pdf, etc.)
+.PHONY: configure-stagefeedback-target-libstdc++-v3 maybe-configure-stagefeedback-target-libstdc++-v3
+maybe-configure-stagefeedback-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stagefeedback-target-libstdc++-v3: configure-stagefeedback-target-libstdc++-v3
+configure-stagefeedback-target-libstdc++-v3:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libstdc++-v3; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-bootstrap
  
-.PHONY: maybe-info-target-libssp info-target-libssp
-maybe-info-target-libssp:
-@if target-libssp
-maybe-info-target-libssp: info-target-libssp
  
-info-target-libssp: \
-    configure-target-libssp 
-       @: $(MAKE); $(unstage)
-       @[ -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" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
-         $(MAKE) $(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-libssp
  
-.PHONY: maybe-dvi-target-libssp dvi-target-libssp
-maybe-dvi-target-libssp:
-@if target-libssp
-maybe-dvi-target-libssp: dvi-target-libssp
  
-dvi-target-libssp: \
-    configure-target-libssp 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3
+maybe-all-target-libstdc++-v3:
+@if gcc-bootstrap
+all-target-libstdc++-v3: stage_current
+@endif gcc-bootstrap
+@if target-libstdc++-v3
+TARGET-target-libstdc++-v3=all
+maybe-all-target-libstdc++-v3: all-target-libstdc++-v3
+all-target-libstdc++-v3: configure-target-libstdc++-v3
+       @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       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; \
-       (cd $(TARGET_SUBDIR)/libssp && \
-         $(MAKE) $(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
+       $(RAW_CXX_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               $(TARGET-target-libstdc++-v3))
+@endif target-libstdc++-v3
  
-@endif target-libssp
  
-.PHONY: maybe-pdf-target-libssp pdf-target-libssp
-maybe-pdf-target-libssp:
-@if target-libssp
-maybe-pdf-target-libssp: pdf-target-libssp
  
-pdf-target-libssp: \
-    configure-target-libssp 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stage1-target-libstdc++-v3 maybe-all-stage1-target-libstdc++-v3
+.PHONY: clean-stage1-target-libstdc++-v3 maybe-clean-stage1-target-libstdc++-v3
+maybe-all-stage1-target-libstdc++-v3:
+maybe-clean-stage1-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stage1-target-libstdc++-v3: all-stage1-target-libstdc++-v3
+all-stage1: all-stage1-target-libstdc++-v3
+TARGET-stage1-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       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; \
-       (cd $(TARGET_SUBDIR)/libssp && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  pdf) \
-         || exit 1
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS)  \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
+                 \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
+               $(TARGET-stage1-target-libstdc++-v3)
  
-@endif target-libssp
+maybe-clean-stage1-target-libstdc++-v3: clean-stage1-target-libstdc++-v3
+clean-stage1: clean-stage1-target-libstdc++-v3
+clean-stage1-target-libstdc++-v3:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage1-libstdc++-v3/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
+         clean
+@endif target-libstdc++-v3-bootstrap
  
-.PHONY: maybe-html-target-libssp html-target-libssp
-maybe-html-target-libssp:
-@if target-libssp
-maybe-html-target-libssp: html-target-libssp
  
-html-target-libssp: \
-    configure-target-libssp 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stage2-target-libstdc++-v3 maybe-all-stage2-target-libstdc++-v3
+.PHONY: clean-stage2-target-libstdc++-v3 maybe-clean-stage2-target-libstdc++-v3
+maybe-all-stage2-target-libstdc++-v3:
+maybe-clean-stage2-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stage2-target-libstdc++-v3: all-stage2-target-libstdc++-v3
+all-stage2: all-stage2-target-libstdc++-v3
+TARGET-stage2-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stage2-target-libstdc++-v3: configure-stage2-target-libstdc++-v3
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       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; \
-       (cd $(TARGET_SUBDIR)/libssp && \
-         $(MAKE) $(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
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
+               $(TARGET-stage2-target-libstdc++-v3)
  
-@endif target-libssp
+maybe-clean-stage2-target-libstdc++-v3: clean-stage2-target-libstdc++-v3
+clean-stage2: clean-stage2-target-libstdc++-v3
+clean-stage2-target-libstdc++-v3:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage2-libstdc++-v3/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libstdc++-v3-bootstrap
  
-.PHONY: maybe-TAGS-target-libssp TAGS-target-libssp
-maybe-TAGS-target-libssp:
-@if target-libssp
-maybe-TAGS-target-libssp: TAGS-target-libssp
  
-TAGS-target-libssp: \
-    configure-target-libssp 
-       @: $(MAKE); $(unstage)
-       @[ -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" ; \
+.PHONY: all-stage3-target-libstdc++-v3 maybe-all-stage3-target-libstdc++-v3
+.PHONY: clean-stage3-target-libstdc++-v3 maybe-clean-stage3-target-libstdc++-v3
+maybe-all-stage3-target-libstdc++-v3:
+maybe-clean-stage3-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stage3-target-libstdc++-v3: all-stage3-target-libstdc++-v3
+all-stage3: all-stage3-target-libstdc++-v3
+TARGET-stage3-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stage3-target-libstdc++-v3: configure-stage3-target-libstdc++-v3
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
+               $(TARGET-stage3-target-libstdc++-v3)
+
+maybe-clean-stage3-target-libstdc++-v3: clean-stage3-target-libstdc++-v3
+clean-stage3: clean-stage3-target-libstdc++-v3
+clean-stage3-target-libstdc++-v3:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage3-libstdc++-v3/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libstdc++-v3-bootstrap
+
+
+.PHONY: all-stage4-target-libstdc++-v3 maybe-all-stage4-target-libstdc++-v3
+.PHONY: clean-stage4-target-libstdc++-v3 maybe-clean-stage4-target-libstdc++-v3
+maybe-all-stage4-target-libstdc++-v3:
+maybe-clean-stage4-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stage4-target-libstdc++-v3: all-stage4-target-libstdc++-v3
+all-stage4: all-stage4-target-libstdc++-v3
+TARGET-stage4-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stage4-target-libstdc++-v3: configure-stage4-target-libstdc++-v3
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
+               $(TARGET-stage4-target-libstdc++-v3)
+
+maybe-clean-stage4-target-libstdc++-v3: clean-stage4-target-libstdc++-v3
+clean-stage4: clean-stage4-target-libstdc++-v3
+clean-stage4-target-libstdc++-v3:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage4-libstdc++-v3/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libstdc++-v3-bootstrap
+
+
+.PHONY: all-stageprofile-target-libstdc++-v3 maybe-all-stageprofile-target-libstdc++-v3
+.PHONY: clean-stageprofile-target-libstdc++-v3 maybe-clean-stageprofile-target-libstdc++-v3
+maybe-all-stageprofile-target-libstdc++-v3:
+maybe-clean-stageprofile-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stageprofile-target-libstdc++-v3: all-stageprofile-target-libstdc++-v3
+all-stageprofile: all-stageprofile-target-libstdc++-v3
+TARGET-stageprofile-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stageprofile-target-libstdc++-v3: configure-stageprofile-target-libstdc++-v3
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
+               $(TARGET-stageprofile-target-libstdc++-v3)
+
+maybe-clean-stageprofile-target-libstdc++-v3: clean-stageprofile-target-libstdc++-v3
+clean-stageprofile: clean-stageprofile-target-libstdc++-v3
+clean-stageprofile-target-libstdc++-v3:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stageprofile-libstdc++-v3/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libstdc++-v3-bootstrap
+
+
+.PHONY: all-stagefeedback-target-libstdc++-v3 maybe-all-stagefeedback-target-libstdc++-v3
+.PHONY: clean-stagefeedback-target-libstdc++-v3 maybe-clean-stagefeedback-target-libstdc++-v3
+maybe-all-stagefeedback-target-libstdc++-v3:
+maybe-clean-stagefeedback-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stagefeedback-target-libstdc++-v3: all-stagefeedback-target-libstdc++-v3
+all-stagefeedback: all-stagefeedback-target-libstdc++-v3
+TARGET-stagefeedback-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stagefeedback-target-libstdc++-v3: configure-stagefeedback-target-libstdc++-v3
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
+               $(TARGET-stagefeedback-target-libstdc++-v3)
+
+maybe-clean-stagefeedback-target-libstdc++-v3: clean-stagefeedback-target-libstdc++-v3
+clean-stagefeedback: clean-stagefeedback-target-libstdc++-v3
+clean-stagefeedback-target-libstdc++-v3:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stagefeedback-libstdc++-v3/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libstdc++-v3-bootstrap
+
+
+
+
+
+
+.PHONY: check-target-libstdc++-v3 maybe-check-target-libstdc++-v3
+maybe-check-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-check-target-libstdc++-v3: check-target-libstdc++-v3
+
+check-target-libstdc++-v3:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
+
+@endif target-libstdc++-v3
+
+.PHONY: install-target-libstdc++-v3 maybe-install-target-libstdc++-v3
+maybe-install-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-install-target-libstdc++-v3: install-target-libstdc++-v3
+
+install-target-libstdc++-v3: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libstdc++-v3
+
+.PHONY: install-strip-target-libstdc++-v3 maybe-install-strip-target-libstdc++-v3
+maybe-install-strip-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-install-strip-target-libstdc++-v3: install-strip-target-libstdc++-v3
+
+install-strip-target-libstdc++-v3: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libstdc++-v3
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-libstdc++-v3 info-target-libstdc++-v3
+maybe-info-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-info-target-libstdc++-v3: info-target-libstdc++-v3
+
+info-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing info in $(TARGET_SUBDIR)/libstdc++-v3"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  info) \
+         || exit 1
+
+@endif target-libstdc++-v3
+
+.PHONY: maybe-dvi-target-libstdc++-v3 dvi-target-libstdc++-v3
+maybe-dvi-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-dvi-target-libstdc++-v3: dvi-target-libstdc++-v3
+
+dvi-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libstdc++-v3"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  dvi) \
+         || exit 1
+
+@endif target-libstdc++-v3
+
+.PHONY: maybe-pdf-target-libstdc++-v3 pdf-target-libstdc++-v3
+maybe-pdf-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-pdf-target-libstdc++-v3: pdf-target-libstdc++-v3
+
+pdf-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libstdc++-v3"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  pdf) \
+         || exit 1
+
+@endif target-libstdc++-v3
+
+.PHONY: maybe-html-target-libstdc++-v3 html-target-libstdc++-v3
+maybe-html-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-html-target-libstdc++-v3: html-target-libstdc++-v3
+
+html-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libstdc++-v3"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  html) \
+         || exit 1
+
+@endif target-libstdc++-v3
+
+.PHONY: maybe-TAGS-target-libstdc++-v3 TAGS-target-libstdc++-v3
+maybe-TAGS-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-TAGS-target-libstdc++-v3: TAGS-target-libstdc++-v3
+
+TAGS-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libstdc++-v3"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -32581,26 +33623,26 @@ TAGS-target-libssp: \
                    TAGS) \
           || exit 1
  
-@endif target-libssp
+@endif target-libstdc++-v3
  
-.PHONY: maybe-install-info-target-libssp install-info-target-libssp
-maybe-install-info-target-libssp:
-@if target-libssp
-maybe-install-info-target-libssp: install-info-target-libssp
+.PHONY: maybe-install-info-target-libstdc++-v3 install-info-target-libstdc++-v3
+maybe-install-info-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-install-info-target-libstdc++-v3: install-info-target-libstdc++-v3
  
-install-info-target-libssp: \
-    configure-target-libssp \
-    info-target-libssp 
+install-info-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 \
+    info-target-libstdc++-v3 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/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" ; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libstdc++-v3"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -32608,26 +33650,26 @@ install-info-target-libssp: \
                    install-info) \
           || exit 1
  
-@endif target-libssp
+@endif target-libstdc++-v3
  
-.PHONY: maybe-install-pdf-target-libssp install-pdf-target-libssp
-maybe-install-pdf-target-libssp:
-@if target-libssp
-maybe-install-pdf-target-libssp: install-pdf-target-libssp
+.PHONY: maybe-install-pdf-target-libstdc++-v3 install-pdf-target-libstdc++-v3
+maybe-install-pdf-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-install-pdf-target-libstdc++-v3: install-pdf-target-libstdc++-v3
  
-install-pdf-target-libssp: \
-    configure-target-libssp \
-    pdf-target-libssp 
+install-pdf-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 \
+    pdf-target-libstdc++-v3 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/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" ; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libstdc++-v3"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -32635,26 +33677,26 @@ install-pdf-target-libssp: \
                    install-pdf) \
           || exit 1
  
-@endif target-libssp
+@endif target-libstdc++-v3
  
-.PHONY: maybe-install-html-target-libssp install-html-target-libssp
-maybe-install-html-target-libssp:
-@if target-libssp
-maybe-install-html-target-libssp: install-html-target-libssp
+.PHONY: maybe-install-html-target-libstdc++-v3 install-html-target-libstdc++-v3
+maybe-install-html-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-install-html-target-libstdc++-v3: install-html-target-libstdc++-v3
  
-install-html-target-libssp: \
-    configure-target-libssp \
-    html-target-libssp 
+install-html-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 \
+    html-target-libstdc++-v3 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/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" ; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libstdc++-v3"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -32662,25 +33704,25 @@ install-html-target-libssp: \
                    install-html) \
           || exit 1
  
-@endif target-libssp
+@endif target-libstdc++-v3
  
-.PHONY: maybe-installcheck-target-libssp installcheck-target-libssp
-maybe-installcheck-target-libssp:
-@if target-libssp
-maybe-installcheck-target-libssp: installcheck-target-libssp
+.PHONY: maybe-installcheck-target-libstdc++-v3 installcheck-target-libstdc++-v3
+maybe-installcheck-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-installcheck-target-libstdc++-v3: installcheck-target-libstdc++-v3
  
-installcheck-target-libssp: \
-    configure-target-libssp 
+installcheck-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/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" ; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libstdc++-v3"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -32688,24 +33730,24 @@ installcheck-target-libssp: \
                    installcheck) \
           || exit 1
  
-@endif target-libssp
+@endif target-libstdc++-v3
  
-.PHONY: maybe-mostlyclean-target-libssp mostlyclean-target-libssp
-maybe-mostlyclean-target-libssp:
-@if target-libssp
-maybe-mostlyclean-target-libssp: mostlyclean-target-libssp
+.PHONY: maybe-mostlyclean-target-libstdc++-v3 mostlyclean-target-libstdc++-v3
+maybe-mostlyclean-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-mostlyclean-target-libstdc++-v3: mostlyclean-target-libstdc++-v3
  
-mostlyclean-target-libssp: 
+mostlyclean-target-libstdc++-v3: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/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" ; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libstdc++-v3"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -32713,24 +33755,24 @@ mostlyclean-target-libssp:
                    mostlyclean) \
           || exit 1
  
-@endif target-libssp
+@endif target-libstdc++-v3
  
-.PHONY: maybe-clean-target-libssp clean-target-libssp
-maybe-clean-target-libssp:
-@if target-libssp
-maybe-clean-target-libssp: clean-target-libssp
+.PHONY: maybe-clean-target-libstdc++-v3 clean-target-libstdc++-v3
+maybe-clean-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-clean-target-libstdc++-v3: clean-target-libstdc++-v3
  
-clean-target-libssp: 
+clean-target-libstdc++-v3: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/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" ; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing clean in $(TARGET_SUBDIR)/libstdc++-v3"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -32738,24 +33780,24 @@ clean-target-libssp:
                    clean) \
           || exit 1
  
-@endif target-libssp
+@endif target-libstdc++-v3
  
-.PHONY: maybe-distclean-target-libssp distclean-target-libssp
-maybe-distclean-target-libssp:
-@if target-libssp
-maybe-distclean-target-libssp: distclean-target-libssp
+.PHONY: maybe-distclean-target-libstdc++-v3 distclean-target-libstdc++-v3
+maybe-distclean-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-distclean-target-libstdc++-v3: distclean-target-libstdc++-v3
  
-distclean-target-libssp: 
+distclean-target-libstdc++-v3: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/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" ; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libstdc++-v3"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -32763,24 +33805,24 @@ distclean-target-libssp:
                    distclean) \
           || exit 1
  
-@endif target-libssp
+@endif target-libstdc++-v3
  
-.PHONY: maybe-maintainer-clean-target-libssp maintainer-clean-target-libssp
-maybe-maintainer-clean-target-libssp:
-@if target-libssp
-maybe-maintainer-clean-target-libssp: maintainer-clean-target-libssp
+.PHONY: maybe-maintainer-clean-target-libstdc++-v3 maintainer-clean-target-libstdc++-v3
+maybe-maintainer-clean-target-libstdc++-v3:
+@if target-libstdc++-v3
+maybe-maintainer-clean-target-libstdc++-v3: maintainer-clean-target-libstdc++-v3
  
-maintainer-clean-target-libssp: 
+maintainer-clean-target-libstdc++-v3: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/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" ; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libstdc++-v3"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -32788,145 +33830,670 @@ maintainer-clean-target-libssp:
                    maintainer-clean) \
           || exit 1
  
-@endif target-libssp
+@endif target-libstdc++-v3
  
  
  
  
  
-.PHONY: configure-target-newlib maybe-configure-target-newlib
-maybe-configure-target-newlib:
+.PHONY: configure-target-libsanitizer maybe-configure-target-libsanitizer
+maybe-configure-target-libsanitizer:
  @if gcc-bootstrap
-configure-target-newlib: stage_current
+configure-target-libsanitizer: stage_current
  @endif gcc-bootstrap
-@if target-newlib
-maybe-configure-target-newlib: configure-target-newlib
-configure-target-newlib: 
-       @: $(MAKE); $(unstage)
+@if target-libsanitizer
+maybe-configure-target-libsanitizer: configure-target-libsanitizer
+configure-target-libsanitizer: 
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for newlib..."; \
-       $(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; \
+       echo "Checking multilib configuration for libsanitizer..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
           else \
-           rm -f $(TARGET_SUBDIR)/newlib/Makefile; \
-           mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
           fi; \
         else \
-         mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
         fi; \
-       test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/newlib; \
-       cd "$(TARGET_SUBDIR)/newlib" || exit 1; \
+       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       $(RAW_CXX_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libsanitizer; \
+       cd "$(TARGET_SUBDIR)/libsanitizer" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/newlib/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/newlib"; \
-       libsrcdir="$$s/newlib"; \
+       module_srcdir=libsanitizer; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
-@endif target-newlib
-
+@endif target-libsanitizer
  
  
  
-
-.PHONY: all-target-newlib maybe-all-target-newlib
-maybe-all-target-newlib:
-@if gcc-bootstrap
-all-target-newlib: stage_current
-@endif gcc-bootstrap
-@if target-newlib
-TARGET-target-newlib=all
-maybe-all-target-newlib: all-target-newlib
-all-target-newlib: configure-target-newlib
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage1-target-libsanitizer maybe-configure-stage1-target-libsanitizer
+maybe-configure-stage1-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-configure-stage1-target-libsanitizer: configure-stage1-target-libsanitizer
+configure-stage1-target-libsanitizer:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/newlib && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-newlib))
-@endif target-newlib
-
-
-
-
-
-.PHONY: check-target-newlib maybe-check-target-newlib
-maybe-check-target-newlib:
-@if target-newlib
-maybe-check-target-newlib: check-target-newlib
-
-check-target-newlib:
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       echo "Checking multilib configuration for libsanitizer..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 1 in $(TARGET_SUBDIR)/libsanitizer; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libsanitizer; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif target-libsanitizer-bootstrap
+
+.PHONY: configure-stage2-target-libsanitizer maybe-configure-stage2-target-libsanitizer
+maybe-configure-stage2-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-configure-stage2-target-libsanitizer: configure-stage2-target-libsanitizer
+configure-stage2-target-libsanitizer:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       echo "Checking multilib configuration for libsanitizer..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 2 in $(TARGET_SUBDIR)/libsanitizer; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libsanitizer; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif target-libsanitizer-bootstrap
+
+.PHONY: configure-stage3-target-libsanitizer maybe-configure-stage3-target-libsanitizer
+maybe-configure-stage3-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-configure-stage3-target-libsanitizer: configure-stage3-target-libsanitizer
+configure-stage3-target-libsanitizer:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       echo "Checking multilib configuration for libsanitizer..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 3 in $(TARGET_SUBDIR)/libsanitizer; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libsanitizer; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif target-libsanitizer-bootstrap
+
+.PHONY: configure-stage4-target-libsanitizer maybe-configure-stage4-target-libsanitizer
+maybe-configure-stage4-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-configure-stage4-target-libsanitizer: configure-stage4-target-libsanitizer
+configure-stage4-target-libsanitizer:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       echo "Checking multilib configuration for libsanitizer..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 4 in $(TARGET_SUBDIR)/libsanitizer; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libsanitizer; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif target-libsanitizer-bootstrap
+
+.PHONY: configure-stageprofile-target-libsanitizer maybe-configure-stageprofile-target-libsanitizer
+maybe-configure-stageprofile-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-configure-stageprofile-target-libsanitizer: configure-stageprofile-target-libsanitizer
+configure-stageprofile-target-libsanitizer:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       echo "Checking multilib configuration for libsanitizer..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage profile in $(TARGET_SUBDIR)/libsanitizer; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libsanitizer; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif target-libsanitizer-bootstrap
+
+.PHONY: configure-stagefeedback-target-libsanitizer maybe-configure-stagefeedback-target-libsanitizer
+maybe-configure-stagefeedback-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-configure-stagefeedback-target-libsanitizer: configure-stagefeedback-target-libsanitizer
+configure-stagefeedback-target-libsanitizer:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       echo "Checking multilib configuration for libsanitizer..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(TARGET_SUBDIR)/libsanitizer; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libsanitizer; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif target-libsanitizer-bootstrap
+
+
+
+
+
+.PHONY: all-target-libsanitizer maybe-all-target-libsanitizer
+maybe-all-target-libsanitizer:
+@if gcc-bootstrap
+all-target-libsanitizer: stage_current
+@endif gcc-bootstrap
+@if target-libsanitizer
+TARGET-target-libsanitizer=all
+maybe-all-target-libsanitizer: all-target-libsanitizer
+all-target-libsanitizer: configure-target-libsanitizer
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(RAW_CXX_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               $(TARGET-target-libsanitizer))
+@endif target-libsanitizer
+
+
+
+.PHONY: all-stage1-target-libsanitizer maybe-all-stage1-target-libsanitizer
+.PHONY: clean-stage1-target-libsanitizer maybe-clean-stage1-target-libsanitizer
+maybe-all-stage1-target-libsanitizer:
+maybe-clean-stage1-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-all-stage1-target-libsanitizer: all-stage1-target-libsanitizer
+all-stage1: all-stage1-target-libsanitizer
+TARGET-stage1-target-libsanitizer = $(TARGET-target-libsanitizer)
+all-stage1-target-libsanitizer: configure-stage1-target-libsanitizer
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS)  \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
+                 \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
+               $(TARGET-stage1-target-libsanitizer)
+
+maybe-clean-stage1-target-libsanitizer: clean-stage1-target-libsanitizer
+clean-stage1: clean-stage1-target-libsanitizer
+clean-stage1-target-libsanitizer:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage1-libsanitizer/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
+         clean
+@endif target-libsanitizer-bootstrap
+
+
+.PHONY: all-stage2-target-libsanitizer maybe-all-stage2-target-libsanitizer
+.PHONY: clean-stage2-target-libsanitizer maybe-clean-stage2-target-libsanitizer
+maybe-all-stage2-target-libsanitizer:
+maybe-clean-stage2-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-all-stage2-target-libsanitizer: all-stage2-target-libsanitizer
+all-stage2: all-stage2-target-libsanitizer
+TARGET-stage2-target-libsanitizer = $(TARGET-target-libsanitizer)
+all-stage2-target-libsanitizer: configure-stage2-target-libsanitizer
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
+               $(TARGET-stage2-target-libsanitizer)
+
+maybe-clean-stage2-target-libsanitizer: clean-stage2-target-libsanitizer
+clean-stage2: clean-stage2-target-libsanitizer
+clean-stage2-target-libsanitizer:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage2-libsanitizer/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libsanitizer-bootstrap
+
+
+.PHONY: all-stage3-target-libsanitizer maybe-all-stage3-target-libsanitizer
+.PHONY: clean-stage3-target-libsanitizer maybe-clean-stage3-target-libsanitizer
+maybe-all-stage3-target-libsanitizer:
+maybe-clean-stage3-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-all-stage3-target-libsanitizer: all-stage3-target-libsanitizer
+all-stage3: all-stage3-target-libsanitizer
+TARGET-stage3-target-libsanitizer = $(TARGET-target-libsanitizer)
+all-stage3-target-libsanitizer: configure-stage3-target-libsanitizer
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
+               $(TARGET-stage3-target-libsanitizer)
+
+maybe-clean-stage3-target-libsanitizer: clean-stage3-target-libsanitizer
+clean-stage3: clean-stage3-target-libsanitizer
+clean-stage3-target-libsanitizer:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage3-libsanitizer/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libsanitizer-bootstrap
+
+
+.PHONY: all-stage4-target-libsanitizer maybe-all-stage4-target-libsanitizer
+.PHONY: clean-stage4-target-libsanitizer maybe-clean-stage4-target-libsanitizer
+maybe-all-stage4-target-libsanitizer:
+maybe-clean-stage4-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-all-stage4-target-libsanitizer: all-stage4-target-libsanitizer
+all-stage4: all-stage4-target-libsanitizer
+TARGET-stage4-target-libsanitizer = $(TARGET-target-libsanitizer)
+all-stage4-target-libsanitizer: configure-stage4-target-libsanitizer
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
+               $(TARGET-stage4-target-libsanitizer)
+
+maybe-clean-stage4-target-libsanitizer: clean-stage4-target-libsanitizer
+clean-stage4: clean-stage4-target-libsanitizer
+clean-stage4-target-libsanitizer:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage4-libsanitizer/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libsanitizer-bootstrap
+
+
+.PHONY: all-stageprofile-target-libsanitizer maybe-all-stageprofile-target-libsanitizer
+.PHONY: clean-stageprofile-target-libsanitizer maybe-clean-stageprofile-target-libsanitizer
+maybe-all-stageprofile-target-libsanitizer:
+maybe-clean-stageprofile-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-all-stageprofile-target-libsanitizer: all-stageprofile-target-libsanitizer
+all-stageprofile: all-stageprofile-target-libsanitizer
+TARGET-stageprofile-target-libsanitizer = $(TARGET-target-libsanitizer)
+all-stageprofile-target-libsanitizer: configure-stageprofile-target-libsanitizer
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
+               $(TARGET-stageprofile-target-libsanitizer)
+
+maybe-clean-stageprofile-target-libsanitizer: clean-stageprofile-target-libsanitizer
+clean-stageprofile: clean-stageprofile-target-libsanitizer
+clean-stageprofile-target-libsanitizer:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stageprofile-libsanitizer/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libsanitizer-bootstrap
+
+
+.PHONY: all-stagefeedback-target-libsanitizer maybe-all-stagefeedback-target-libsanitizer
+.PHONY: clean-stagefeedback-target-libsanitizer maybe-clean-stagefeedback-target-libsanitizer
+maybe-all-stagefeedback-target-libsanitizer:
+maybe-clean-stagefeedback-target-libsanitizer:
+@if target-libsanitizer-bootstrap
+maybe-all-stagefeedback-target-libsanitizer: all-stagefeedback-target-libsanitizer
+all-stagefeedback: all-stagefeedback-target-libsanitizer
+TARGET-stagefeedback-target-libsanitizer = $(TARGET-target-libsanitizer)
+all-stagefeedback-target-libsanitizer: configure-stagefeedback-target-libsanitizer
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
+               $(TARGET-stagefeedback-target-libsanitizer)
+
+maybe-clean-stagefeedback-target-libsanitizer: clean-stagefeedback-target-libsanitizer
+clean-stagefeedback: clean-stagefeedback-target-libsanitizer
+clean-stagefeedback-target-libsanitizer:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stagefeedback-libsanitizer/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libsanitizer && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libsanitizer-bootstrap
+
+
+
+
+
+
+.PHONY: check-target-libsanitizer maybe-check-target-libsanitizer
+maybe-check-target-libsanitizer:
+@if target-libsanitizer
+maybe-check-target-libsanitizer: check-target-libsanitizer
+
+check-target-libsanitizer:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/newlib && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
  
-@endif target-newlib
+@endif target-libsanitizer
  
-.PHONY: install-target-newlib maybe-install-target-newlib
-maybe-install-target-newlib:
-@if target-newlib
-maybe-install-target-newlib: install-target-newlib
+.PHONY: install-target-libsanitizer maybe-install-target-libsanitizer
+maybe-install-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-target-libsanitizer: install-target-libsanitizer
  
-install-target-newlib: installdirs
+install-target-libsanitizer: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
-@endif target-newlib
+@endif target-libsanitizer
  
-.PHONY: install-strip-target-newlib maybe-install-strip-target-newlib
-maybe-install-strip-target-newlib:
-@if target-newlib
-maybe-install-strip-target-newlib: install-strip-target-newlib
+.PHONY: install-strip-target-libsanitizer maybe-install-strip-target-libsanitizer
+maybe-install-strip-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-strip-target-libsanitizer: install-strip-target-libsanitizer
  
-install-strip-target-newlib: installdirs
+install-strip-target-libsanitizer: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
  
-@endif target-newlib
+@endif target-libsanitizer
  
  # Other targets (info, dvi, pdf, etc.)
  
-.PHONY: maybe-info-target-newlib info-target-newlib
-maybe-info-target-newlib:
-@if target-newlib
-maybe-info-target-newlib: info-target-newlib
+.PHONY: maybe-info-target-libsanitizer info-target-libsanitizer
+maybe-info-target-libsanitizer:
+@if target-libsanitizer
+maybe-info-target-libsanitizer: info-target-libsanitizer
  
-info-target-newlib: \
-    configure-target-newlib 
+info-target-libsanitizer: \
+    configure-target-libsanitizer 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/newlib" ; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing info in $(TARGET_SUBDIR)/libsanitizer"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -32934,25 +34501,25 @@ info-target-newlib: \
                    info) \
           || exit 1
  
-@endif target-newlib
+@endif target-libsanitizer
  
-.PHONY: maybe-dvi-target-newlib dvi-target-newlib
-maybe-dvi-target-newlib:
-@if target-newlib
-maybe-dvi-target-newlib: dvi-target-newlib
+.PHONY: maybe-dvi-target-libsanitizer dvi-target-libsanitizer
+maybe-dvi-target-libsanitizer:
+@if target-libsanitizer
+maybe-dvi-target-libsanitizer: dvi-target-libsanitizer
  
-dvi-target-newlib: \
-    configure-target-newlib 
+dvi-target-libsanitizer: \
+    configure-target-libsanitizer 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/newlib" ; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libsanitizer"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -32960,25 +34527,25 @@ dvi-target-newlib: \
                    dvi) \
           || exit 1
  
-@endif target-newlib
+@endif target-libsanitizer
  
-.PHONY: maybe-pdf-target-newlib pdf-target-newlib
-maybe-pdf-target-newlib:
-@if target-newlib
-maybe-pdf-target-newlib: pdf-target-newlib
+.PHONY: maybe-pdf-target-libsanitizer pdf-target-libsanitizer
+maybe-pdf-target-libsanitizer:
+@if target-libsanitizer
+maybe-pdf-target-libsanitizer: pdf-target-libsanitizer
  
-pdf-target-newlib: \
-    configure-target-newlib 
+pdf-target-libsanitizer: \
+    configure-target-libsanitizer 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/newlib" ; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libsanitizer"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -32986,25 +34553,25 @@ pdf-target-newlib: \
                    pdf) \
           || exit 1
  
-@endif target-newlib
+@endif target-libsanitizer
  
-.PHONY: maybe-html-target-newlib html-target-newlib
-maybe-html-target-newlib:
-@if target-newlib
-maybe-html-target-newlib: html-target-newlib
+.PHONY: maybe-html-target-libsanitizer html-target-libsanitizer
+maybe-html-target-libsanitizer:
+@if target-libsanitizer
+maybe-html-target-libsanitizer: html-target-libsanitizer
  
-html-target-newlib: \
-    configure-target-newlib 
+html-target-libsanitizer: \
+    configure-target-libsanitizer 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/newlib" ; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libsanitizer"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -33012,25 +34579,25 @@ html-target-newlib: \
                    html) \
           || exit 1
  
-@endif target-newlib
+@endif target-libsanitizer
  
-.PHONY: maybe-TAGS-target-newlib TAGS-target-newlib
-maybe-TAGS-target-newlib:
-@if target-newlib
-maybe-TAGS-target-newlib: TAGS-target-newlib
+.PHONY: maybe-TAGS-target-libsanitizer TAGS-target-libsanitizer
+maybe-TAGS-target-libsanitizer:
+@if target-libsanitizer
+maybe-TAGS-target-libsanitizer: TAGS-target-libsanitizer
  
-TAGS-target-newlib: \
-    configure-target-newlib 
+TAGS-target-libsanitizer: \
+    configure-target-libsanitizer 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/newlib" ; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libsanitizer"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -33038,26 +34605,26 @@ TAGS-target-newlib: \
                    TAGS) \
           || exit 1
  
-@endif target-newlib
+@endif target-libsanitizer
  
-.PHONY: maybe-install-info-target-newlib install-info-target-newlib
-maybe-install-info-target-newlib:
-@if target-newlib
-maybe-install-info-target-newlib: install-info-target-newlib
+.PHONY: maybe-install-info-target-libsanitizer install-info-target-libsanitizer
+maybe-install-info-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-info-target-libsanitizer: install-info-target-libsanitizer
  
-install-info-target-newlib: \
-    configure-target-newlib \
-    info-target-newlib 
+install-info-target-libsanitizer: \
+    configure-target-libsanitizer \
+    info-target-libsanitizer 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/newlib" ; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libsanitizer"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -33065,26 +34632,26 @@ install-info-target-newlib: \
                    install-info) \
           || exit 1
  
-@endif target-newlib
+@endif target-libsanitizer
  
-.PHONY: maybe-install-pdf-target-newlib install-pdf-target-newlib
-maybe-install-pdf-target-newlib:
-@if target-newlib
-maybe-install-pdf-target-newlib: install-pdf-target-newlib
+.PHONY: maybe-install-pdf-target-libsanitizer install-pdf-target-libsanitizer
+maybe-install-pdf-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-pdf-target-libsanitizer: install-pdf-target-libsanitizer
  
-install-pdf-target-newlib: \
-    configure-target-newlib \
-    pdf-target-newlib 
+install-pdf-target-libsanitizer: \
+    configure-target-libsanitizer \
+    pdf-target-libsanitizer 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-pdf in $(TARGET_SUBDIR)/newlib" ; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libsanitizer"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -33092,26 +34659,26 @@ install-pdf-target-newlib: \
                    install-pdf) \
           || exit 1
  
-@endif target-newlib
+@endif target-libsanitizer
  
-.PHONY: maybe-install-html-target-newlib install-html-target-newlib
-maybe-install-html-target-newlib:
-@if target-newlib
-maybe-install-html-target-newlib: install-html-target-newlib
+.PHONY: maybe-install-html-target-libsanitizer install-html-target-libsanitizer
+maybe-install-html-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-html-target-libsanitizer: install-html-target-libsanitizer
  
-install-html-target-newlib: \
-    configure-target-newlib \
-    html-target-newlib 
+install-html-target-libsanitizer: \
+    configure-target-libsanitizer \
+    html-target-libsanitizer 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-html in $(TARGET_SUBDIR)/newlib" ; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libsanitizer"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -33119,25 +34686,25 @@ install-html-target-newlib: \
                    install-html) \
           || exit 1
  
-@endif target-newlib
+@endif target-libsanitizer
  
-.PHONY: maybe-installcheck-target-newlib installcheck-target-newlib
-maybe-installcheck-target-newlib:
-@if target-newlib
-maybe-installcheck-target-newlib: installcheck-target-newlib
+.PHONY: maybe-installcheck-target-libsanitizer installcheck-target-libsanitizer
+maybe-installcheck-target-libsanitizer:
+@if target-libsanitizer
+maybe-installcheck-target-libsanitizer: installcheck-target-libsanitizer
  
-installcheck-target-newlib: \
-    configure-target-newlib 
+installcheck-target-libsanitizer: \
+    configure-target-libsanitizer 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/newlib" ; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libsanitizer"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -33145,24 +34712,24 @@ installcheck-target-newlib: \
                    installcheck) \
           || exit 1
  
-@endif target-newlib
+@endif target-libsanitizer
  
-.PHONY: maybe-mostlyclean-target-newlib mostlyclean-target-newlib
-maybe-mostlyclean-target-newlib:
-@if target-newlib
-maybe-mostlyclean-target-newlib: mostlyclean-target-newlib
+.PHONY: maybe-mostlyclean-target-libsanitizer mostlyclean-target-libsanitizer
+maybe-mostlyclean-target-libsanitizer:
+@if target-libsanitizer
+maybe-mostlyclean-target-libsanitizer: mostlyclean-target-libsanitizer
  
-mostlyclean-target-newlib: 
+mostlyclean-target-libsanitizer: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/newlib" ; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libsanitizer"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -33170,24 +34737,24 @@ mostlyclean-target-newlib:
                    mostlyclean) \
           || exit 1
  
-@endif target-newlib
+@endif target-libsanitizer
  
-.PHONY: maybe-clean-target-newlib clean-target-newlib
-maybe-clean-target-newlib:
-@if target-newlib
-maybe-clean-target-newlib: clean-target-newlib
+.PHONY: maybe-clean-target-libsanitizer clean-target-libsanitizer
+maybe-clean-target-libsanitizer:
+@if target-libsanitizer
+maybe-clean-target-libsanitizer: clean-target-libsanitizer
  
-clean-target-newlib: 
+clean-target-libsanitizer: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/newlib" ; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing clean in $(TARGET_SUBDIR)/libsanitizer"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -33195,24 +34762,24 @@ clean-target-newlib:
                    clean) \
           || exit 1
  
-@endif target-newlib
+@endif target-libsanitizer
  
-.PHONY: maybe-distclean-target-newlib distclean-target-newlib
-maybe-distclean-target-newlib:
-@if target-newlib
-maybe-distclean-target-newlib: distclean-target-newlib
+.PHONY: maybe-distclean-target-libsanitizer distclean-target-libsanitizer
+maybe-distclean-target-libsanitizer:
+@if target-libsanitizer
+maybe-distclean-target-libsanitizer: distclean-target-libsanitizer
  
-distclean-target-newlib: 
+distclean-target-libsanitizer: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/newlib" ; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libsanitizer"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -33220,24 +34787,24 @@ distclean-target-newlib:
                    distclean) \
           || exit 1
  
-@endif target-newlib
+@endif target-libsanitizer
  
-.PHONY: maybe-maintainer-clean-target-newlib maintainer-clean-target-newlib
-maybe-maintainer-clean-target-newlib:
-@if target-newlib
-maybe-maintainer-clean-target-newlib: maintainer-clean-target-newlib
+.PHONY: maybe-maintainer-clean-target-libsanitizer maintainer-clean-target-libsanitizer
+maybe-maintainer-clean-target-libsanitizer:
+@if target-libsanitizer
+maybe-maintainer-clean-target-libsanitizer: maintainer-clean-target-libsanitizer
  
-maintainer-clean-target-newlib: 
+maintainer-clean-target-libsanitizer: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/newlib" ; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libsanitizer"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -33245,362 +34812,365 @@ maintainer-clean-target-newlib:
                    maintainer-clean) \
           || exit 1
  
-@endif target-newlib
+@endif target-libsanitizer
  
  
  
  
  
-.PHONY: configure-target-libgcc maybe-configure-target-libgcc
-maybe-configure-target-libgcc:
+.PHONY: configure-target-libmpx maybe-configure-target-libmpx
+maybe-configure-target-libmpx:
  @if gcc-bootstrap
-configure-target-libgcc: stage_current
+configure-target-libmpx: stage_current
  @endif gcc-bootstrap
-@if target-libgcc
-maybe-configure-target-libgcc: configure-target-libgcc
-configure-target-libgcc: 
+@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 libgcc..."; \
-       $(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; \
+       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)/libgcc/Makefile; \
-           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
           fi; \
         else \
-         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
         fi; \
-       test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
         $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libgcc; \
-       cd "$(TARGET_SUBDIR)/libgcc" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/libmpx; \
+       cd "$(TARGET_SUBDIR)/libmpx" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
+       module_srcdir=libmpx; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
-@endif target-libgcc
+@endif target-libmpx
  
  
  
-.PHONY: configure-stage1-target-libgcc maybe-configure-stage1-target-libgcc
-maybe-configure-stage1-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-configure-stage1-target-libgcc: configure-stage1-target-libgcc
-configure-stage1-target-libgcc:
+.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)/libgcc
+       @$(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 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; \
+       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)/libgcc/Makefile; \
-           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
           fi; \
         else \
-         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
         fi; \
-       test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
+       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)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
-       cd $(TARGET_SUBDIR)/libgcc || exit 1; \
+       echo Configuring stage 1 in $(TARGET_SUBDIR)/libmpx; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libmpx; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
           $(STAGE1_CONFIGURE_FLAGS)
-@endif target-libgcc-bootstrap
+@endif target-libmpx-bootstrap
  
-.PHONY: configure-stage2-target-libgcc maybe-configure-stage2-target-libgcc
-maybe-configure-stage2-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-configure-stage2-target-libgcc: configure-stage2-target-libgcc
-configure-stage2-target-libgcc:
+.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)/libgcc
+       @$(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 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; \
+       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)/libgcc/Makefile; \
-           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
           fi; \
         else \
-         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
         fi; \
-       test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
+       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)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
-       cd $(TARGET_SUBDIR)/libgcc || exit 1; \
+       echo Configuring stage 2 in $(TARGET_SUBDIR)/libmpx; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libmpx; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE2_CONFIGURE_FLAGS)
-@endif target-libgcc-bootstrap
+@endif target-libmpx-bootstrap
  
-.PHONY: configure-stage3-target-libgcc maybe-configure-stage3-target-libgcc
-maybe-configure-stage3-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-configure-stage3-target-libgcc: configure-stage3-target-libgcc
-configure-stage3-target-libgcc:
+.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)/libgcc
+       @$(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 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; \
+       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)/libgcc/Makefile; \
-           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
           fi; \
         else \
-         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
         fi; \
-       test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
+       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)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
-       cd $(TARGET_SUBDIR)/libgcc || exit 1; \
+       echo Configuring stage 3 in $(TARGET_SUBDIR)/libmpx; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libmpx; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE3_CONFIGURE_FLAGS)
-@endif target-libgcc-bootstrap
+@endif target-libmpx-bootstrap
  
-.PHONY: configure-stage4-target-libgcc maybe-configure-stage4-target-libgcc
-maybe-configure-stage4-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-configure-stage4-target-libgcc: configure-stage4-target-libgcc
-configure-stage4-target-libgcc:
+.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)/libgcc
+       @$(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 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; \
+       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)/libgcc/Makefile; \
-           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
           fi; \
         else \
-         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
         fi; \
-       test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
+       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)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
-       cd $(TARGET_SUBDIR)/libgcc || exit 1; \
+       echo Configuring stage 4 in $(TARGET_SUBDIR)/libmpx; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libmpx; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE4_CONFIGURE_FLAGS)
-@endif target-libgcc-bootstrap
+@endif target-libmpx-bootstrap
  
-.PHONY: configure-stageprofile-target-libgcc maybe-configure-stageprofile-target-libgcc
-maybe-configure-stageprofile-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-configure-stageprofile-target-libgcc: configure-stageprofile-target-libgcc
-configure-stageprofile-target-libgcc:
+.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)/libgcc
+       @$(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 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; \
+       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)/libgcc/Makefile; \
-           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
           fi; \
         else \
-         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
         fi; \
-       test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
+       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)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
-       cd $(TARGET_SUBDIR)/libgcc || exit 1; \
+       echo Configuring stage profile in $(TARGET_SUBDIR)/libmpx; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libmpx; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEprofile_CONFIGURE_FLAGS)
-@endif target-libgcc-bootstrap
+@endif target-libmpx-bootstrap
  
-.PHONY: configure-stagefeedback-target-libgcc maybe-configure-stagefeedback-target-libgcc
-maybe-configure-stagefeedback-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-configure-stagefeedback-target-libgcc: configure-stagefeedback-target-libgcc
-configure-stagefeedback-target-libgcc:
+.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)/libgcc
+       @$(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 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; \
+       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)/libgcc/Makefile; \
-           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
           fi; \
         else \
-         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
         fi; \
-       test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
+       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)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
-       cd $(TARGET_SUBDIR)/libgcc || exit 1; \
+       echo Configuring stage feedback in $(TARGET_SUBDIR)/libmpx; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libmpx; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif target-libgcc-bootstrap
+@endif target-libmpx-bootstrap
  
  
  
  
  
-.PHONY: all-target-libgcc maybe-all-target-libgcc
-maybe-all-target-libgcc:
+.PHONY: all-target-libmpx maybe-all-target-libmpx
+maybe-all-target-libmpx:
  @if gcc-bootstrap
-all-target-libgcc: stage_current
+all-target-libmpx: stage_current
  @endif gcc-bootstrap
-@if target-libgcc
-TARGET-target-libgcc=all
-maybe-all-target-libgcc: all-target-libgcc
-all-target-libgcc: configure-target-libgcc
+@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)/libgcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libgcc))
-@endif target-libgcc
-
-
-
-.PHONY: all-stage1-target-libgcc maybe-all-stage1-target-libgcc
-.PHONY: clean-stage1-target-libgcc maybe-clean-stage1-target-libgcc
-maybe-all-stage1-target-libgcc:
-maybe-clean-stage1-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-all-stage1-target-libgcc: all-stage1-target-libgcc
-all-stage1: all-stage1-target-libgcc
-TARGET-stage1-target-libgcc = $(TARGET-target-libgcc)
-all-stage1-target-libgcc: configure-stage1-target-libgcc
+       (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)/libgcc && \
+       cd $(TARGET_SUBDIR)/libmpx && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -33608,41 +35178,43 @@ all-stage1-target-libgcc: configure-stage1-target-libgcc
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-target-libgcc)
+               $(EXTRA_TARGET_FLAGS)  \
+                 \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
+               $(TARGET-stage1-target-libmpx)
  
-maybe-clean-stage1-target-libgcc: clean-stage1-target-libgcc
-clean-stage1: clean-stage1-target-libgcc
-clean-stage1-target-libgcc:
+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)/libgcc/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
         else \
-         [ -f $(TARGET_SUBDIR)/stage1-libgcc/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage1-libmpx/Makefile ] || exit 0; \
           $(MAKE) stage1-start; \
         fi; \
-       cd $(TARGET_SUBDIR)/libgcc && \
+       cd $(TARGET_SUBDIR)/libmpx && \
         $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                clean
-@endif target-libgcc-bootstrap
-
-
-.PHONY: all-stage2-target-libgcc maybe-all-stage2-target-libgcc
-.PHONY: clean-stage2-target-libgcc maybe-clean-stage2-target-libgcc
-maybe-all-stage2-target-libgcc:
-maybe-clean-stage2-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-all-stage2-target-libgcc: all-stage2-target-libgcc
-all-stage2: all-stage2-target-libgcc
-TARGET-stage2-target-libgcc = $(TARGET-target-libgcc)
-all-stage2-target-libgcc: configure-stage2-target-libgcc
+         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)/libgcc && \
+       cd $(TARGET_SUBDIR)/libmpx && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -33651,41 +35223,40 @@ all-stage2-target-libgcc: configure-stage2-target-libgcc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGE2_TFLAGS)" \
-               $(TARGET-stage2-target-libgcc)
+               TFLAGS="$(STAGE2_TFLAGS)"  \
+               $(TARGET-stage2-target-libmpx)
  
-maybe-clean-stage2-target-libgcc: clean-stage2-target-libgcc
-clean-stage2: clean-stage2-target-libgcc
-clean-stage2-target-libgcc:
+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)/libgcc/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
         else \
-         [ -f $(TARGET_SUBDIR)/stage2-libgcc/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage2-libmpx/Makefile ] || exit 0; \
           $(MAKE) stage2-start; \
         fi; \
-       cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
-@endif target-libgcc-bootstrap
-
-
-.PHONY: all-stage3-target-libgcc maybe-all-stage3-target-libgcc
-.PHONY: clean-stage3-target-libgcc maybe-clean-stage3-target-libgcc
-maybe-all-stage3-target-libgcc:
-maybe-clean-stage3-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-all-stage3-target-libgcc: all-stage3-target-libgcc
-all-stage3: all-stage3-target-libgcc
-TARGET-stage3-target-libgcc = $(TARGET-target-libgcc)
-all-stage3-target-libgcc: configure-stage3-target-libgcc
+       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)/libgcc && \
+       cd $(TARGET_SUBDIR)/libmpx && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -33694,41 +35265,40 @@ all-stage3-target-libgcc: configure-stage3-target-libgcc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGE3_TFLAGS)" \
-               $(TARGET-stage3-target-libgcc)
+               TFLAGS="$(STAGE3_TFLAGS)"  \
+               $(TARGET-stage3-target-libmpx)
  
-maybe-clean-stage3-target-libgcc: clean-stage3-target-libgcc
-clean-stage3: clean-stage3-target-libgcc
-clean-stage3-target-libgcc:
+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)/libgcc/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
         else \
-         [ -f $(TARGET_SUBDIR)/stage3-libgcc/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage3-libmpx/Makefile ] || exit 0; \
           $(MAKE) stage3-start; \
         fi; \
-       cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
-@endif target-libgcc-bootstrap
-
-
-.PHONY: all-stage4-target-libgcc maybe-all-stage4-target-libgcc
-.PHONY: clean-stage4-target-libgcc maybe-clean-stage4-target-libgcc
-maybe-all-stage4-target-libgcc:
-maybe-clean-stage4-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-all-stage4-target-libgcc: all-stage4-target-libgcc
-all-stage4: all-stage4-target-libgcc
-TARGET-stage4-target-libgcc = $(TARGET-target-libgcc)
-all-stage4-target-libgcc: configure-stage4-target-libgcc
+       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)/libgcc && \
+       cd $(TARGET_SUBDIR)/libmpx && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -33737,41 +35307,40 @@ all-stage4-target-libgcc: configure-stage4-target-libgcc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGE4_TFLAGS)" \
-               $(TARGET-stage4-target-libgcc)
+               TFLAGS="$(STAGE4_TFLAGS)"  \
+               $(TARGET-stage4-target-libmpx)
  
-maybe-clean-stage4-target-libgcc: clean-stage4-target-libgcc
-clean-stage4: clean-stage4-target-libgcc
-clean-stage4-target-libgcc:
+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)/libgcc/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
         else \
-         [ -f $(TARGET_SUBDIR)/stage4-libgcc/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stage4-libmpx/Makefile ] || exit 0; \
           $(MAKE) stage4-start; \
         fi; \
-       cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
-@endif target-libgcc-bootstrap
-
-
-.PHONY: all-stageprofile-target-libgcc maybe-all-stageprofile-target-libgcc
-.PHONY: clean-stageprofile-target-libgcc maybe-clean-stageprofile-target-libgcc
-maybe-all-stageprofile-target-libgcc:
-maybe-clean-stageprofile-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-all-stageprofile-target-libgcc: all-stageprofile-target-libgcc
-all-stageprofile: all-stageprofile-target-libgcc
-TARGET-stageprofile-target-libgcc = $(TARGET-target-libgcc)
-all-stageprofile-target-libgcc: configure-stageprofile-target-libgcc
+       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)/libgcc && \
+       cd $(TARGET_SUBDIR)/libmpx && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -33780,41 +35349,40 @@ all-stageprofile-target-libgcc: configure-stageprofile-target-libgcc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
-               $(TARGET-stageprofile-target-libgcc)
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
+               $(TARGET-stageprofile-target-libmpx)
  
-maybe-clean-stageprofile-target-libgcc: clean-stageprofile-target-libgcc
-clean-stageprofile: clean-stageprofile-target-libgcc
-clean-stageprofile-target-libgcc:
+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)/libgcc/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
         else \
-         [ -f $(TARGET_SUBDIR)/stageprofile-libgcc/Makefile ] || exit 0; \
+         [ -f $(TARGET_SUBDIR)/stageprofile-libmpx/Makefile ] || exit 0; \
           $(MAKE) stageprofile-start; \
         fi; \
-       cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
-@endif target-libgcc-bootstrap
-
-
-.PHONY: all-stagefeedback-target-libgcc maybe-all-stagefeedback-target-libgcc
-.PHONY: clean-stagefeedback-target-libgcc maybe-clean-stagefeedback-target-libgcc
-maybe-all-stagefeedback-target-libgcc:
-maybe-clean-stagefeedback-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-all-stagefeedback-target-libgcc: all-stagefeedback-target-libgcc
-all-stagefeedback: all-stagefeedback-target-libgcc
-TARGET-stagefeedback-target-libgcc = $(TARGET-target-libgcc)
-all-stagefeedback-target-libgcc: configure-stagefeedback-target-libgcc
+       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)/libgcc && \
+       cd $(TARGET_SUBDIR)/libmpx && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -33823,88 +35391,2447 @@ all-stagefeedback-target-libgcc: configure-stagefeedback-target-libgcc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
-               $(TARGET-stagefeedback-target-libgcc)
+               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
+configure-target-libvtv: stage_current
+@endif gcc-bootstrap
+@if target-libvtv
+maybe-configure-target-libvtv: configure-target-libvtv
+configure-target-libvtv: 
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for libvtv..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \
+           mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
+         fi; \
+       else \
+         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; \
+       $(RAW_CXX_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libvtv; \
+       cd "$(TARGET_SUBDIR)/libvtv" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libvtv; \
+       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-libvtv
+
+
+
+.PHONY: configure-stage1-target-libvtv maybe-configure-stage1-target-libvtv
+maybe-configure-stage1-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-configure-stage1-target-libvtv: configure-stage1-target-libvtv
+configure-stage1-target-libvtv:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv
+       @r=`${PWD_COMMAND}`; export r; \
+       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; \
+       if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \
+           mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 1 in $(TARGET_SUBDIR)/libvtv; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv; \
+       cd $(TARGET_SUBDIR)/libvtv || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libvtv; \
+       $(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-libvtv-bootstrap
+
+.PHONY: configure-stage2-target-libvtv maybe-configure-stage2-target-libvtv
+maybe-configure-stage2-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-configure-stage2-target-libvtv: configure-stage2-target-libvtv
+configure-stage2-target-libvtv:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv
+       @r=`${PWD_COMMAND}`; export r; \
+       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; \
+       if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \
+           mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 2 in $(TARGET_SUBDIR)/libvtv; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv; \
+       cd $(TARGET_SUBDIR)/libvtv || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libvtv; \
+       $(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-libvtv-bootstrap
+
+.PHONY: configure-stage3-target-libvtv maybe-configure-stage3-target-libvtv
+maybe-configure-stage3-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-configure-stage3-target-libvtv: configure-stage3-target-libvtv
+configure-stage3-target-libvtv:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv
+       @r=`${PWD_COMMAND}`; export r; \
+       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; \
+       if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \
+           mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 3 in $(TARGET_SUBDIR)/libvtv; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv; \
+       cd $(TARGET_SUBDIR)/libvtv || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libvtv; \
+       $(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-libvtv-bootstrap
+
+.PHONY: configure-stage4-target-libvtv maybe-configure-stage4-target-libvtv
+maybe-configure-stage4-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-configure-stage4-target-libvtv: configure-stage4-target-libvtv
+configure-stage4-target-libvtv:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv
+       @r=`${PWD_COMMAND}`; export r; \
+       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; \
+       if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \
+           mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 4 in $(TARGET_SUBDIR)/libvtv; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv; \
+       cd $(TARGET_SUBDIR)/libvtv || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libvtv; \
+       $(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-libvtv-bootstrap
+
+.PHONY: configure-stageprofile-target-libvtv maybe-configure-stageprofile-target-libvtv
+maybe-configure-stageprofile-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-configure-stageprofile-target-libvtv: configure-stageprofile-target-libvtv
+configure-stageprofile-target-libvtv:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv
+       @r=`${PWD_COMMAND}`; export r; \
+       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; \
+       if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \
+           mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage profile in $(TARGET_SUBDIR)/libvtv; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv; \
+       cd $(TARGET_SUBDIR)/libvtv || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libvtv; \
+       $(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-libvtv-bootstrap
+
+.PHONY: configure-stagefeedback-target-libvtv maybe-configure-stagefeedback-target-libvtv
+maybe-configure-stagefeedback-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-configure-stagefeedback-target-libvtv: configure-stagefeedback-target-libvtv
+configure-stagefeedback-target-libvtv:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv
+       @r=`${PWD_COMMAND}`; export r; \
+       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; \
+       if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \
+           mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(TARGET_SUBDIR)/libvtv; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv; \
+       cd $(TARGET_SUBDIR)/libvtv || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libvtv; \
+       $(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-libvtv-bootstrap
+
+
+
+
+
+.PHONY: all-target-libvtv maybe-all-target-libvtv
+maybe-all-target-libvtv:
+@if gcc-bootstrap
+all-target-libvtv: stage_current
+@endif gcc-bootstrap
+@if target-libvtv
+TARGET-target-libvtv=all
+maybe-all-target-libvtv: all-target-libvtv
+all-target-libvtv: configure-target-libvtv
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(RAW_CXX_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libvtv && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               $(TARGET-target-libvtv))
+@endif target-libvtv
+
+
+
+.PHONY: all-stage1-target-libvtv maybe-all-stage1-target-libvtv
+.PHONY: clean-stage1-target-libvtv maybe-clean-stage1-target-libvtv
+maybe-all-stage1-target-libvtv:
+maybe-clean-stage1-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-all-stage1-target-libvtv: all-stage1-target-libvtv
+all-stage1: all-stage1-target-libvtv
+TARGET-stage1-target-libvtv = $(TARGET-target-libvtv)
+all-stage1-target-libvtv: configure-stage1-target-libvtv
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS)  \
+       cd $(TARGET_SUBDIR)/libvtv && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
+                 \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
+               $(TARGET-stage1-target-libvtv)
+
+maybe-clean-stage1-target-libvtv: clean-stage1-target-libvtv
+clean-stage1: clean-stage1-target-libvtv
+clean-stage1-target-libvtv:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage1-libvtv/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libvtv && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
+         clean
+@endif target-libvtv-bootstrap
+
+
+.PHONY: all-stage2-target-libvtv maybe-all-stage2-target-libvtv
+.PHONY: clean-stage2-target-libvtv maybe-clean-stage2-target-libvtv
+maybe-all-stage2-target-libvtv:
+maybe-clean-stage2-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-all-stage2-target-libvtv: all-stage2-target-libvtv
+all-stage2: all-stage2-target-libvtv
+TARGET-stage2-target-libvtv = $(TARGET-target-libvtv)
+all-stage2-target-libvtv: configure-stage2-target-libvtv
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libvtv && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
+               $(TARGET-stage2-target-libvtv)
+
+maybe-clean-stage2-target-libvtv: clean-stage2-target-libvtv
+clean-stage2: clean-stage2-target-libvtv
+clean-stage2-target-libvtv:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage2-libvtv/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libvtv && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libvtv-bootstrap
+
+
+.PHONY: all-stage3-target-libvtv maybe-all-stage3-target-libvtv
+.PHONY: clean-stage3-target-libvtv maybe-clean-stage3-target-libvtv
+maybe-all-stage3-target-libvtv:
+maybe-clean-stage3-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-all-stage3-target-libvtv: all-stage3-target-libvtv
+all-stage3: all-stage3-target-libvtv
+TARGET-stage3-target-libvtv = $(TARGET-target-libvtv)
+all-stage3-target-libvtv: configure-stage3-target-libvtv
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libvtv && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
+               $(TARGET-stage3-target-libvtv)
+
+maybe-clean-stage3-target-libvtv: clean-stage3-target-libvtv
+clean-stage3: clean-stage3-target-libvtv
+clean-stage3-target-libvtv:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage3-libvtv/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libvtv && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libvtv-bootstrap
+
+
+.PHONY: all-stage4-target-libvtv maybe-all-stage4-target-libvtv
+.PHONY: clean-stage4-target-libvtv maybe-clean-stage4-target-libvtv
+maybe-all-stage4-target-libvtv:
+maybe-clean-stage4-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-all-stage4-target-libvtv: all-stage4-target-libvtv
+all-stage4: all-stage4-target-libvtv
+TARGET-stage4-target-libvtv = $(TARGET-target-libvtv)
+all-stage4-target-libvtv: configure-stage4-target-libvtv
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libvtv && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
+               $(TARGET-stage4-target-libvtv)
+
+maybe-clean-stage4-target-libvtv: clean-stage4-target-libvtv
+clean-stage4: clean-stage4-target-libvtv
+clean-stage4-target-libvtv:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage4-libvtv/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libvtv && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libvtv-bootstrap
+
+
+.PHONY: all-stageprofile-target-libvtv maybe-all-stageprofile-target-libvtv
+.PHONY: clean-stageprofile-target-libvtv maybe-clean-stageprofile-target-libvtv
+maybe-all-stageprofile-target-libvtv:
+maybe-clean-stageprofile-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-all-stageprofile-target-libvtv: all-stageprofile-target-libvtv
+all-stageprofile: all-stageprofile-target-libvtv
+TARGET-stageprofile-target-libvtv = $(TARGET-target-libvtv)
+all-stageprofile-target-libvtv: configure-stageprofile-target-libvtv
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libvtv && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
+               $(TARGET-stageprofile-target-libvtv)
+
+maybe-clean-stageprofile-target-libvtv: clean-stageprofile-target-libvtv
+clean-stageprofile: clean-stageprofile-target-libvtv
+clean-stageprofile-target-libvtv:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stageprofile-libvtv/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libvtv && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libvtv-bootstrap
+
+
+.PHONY: all-stagefeedback-target-libvtv maybe-all-stagefeedback-target-libvtv
+.PHONY: clean-stagefeedback-target-libvtv maybe-clean-stagefeedback-target-libvtv
+maybe-all-stagefeedback-target-libvtv:
+maybe-clean-stagefeedback-target-libvtv:
+@if target-libvtv-bootstrap
+maybe-all-stagefeedback-target-libvtv: all-stagefeedback-target-libvtv
+all-stagefeedback: all-stagefeedback-target-libvtv
+TARGET-stagefeedback-target-libvtv = $(TARGET-target-libvtv)
+all-stagefeedback-target-libvtv: configure-stagefeedback-target-libvtv
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libvtv && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
+               $(TARGET-stagefeedback-target-libvtv)
+
+maybe-clean-stagefeedback-target-libvtv: clean-stagefeedback-target-libvtv
+clean-stagefeedback: clean-stagefeedback-target-libvtv
+clean-stagefeedback-target-libvtv:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stagefeedback-libvtv/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libvtv && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libvtv-bootstrap
+
+
+
+
+
+
+.PHONY: check-target-libvtv maybe-check-target-libvtv
+maybe-check-target-libvtv:
+@if target-libvtv
+maybe-check-target-libvtv: check-target-libvtv
+
+check-target-libvtv:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libvtv && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
+
+@endif target-libvtv
+
+.PHONY: install-target-libvtv maybe-install-target-libvtv
+maybe-install-target-libvtv:
+@if target-libvtv
+maybe-install-target-libvtv: install-target-libvtv
+
+install-target-libvtv: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libvtv && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libvtv
+
+.PHONY: install-strip-target-libvtv maybe-install-strip-target-libvtv
+maybe-install-strip-target-libvtv:
+@if target-libvtv
+maybe-install-strip-target-libvtv: install-strip-target-libvtv
+
+install-strip-target-libvtv: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libvtv && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libvtv
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-libvtv info-target-libvtv
+maybe-info-target-libvtv:
+@if target-libvtv
+maybe-info-target-libvtv: info-target-libvtv
+
+info-target-libvtv: \
+    configure-target-libvtv 
+       @: $(MAKE); $(unstage)
+       @[ -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"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libvtv && \
+         $(MAKE) $(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-libvtv
+
+.PHONY: maybe-dvi-target-libvtv dvi-target-libvtv
+maybe-dvi-target-libvtv:
+@if target-libvtv
+maybe-dvi-target-libvtv: dvi-target-libvtv
+
+dvi-target-libvtv: \
+    configure-target-libvtv 
+       @: $(MAKE); $(unstage)
+       @[ -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"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libvtv && \
+         $(MAKE) $(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-libvtv
+
+.PHONY: maybe-pdf-target-libvtv pdf-target-libvtv
+maybe-pdf-target-libvtv:
+@if target-libvtv
+maybe-pdf-target-libvtv: pdf-target-libvtv
+
+pdf-target-libvtv: \
+    configure-target-libvtv 
+       @: $(MAKE); $(unstage)
+       @[ -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"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libvtv && \
+         $(MAKE) $(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-libvtv
+
+.PHONY: maybe-html-target-libvtv html-target-libvtv
+maybe-html-target-libvtv:
+@if target-libvtv
+maybe-html-target-libvtv: html-target-libvtv
+
+html-target-libvtv: \
+    configure-target-libvtv 
+       @: $(MAKE); $(unstage)
+       @[ -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"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libvtv && \
+         $(MAKE) $(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-libvtv
+
+.PHONY: maybe-TAGS-target-libvtv TAGS-target-libvtv
+maybe-TAGS-target-libvtv:
+@if target-libvtv
+maybe-TAGS-target-libvtv: TAGS-target-libvtv
+
+TAGS-target-libvtv: \
+    configure-target-libvtv 
+       @: $(MAKE); $(unstage)
+       @[ -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"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libvtv && \
+         $(MAKE) $(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-libvtv
+
+.PHONY: maybe-install-info-target-libvtv install-info-target-libvtv
+maybe-install-info-target-libvtv:
+@if target-libvtv
+maybe-install-info-target-libvtv: install-info-target-libvtv
+
+install-info-target-libvtv: \
+    configure-target-libvtv \
+    info-target-libvtv 
+       @: $(MAKE); $(unstage)
+       @[ -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"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libvtv && \
+         $(MAKE) $(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-libvtv
+
+.PHONY: maybe-install-pdf-target-libvtv install-pdf-target-libvtv
+maybe-install-pdf-target-libvtv:
+@if target-libvtv
+maybe-install-pdf-target-libvtv: install-pdf-target-libvtv
+
+install-pdf-target-libvtv: \
+    configure-target-libvtv \
+    pdf-target-libvtv 
+       @: $(MAKE); $(unstage)
+       @[ -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"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libvtv && \
+         $(MAKE) $(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-libvtv
+
+.PHONY: maybe-install-html-target-libvtv install-html-target-libvtv
+maybe-install-html-target-libvtv:
+@if target-libvtv
+maybe-install-html-target-libvtv: install-html-target-libvtv
+
+install-html-target-libvtv: \
+    configure-target-libvtv \
+    html-target-libvtv 
+       @: $(MAKE); $(unstage)
+       @[ -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"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libvtv && \
+         $(MAKE) $(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-libvtv
+
+.PHONY: maybe-installcheck-target-libvtv installcheck-target-libvtv
+maybe-installcheck-target-libvtv:
+@if target-libvtv
+maybe-installcheck-target-libvtv: installcheck-target-libvtv
+
+installcheck-target-libvtv: \
+    configure-target-libvtv 
+       @: $(MAKE); $(unstage)
+       @[ -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"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libvtv && \
+         $(MAKE) $(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-libvtv
+
+.PHONY: maybe-mostlyclean-target-libvtv mostlyclean-target-libvtv
+maybe-mostlyclean-target-libvtv:
+@if target-libvtv
+maybe-mostlyclean-target-libvtv: mostlyclean-target-libvtv
+
+mostlyclean-target-libvtv: 
+       @: $(MAKE); $(unstage)
+       @[ -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"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libvtv && \
+         $(MAKE) $(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-libvtv
+
+.PHONY: maybe-clean-target-libvtv clean-target-libvtv
+maybe-clean-target-libvtv:
+@if target-libvtv
+maybe-clean-target-libvtv: clean-target-libvtv
+
+clean-target-libvtv: 
+       @: $(MAKE); $(unstage)
+       @[ -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"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libvtv && \
+         $(MAKE) $(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-libvtv
+
+.PHONY: maybe-distclean-target-libvtv distclean-target-libvtv
+maybe-distclean-target-libvtv:
+@if target-libvtv
+maybe-distclean-target-libvtv: distclean-target-libvtv
+
+distclean-target-libvtv: 
+       @: $(MAKE); $(unstage)
+       @[ -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"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libvtv && \
+         $(MAKE) $(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-libvtv
+
+.PHONY: maybe-maintainer-clean-target-libvtv maintainer-clean-target-libvtv
+maybe-maintainer-clean-target-libvtv:
+@if target-libvtv
+maybe-maintainer-clean-target-libvtv: maintainer-clean-target-libvtv
+
+maintainer-clean-target-libvtv: 
+       @: $(MAKE); $(unstage)
+       @[ -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"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libvtv && \
+         $(MAKE) $(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-libvtv
+
+
+
+
+
+.PHONY: configure-target-libcilkrts maybe-configure-target-libcilkrts
+maybe-configure-target-libcilkrts:
+@if gcc-bootstrap
+configure-target-libcilkrts: stage_current
+@endif gcc-bootstrap
+@if target-libcilkrts
+maybe-configure-target-libcilkrts: configure-target-libcilkrts
+configure-target-libcilkrts: 
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for libcilkrts..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libcilkrts; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libcilkrts/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libcilkrts/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libcilkrts/multilib.tmp $(TARGET_SUBDIR)/libcilkrts/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libcilkrts/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libcilkrts/Makefile; \
+           mv $(TARGET_SUBDIR)/libcilkrts/multilib.tmp $(TARGET_SUBDIR)/libcilkrts/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libcilkrts/multilib.tmp $(TARGET_SUBDIR)/libcilkrts/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libcilkrts/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libcilkrts; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libcilkrts; \
+       cd "$(TARGET_SUBDIR)/libcilkrts" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libcilkrts/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libcilkrts; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias}  \
+         || exit 1
+@endif target-libcilkrts
+
+
+
+
+
+.PHONY: all-target-libcilkrts maybe-all-target-libcilkrts
+maybe-all-target-libcilkrts:
+@if gcc-bootstrap
+all-target-libcilkrts: stage_current
+@endif gcc-bootstrap
+@if target-libcilkrts
+TARGET-target-libcilkrts=all
+maybe-all-target-libcilkrts: all-target-libcilkrts
+all-target-libcilkrts: configure-target-libcilkrts
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libcilkrts))
+@endif target-libcilkrts
+
+
+
+
+
+.PHONY: check-target-libcilkrts maybe-check-target-libcilkrts
+maybe-check-target-libcilkrts:
+@if target-libcilkrts
+maybe-check-target-libcilkrts: check-target-libcilkrts
+
+check-target-libcilkrts:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-libcilkrts
+
+.PHONY: install-target-libcilkrts maybe-install-target-libcilkrts
+maybe-install-target-libcilkrts:
+@if target-libcilkrts
+maybe-install-target-libcilkrts: install-target-libcilkrts
+
+install-target-libcilkrts: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libcilkrts
+
+.PHONY: install-strip-target-libcilkrts maybe-install-strip-target-libcilkrts
+maybe-install-strip-target-libcilkrts:
+@if target-libcilkrts
+maybe-install-strip-target-libcilkrts: install-strip-target-libcilkrts
+
+install-strip-target-libcilkrts: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libcilkrts
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-libcilkrts info-target-libcilkrts
+maybe-info-target-libcilkrts:
+@if target-libcilkrts
+maybe-info-target-libcilkrts: info-target-libcilkrts
+
+info-target-libcilkrts: \
+    configure-target-libcilkrts 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing info in $(TARGET_SUBDIR)/libcilkrts"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  info) \
+         || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-dvi-target-libcilkrts dvi-target-libcilkrts
+maybe-dvi-target-libcilkrts:
+@if target-libcilkrts
+maybe-dvi-target-libcilkrts: dvi-target-libcilkrts
+
+dvi-target-libcilkrts: \
+    configure-target-libcilkrts 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libcilkrts"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  dvi) \
+         || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-pdf-target-libcilkrts pdf-target-libcilkrts
+maybe-pdf-target-libcilkrts:
+@if target-libcilkrts
+maybe-pdf-target-libcilkrts: pdf-target-libcilkrts
+
+pdf-target-libcilkrts: \
+    configure-target-libcilkrts 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libcilkrts"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  pdf) \
+         || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-html-target-libcilkrts html-target-libcilkrts
+maybe-html-target-libcilkrts:
+@if target-libcilkrts
+maybe-html-target-libcilkrts: html-target-libcilkrts
+
+html-target-libcilkrts: \
+    configure-target-libcilkrts 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libcilkrts"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  html) \
+         || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-TAGS-target-libcilkrts TAGS-target-libcilkrts
+maybe-TAGS-target-libcilkrts:
+@if target-libcilkrts
+maybe-TAGS-target-libcilkrts: TAGS-target-libcilkrts
+
+TAGS-target-libcilkrts: \
+    configure-target-libcilkrts 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libcilkrts"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  TAGS) \
+         || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-install-info-target-libcilkrts install-info-target-libcilkrts
+maybe-install-info-target-libcilkrts:
+@if target-libcilkrts
+maybe-install-info-target-libcilkrts: install-info-target-libcilkrts
+
+install-info-target-libcilkrts: \
+    configure-target-libcilkrts \
+    info-target-libcilkrts 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libcilkrts"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  install-info) \
+         || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-install-pdf-target-libcilkrts install-pdf-target-libcilkrts
+maybe-install-pdf-target-libcilkrts:
+@if target-libcilkrts
+maybe-install-pdf-target-libcilkrts: install-pdf-target-libcilkrts
+
+install-pdf-target-libcilkrts: \
+    configure-target-libcilkrts \
+    pdf-target-libcilkrts 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libcilkrts"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  install-pdf) \
+         || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-install-html-target-libcilkrts install-html-target-libcilkrts
+maybe-install-html-target-libcilkrts:
+@if target-libcilkrts
+maybe-install-html-target-libcilkrts: install-html-target-libcilkrts
+
+install-html-target-libcilkrts: \
+    configure-target-libcilkrts \
+    html-target-libcilkrts 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libcilkrts"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  install-html) \
+         || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-installcheck-target-libcilkrts installcheck-target-libcilkrts
+maybe-installcheck-target-libcilkrts:
+@if target-libcilkrts
+maybe-installcheck-target-libcilkrts: installcheck-target-libcilkrts
+
+installcheck-target-libcilkrts: \
+    configure-target-libcilkrts 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libcilkrts"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  installcheck) \
+         || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-mostlyclean-target-libcilkrts mostlyclean-target-libcilkrts
+maybe-mostlyclean-target-libcilkrts:
+@if target-libcilkrts
+maybe-mostlyclean-target-libcilkrts: mostlyclean-target-libcilkrts
+
+mostlyclean-target-libcilkrts: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libcilkrts"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  mostlyclean) \
+         || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-clean-target-libcilkrts clean-target-libcilkrts
+maybe-clean-target-libcilkrts:
+@if target-libcilkrts
+maybe-clean-target-libcilkrts: clean-target-libcilkrts
+
+clean-target-libcilkrts: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing clean in $(TARGET_SUBDIR)/libcilkrts"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  clean) \
+         || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-distclean-target-libcilkrts distclean-target-libcilkrts
+maybe-distclean-target-libcilkrts:
+@if target-libcilkrts
+maybe-distclean-target-libcilkrts: distclean-target-libcilkrts
+
+distclean-target-libcilkrts: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libcilkrts"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  distclean) \
+         || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-maintainer-clean-target-libcilkrts maintainer-clean-target-libcilkrts
+maybe-maintainer-clean-target-libcilkrts:
+@if target-libcilkrts
+maybe-maintainer-clean-target-libcilkrts: maintainer-clean-target-libcilkrts
+
+maintainer-clean-target-libcilkrts: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libcilkrts"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  maintainer-clean) \
+         || exit 1
+
+@endif target-libcilkrts
+
+
+
+
+
+.PHONY: configure-target-liboffloadmic maybe-configure-target-liboffloadmic
+maybe-configure-target-liboffloadmic:
+@if gcc-bootstrap
+configure-target-liboffloadmic: stage_current
+@endif gcc-bootstrap
+@if target-liboffloadmic
+maybe-configure-target-liboffloadmic: configure-target-liboffloadmic
+configure-target-liboffloadmic: 
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for liboffloadmic..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/liboffloadmic; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/liboffloadmic/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/liboffloadmic/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/liboffloadmic/multilib.tmp $(TARGET_SUBDIR)/liboffloadmic/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/liboffloadmic/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/liboffloadmic/Makefile; \
+           mv $(TARGET_SUBDIR)/liboffloadmic/multilib.tmp $(TARGET_SUBDIR)/liboffloadmic/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/liboffloadmic/multilib.tmp $(TARGET_SUBDIR)/liboffloadmic/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/liboffloadmic/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/liboffloadmic; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/liboffloadmic; \
+       cd "$(TARGET_SUBDIR)/liboffloadmic" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/liboffloadmic/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=liboffloadmic; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} @extra_liboffloadmic_configure_flags@ \
+         || exit 1
+@endif target-liboffloadmic
+
+
+
+
+
+.PHONY: all-target-liboffloadmic maybe-all-target-liboffloadmic
+maybe-all-target-liboffloadmic:
+@if gcc-bootstrap
+all-target-liboffloadmic: stage_current
+@endif gcc-bootstrap
+@if target-liboffloadmic
+TARGET-target-liboffloadmic=all
+maybe-all-target-liboffloadmic: all-target-liboffloadmic
+all-target-liboffloadmic: configure-target-liboffloadmic
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-liboffloadmic))
+@endif target-liboffloadmic
+
+
+
+
+
+.PHONY: check-target-liboffloadmic maybe-check-target-liboffloadmic
+maybe-check-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-check-target-liboffloadmic: check-target-liboffloadmic
+
+check-target-liboffloadmic:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-liboffloadmic
+
+.PHONY: install-target-liboffloadmic maybe-install-target-liboffloadmic
+maybe-install-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-install-target-liboffloadmic: install-target-liboffloadmic
+
+install-target-liboffloadmic: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-liboffloadmic
+
+.PHONY: install-strip-target-liboffloadmic maybe-install-strip-target-liboffloadmic
+maybe-install-strip-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-install-strip-target-liboffloadmic: install-strip-target-liboffloadmic
+
+install-strip-target-liboffloadmic: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-liboffloadmic
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-liboffloadmic info-target-liboffloadmic
+maybe-info-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-info-target-liboffloadmic: info-target-liboffloadmic
+
+info-target-liboffloadmic: \
+    configure-target-liboffloadmic 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing info in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  info) \
+         || exit 1
+
+@endif target-liboffloadmic
+
+.PHONY: maybe-dvi-target-liboffloadmic dvi-target-liboffloadmic
+maybe-dvi-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-dvi-target-liboffloadmic: dvi-target-liboffloadmic
+
+dvi-target-liboffloadmic: \
+    configure-target-liboffloadmic 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing dvi in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  dvi) \
+         || exit 1
+
+@endif target-liboffloadmic
+
+.PHONY: maybe-pdf-target-liboffloadmic pdf-target-liboffloadmic
+maybe-pdf-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-pdf-target-liboffloadmic: pdf-target-liboffloadmic
+
+pdf-target-liboffloadmic: \
+    configure-target-liboffloadmic 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing pdf in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  pdf) \
+         || exit 1
+
+@endif target-liboffloadmic
+
+.PHONY: maybe-html-target-liboffloadmic html-target-liboffloadmic
+maybe-html-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-html-target-liboffloadmic: html-target-liboffloadmic
+
+html-target-liboffloadmic: \
+    configure-target-liboffloadmic 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  html) \
+         || exit 1
+
+@endif target-liboffloadmic
+
+.PHONY: maybe-TAGS-target-liboffloadmic TAGS-target-liboffloadmic
+maybe-TAGS-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-TAGS-target-liboffloadmic: TAGS-target-liboffloadmic
+
+TAGS-target-liboffloadmic: \
+    configure-target-liboffloadmic 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  TAGS) \
+         || exit 1
+
+@endif target-liboffloadmic
+
+.PHONY: maybe-install-info-target-liboffloadmic install-info-target-liboffloadmic
+maybe-install-info-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-install-info-target-liboffloadmic: install-info-target-liboffloadmic
+
+install-info-target-liboffloadmic: \
+    configure-target-liboffloadmic \
+    info-target-liboffloadmic 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing install-info in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  install-info) \
+         || exit 1
+
+@endif target-liboffloadmic
+
+.PHONY: maybe-install-pdf-target-liboffloadmic install-pdf-target-liboffloadmic
+maybe-install-pdf-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-install-pdf-target-liboffloadmic: install-pdf-target-liboffloadmic
+
+install-pdf-target-liboffloadmic: \
+    configure-target-liboffloadmic \
+    pdf-target-liboffloadmic 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  install-pdf) \
+         || exit 1
+
+@endif target-liboffloadmic
+
+.PHONY: maybe-install-html-target-liboffloadmic install-html-target-liboffloadmic
+maybe-install-html-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-install-html-target-liboffloadmic: install-html-target-liboffloadmic
+
+install-html-target-liboffloadmic: \
+    configure-target-liboffloadmic \
+    html-target-liboffloadmic 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing install-html in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  install-html) \
+         || exit 1
+
+@endif target-liboffloadmic
+
+.PHONY: maybe-installcheck-target-liboffloadmic installcheck-target-liboffloadmic
+maybe-installcheck-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-installcheck-target-liboffloadmic: installcheck-target-liboffloadmic
+
+installcheck-target-liboffloadmic: \
+    configure-target-liboffloadmic 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  installcheck) \
+         || exit 1
+
+@endif target-liboffloadmic
+
+.PHONY: maybe-mostlyclean-target-liboffloadmic mostlyclean-target-liboffloadmic
+maybe-mostlyclean-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-mostlyclean-target-liboffloadmic: mostlyclean-target-liboffloadmic
+
+mostlyclean-target-liboffloadmic: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  mostlyclean) \
+         || exit 1
+
+@endif target-liboffloadmic
+
+.PHONY: maybe-clean-target-liboffloadmic clean-target-liboffloadmic
+maybe-clean-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-clean-target-liboffloadmic: clean-target-liboffloadmic
+
+clean-target-liboffloadmic: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing clean in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  clean) \
+         || exit 1
+
+@endif target-liboffloadmic
+
+.PHONY: maybe-distclean-target-liboffloadmic distclean-target-liboffloadmic
+maybe-distclean-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-distclean-target-liboffloadmic: distclean-target-liboffloadmic
+
+distclean-target-liboffloadmic: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing distclean in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  distclean) \
+         || exit 1
+
+@endif target-liboffloadmic
+
+.PHONY: maybe-maintainer-clean-target-liboffloadmic maintainer-clean-target-liboffloadmic
+maybe-maintainer-clean-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-maintainer-clean-target-liboffloadmic: maintainer-clean-target-liboffloadmic
+
+maintainer-clean-target-liboffloadmic: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/liboffloadmic"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  maintainer-clean) \
+         || exit 1
+
+@endif target-liboffloadmic
+
+
+
+
  
-maybe-clean-stagefeedback-target-libgcc: clean-stagefeedback-target-libgcc
-clean-stagefeedback: clean-stagefeedback-target-libgcc
-clean-stagefeedback-target-libgcc:
-       @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
+.PHONY: configure-target-libssp maybe-configure-target-libssp
+maybe-configure-target-libssp:
+@if gcc-bootstrap
+configure-target-libssp: stage_current
+@endif gcc-bootstrap
+@if target-libssp
+maybe-configure-target-libssp: configure-target-libssp
+configure-target-libssp: 
+       @: $(MAKE); $(unstage)
+       @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; \
+       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; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libssp/Makefile; \
+           mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \
+         fi; \
         else \
-         [ -f $(TARGET_SUBDIR)/stagefeedback-libgcc/Makefile ] || exit 0; \
-         $(MAKE) stagefeedback-start; \
+         mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \
         fi; \
-       cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
-@endif target-libgcc-bootstrap
+       test ! -f $(TARGET_SUBDIR)/libssp/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libssp; \
+       cd "$(TARGET_SUBDIR)/libssp" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libssp/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libssp; \
+       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-libssp
  
  
  
  
  
+.PHONY: all-target-libssp maybe-all-target-libssp
+maybe-all-target-libssp:
+@if gcc-bootstrap
+all-target-libssp: stage_current
+@endif gcc-bootstrap
+@if target-libssp
+TARGET-target-libssp=all
+maybe-all-target-libssp: all-target-libssp
+all-target-libssp: configure-target-libssp
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libssp && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libssp))
+@endif target-libssp
  
-.PHONY: check-target-libgcc maybe-check-target-libgcc
-maybe-check-target-libgcc:
-@if target-libgcc
-maybe-check-target-libgcc: check-target-libgcc
  
-# Dummy target for uncheckable module.
-check-target-libgcc:
  
-@endif target-libgcc
  
-.PHONY: install-target-libgcc maybe-install-target-libgcc
-maybe-install-target-libgcc:
-@if target-libgcc
-maybe-install-target-libgcc: install-target-libgcc
  
-install-target-libgcc: installdirs
+.PHONY: check-target-libssp maybe-check-target-libssp
+maybe-check-target-libssp:
+@if target-libssp
+maybe-check-target-libssp: check-target-libssp
+
+check-target-libssp:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/libssp && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-libssp
+
+.PHONY: install-target-libssp maybe-install-target-libssp
+maybe-install-target-libssp:
+@if target-libssp
+maybe-install-target-libssp: install-target-libssp
+
+install-target-libssp: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libssp && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
-@endif target-libgcc
+@endif target-libssp
  
-.PHONY: install-strip-target-libgcc maybe-install-strip-target-libgcc
-maybe-install-strip-target-libgcc:
-@if target-libgcc
-maybe-install-strip-target-libgcc: install-strip-target-libgcc
+.PHONY: install-strip-target-libssp maybe-install-strip-target-libssp
+maybe-install-strip-target-libssp:
+@if target-libssp
+maybe-install-strip-target-libssp: install-strip-target-libssp
  
-install-strip-target-libgcc: installdirs
+install-strip-target-libssp: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/libssp && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
  
-@endif target-libgcc
+@endif target-libssp
  
  # Other targets (info, dvi, pdf, etc.)
  
-.PHONY: maybe-info-target-libgcc info-target-libgcc
-maybe-info-target-libgcc:
-@if target-libgcc
-maybe-info-target-libgcc: info-target-libgcc
+.PHONY: maybe-info-target-libssp info-target-libssp
+maybe-info-target-libssp:
+@if target-libssp
+maybe-info-target-libssp: info-target-libssp
  
-info-target-libgcc: \
-    configure-target-libgcc 
+info-target-libssp: \
+    configure-target-libssp 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/libssp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -33912,25 +37839,25 @@ info-target-libgcc: \
                    info) \
           || exit 1
  
-@endif target-libgcc
+@endif target-libssp
  
-.PHONY: maybe-dvi-target-libgcc dvi-target-libgcc
-maybe-dvi-target-libgcc:
-@if target-libgcc
-maybe-dvi-target-libgcc: dvi-target-libgcc
+.PHONY: maybe-dvi-target-libssp dvi-target-libssp
+maybe-dvi-target-libssp:
+@if target-libssp
+maybe-dvi-target-libssp: dvi-target-libssp
  
-dvi-target-libgcc: \
-    configure-target-libgcc 
+dvi-target-libssp: \
+    configure-target-libssp 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/libssp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -33938,25 +37865,25 @@ dvi-target-libgcc: \
                    dvi) \
           || exit 1
  
-@endif target-libgcc
+@endif target-libssp
  
-.PHONY: maybe-pdf-target-libgcc pdf-target-libgcc
-maybe-pdf-target-libgcc:
-@if target-libgcc
-maybe-pdf-target-libgcc: pdf-target-libgcc
+.PHONY: maybe-pdf-target-libssp pdf-target-libssp
+maybe-pdf-target-libssp:
+@if target-libssp
+maybe-pdf-target-libssp: pdf-target-libssp
  
-pdf-target-libgcc: \
-    configure-target-libgcc 
+pdf-target-libssp: \
+    configure-target-libssp 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/libssp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -33964,25 +37891,25 @@ pdf-target-libgcc: \
                    pdf) \
           || exit 1
  
-@endif target-libgcc
+@endif target-libssp
  
-.PHONY: maybe-html-target-libgcc html-target-libgcc
-maybe-html-target-libgcc:
-@if target-libgcc
-maybe-html-target-libgcc: html-target-libgcc
+.PHONY: maybe-html-target-libssp html-target-libssp
+maybe-html-target-libssp:
+@if target-libssp
+maybe-html-target-libssp: html-target-libssp
  
-html-target-libgcc: \
-    configure-target-libgcc 
+html-target-libssp: \
+    configure-target-libssp 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/libssp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -33990,25 +37917,25 @@ html-target-libgcc: \
                    html) \
           || exit 1
  
-@endif target-libgcc
+@endif target-libssp
  
-.PHONY: maybe-TAGS-target-libgcc TAGS-target-libgcc
-maybe-TAGS-target-libgcc:
-@if target-libgcc
-maybe-TAGS-target-libgcc: TAGS-target-libgcc
+.PHONY: maybe-TAGS-target-libssp TAGS-target-libssp
+maybe-TAGS-target-libssp:
+@if target-libssp
+maybe-TAGS-target-libssp: TAGS-target-libssp
  
-TAGS-target-libgcc: \
-    configure-target-libgcc 
+TAGS-target-libssp: \
+    configure-target-libssp 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/libssp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34016,26 +37943,26 @@ TAGS-target-libgcc: \
                    TAGS) \
           || exit 1
  
-@endif target-libgcc
+@endif target-libssp
  
-.PHONY: maybe-install-info-target-libgcc install-info-target-libgcc
-maybe-install-info-target-libgcc:
-@if target-libgcc
-maybe-install-info-target-libgcc: install-info-target-libgcc
+.PHONY: maybe-install-info-target-libssp install-info-target-libssp
+maybe-install-info-target-libssp:
+@if target-libssp
+maybe-install-info-target-libssp: install-info-target-libssp
  
-install-info-target-libgcc: \
-    configure-target-libgcc \
-    info-target-libgcc 
+install-info-target-libssp: \
+    configure-target-libssp \
+    info-target-libssp 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/libssp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34043,26 +37970,26 @@ install-info-target-libgcc: \
                    install-info) \
           || exit 1
  
-@endif target-libgcc
+@endif target-libssp
  
-.PHONY: maybe-install-pdf-target-libgcc install-pdf-target-libgcc
-maybe-install-pdf-target-libgcc:
-@if target-libgcc
-maybe-install-pdf-target-libgcc: install-pdf-target-libgcc
+.PHONY: maybe-install-pdf-target-libssp install-pdf-target-libssp
+maybe-install-pdf-target-libssp:
+@if target-libssp
+maybe-install-pdf-target-libssp: install-pdf-target-libssp
  
-install-pdf-target-libgcc: \
-    configure-target-libgcc \
-    pdf-target-libgcc 
+install-pdf-target-libssp: \
+    configure-target-libssp \
+    pdf-target-libssp 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/libssp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34070,26 +37997,26 @@ install-pdf-target-libgcc: \
                    install-pdf) \
           || exit 1
  
-@endif target-libgcc
+@endif target-libssp
  
-.PHONY: maybe-install-html-target-libgcc install-html-target-libgcc
-maybe-install-html-target-libgcc:
-@if target-libgcc
-maybe-install-html-target-libgcc: install-html-target-libgcc
+.PHONY: maybe-install-html-target-libssp install-html-target-libssp
+maybe-install-html-target-libssp:
+@if target-libssp
+maybe-install-html-target-libssp: install-html-target-libssp
  
-install-html-target-libgcc: \
-    configure-target-libgcc \
-    html-target-libgcc 
+install-html-target-libssp: \
+    configure-target-libssp \
+    html-target-libssp 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/libssp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34097,25 +38024,25 @@ install-html-target-libgcc: \
                    install-html) \
           || exit 1
  
-@endif target-libgcc
+@endif target-libssp
  
-.PHONY: maybe-installcheck-target-libgcc installcheck-target-libgcc
-maybe-installcheck-target-libgcc:
-@if target-libgcc
-maybe-installcheck-target-libgcc: installcheck-target-libgcc
+.PHONY: maybe-installcheck-target-libssp installcheck-target-libssp
+maybe-installcheck-target-libssp:
+@if target-libssp
+maybe-installcheck-target-libssp: installcheck-target-libssp
  
-installcheck-target-libgcc: \
-    configure-target-libgcc 
+installcheck-target-libssp: \
+    configure-target-libssp 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/libssp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34123,24 +38050,24 @@ installcheck-target-libgcc: \
                    installcheck) \
           || exit 1
  
-@endif target-libgcc
+@endif target-libssp
  
-.PHONY: maybe-mostlyclean-target-libgcc mostlyclean-target-libgcc
-maybe-mostlyclean-target-libgcc:
-@if target-libgcc
-maybe-mostlyclean-target-libgcc: mostlyclean-target-libgcc
+.PHONY: maybe-mostlyclean-target-libssp mostlyclean-target-libssp
+maybe-mostlyclean-target-libssp:
+@if target-libssp
+maybe-mostlyclean-target-libssp: mostlyclean-target-libssp
  
-mostlyclean-target-libgcc: 
+mostlyclean-target-libssp: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/libssp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34148,24 +38075,24 @@ mostlyclean-target-libgcc:
                    mostlyclean) \
           || exit 1
  
-@endif target-libgcc
+@endif target-libssp
  
-.PHONY: maybe-clean-target-libgcc clean-target-libgcc
-maybe-clean-target-libgcc:
-@if target-libgcc
-maybe-clean-target-libgcc: clean-target-libgcc
+.PHONY: maybe-clean-target-libssp clean-target-libssp
+maybe-clean-target-libssp:
+@if target-libssp
+maybe-clean-target-libssp: clean-target-libssp
  
-clean-target-libgcc: 
+clean-target-libssp: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/libssp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34173,24 +38100,24 @@ clean-target-libgcc:
                    clean) \
           || exit 1
  
-@endif target-libgcc
+@endif target-libssp
  
-.PHONY: maybe-distclean-target-libgcc distclean-target-libgcc
-maybe-distclean-target-libgcc:
-@if target-libgcc
-maybe-distclean-target-libgcc: distclean-target-libgcc
+.PHONY: maybe-distclean-target-libssp distclean-target-libssp
+maybe-distclean-target-libssp:
+@if target-libssp
+maybe-distclean-target-libssp: distclean-target-libssp
  
-distclean-target-libgcc: 
+distclean-target-libssp: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/libssp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34198,24 +38125,24 @@ distclean-target-libgcc:
                    distclean) \
           || exit 1
  
-@endif target-libgcc
+@endif target-libssp
  
-.PHONY: maybe-maintainer-clean-target-libgcc maintainer-clean-target-libgcc
-maybe-maintainer-clean-target-libgcc:
-@if target-libgcc
-maybe-maintainer-clean-target-libgcc: maintainer-clean-target-libgcc
+.PHONY: maybe-maintainer-clean-target-libssp maintainer-clean-target-libssp
+maybe-maintainer-clean-target-libssp:
+@if target-libssp
+maybe-maintainer-clean-target-libssp: maintainer-clean-target-libssp
  
-maintainer-clean-target-libgcc: 
+maintainer-clean-target-libssp: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/libssp && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34223,145 +38150,146 @@ maintainer-clean-target-libgcc:
                    maintainer-clean) \
           || exit 1
  
-@endif target-libgcc
+@endif target-libssp
  
  
  
  
  
-.PHONY: configure-target-libbacktrace maybe-configure-target-libbacktrace
-maybe-configure-target-libbacktrace:
+.PHONY: configure-target-newlib maybe-configure-target-newlib
+maybe-configure-target-newlib:
  @if gcc-bootstrap
-configure-target-libbacktrace: stage_current
+configure-target-newlib: stage_current
  @endif gcc-bootstrap
-@if target-libbacktrace
-maybe-configure-target-libbacktrace: configure-target-libbacktrace
-configure-target-libbacktrace: 
+@if target-newlib
+maybe-configure-target-newlib: configure-target-newlib
+configure-target-newlib: 
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for libbacktrace..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libbacktrace ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libbacktrace/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libbacktrace/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libbacktrace/multilib.tmp $(TARGET_SUBDIR)/libbacktrace/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libbacktrace/multilib.tmp; \
+       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; \
+       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; \
           else \
-           rm -f $(TARGET_SUBDIR)/libbacktrace/Makefile; \
-           mv $(TARGET_SUBDIR)/libbacktrace/multilib.tmp $(TARGET_SUBDIR)/libbacktrace/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/newlib/Makefile; \
+           mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \
           fi; \
         else \
-         mv $(TARGET_SUBDIR)/libbacktrace/multilib.tmp $(TARGET_SUBDIR)/libbacktrace/multilib.out; \
+         mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \
         fi; \
-       test ! -f $(TARGET_SUBDIR)/libbacktrace/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libbacktrace ; \
+       test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib; \
         $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libbacktrace; \
-       cd "$(TARGET_SUBDIR)/libbacktrace" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/newlib; \
+       cd "$(TARGET_SUBDIR)/newlib" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libbacktrace/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/newlib/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libbacktrace"; \
-       libsrcdir="$$s/libbacktrace"; \
+       module_srcdir=newlib; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
-@endif target-libbacktrace
+@endif target-newlib
  
  
  
  
  
-.PHONY: all-target-libbacktrace maybe-all-target-libbacktrace
-maybe-all-target-libbacktrace:
+.PHONY: all-target-newlib maybe-all-target-newlib
+maybe-all-target-newlib:
  @if gcc-bootstrap
-all-target-libbacktrace: stage_current
+all-target-newlib: stage_current
  @endif gcc-bootstrap
-@if target-libbacktrace
-TARGET-target-libbacktrace=all
-maybe-all-target-libbacktrace: all-target-libbacktrace
-all-target-libbacktrace: configure-target-libbacktrace
+@if target-newlib
+TARGET-target-newlib=all
+maybe-all-target-newlib: all-target-newlib
+all-target-newlib: configure-target-newlib
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libbacktrace && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libbacktrace))
-@endif target-libbacktrace
+       (cd $(TARGET_SUBDIR)/newlib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-newlib))
+@endif target-newlib
  
  
  
  
  
-.PHONY: check-target-libbacktrace maybe-check-target-libbacktrace
-maybe-check-target-libbacktrace:
-@if target-libbacktrace
-maybe-check-target-libbacktrace: check-target-libbacktrace
+.PHONY: check-target-newlib maybe-check-target-newlib
+maybe-check-target-newlib:
+@if target-newlib
+maybe-check-target-newlib: check-target-newlib
  
-check-target-libbacktrace:
+check-target-newlib:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libbacktrace && \
+       (cd $(TARGET_SUBDIR)/newlib && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
-@endif target-libbacktrace
+@endif target-newlib
  
-.PHONY: install-target-libbacktrace maybe-install-target-libbacktrace
-maybe-install-target-libbacktrace:
-@if target-libbacktrace
-maybe-install-target-libbacktrace: install-target-libbacktrace
+.PHONY: install-target-newlib maybe-install-target-newlib
+maybe-install-target-newlib:
+@if target-newlib
+maybe-install-target-newlib: install-target-newlib
  
-install-target-libbacktrace: installdirs
+install-target-newlib: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libbacktrace && \
+       (cd $(TARGET_SUBDIR)/newlib && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
-@endif target-libbacktrace
+@endif target-newlib
  
-.PHONY: install-strip-target-libbacktrace maybe-install-strip-target-libbacktrace
-maybe-install-strip-target-libbacktrace:
-@if target-libbacktrace
-maybe-install-strip-target-libbacktrace: install-strip-target-libbacktrace
+.PHONY: install-strip-target-newlib maybe-install-strip-target-newlib
+maybe-install-strip-target-newlib:
+@if target-newlib
+maybe-install-strip-target-newlib: install-strip-target-newlib
  
-install-strip-target-libbacktrace: installdirs
+install-strip-target-newlib: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libbacktrace && \
+       (cd $(TARGET_SUBDIR)/newlib && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
  
-@endif target-libbacktrace
+@endif target-newlib
  
  # Other targets (info, dvi, pdf, etc.)
  
-.PHONY: maybe-info-target-libbacktrace info-target-libbacktrace
-maybe-info-target-libbacktrace:
-@if target-libbacktrace
-maybe-info-target-libbacktrace: info-target-libbacktrace
+.PHONY: maybe-info-target-newlib info-target-newlib
+maybe-info-target-newlib:
+@if target-newlib
+maybe-info-target-newlib: info-target-newlib
  
-info-target-libbacktrace: \
-    configure-target-libbacktrace 
+info-target-newlib: \
+    configure-target-newlib 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/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)/libbacktrace" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libbacktrace && \
+       (cd $(TARGET_SUBDIR)/newlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34369,25 +38297,25 @@ info-target-libbacktrace: \
                    info) \
           || exit 1
  
-@endif target-libbacktrace
+@endif target-newlib
  
-.PHONY: maybe-dvi-target-libbacktrace dvi-target-libbacktrace
-maybe-dvi-target-libbacktrace:
-@if target-libbacktrace
-maybe-dvi-target-libbacktrace: dvi-target-libbacktrace
+.PHONY: maybe-dvi-target-newlib dvi-target-newlib
+maybe-dvi-target-newlib:
+@if target-newlib
+maybe-dvi-target-newlib: dvi-target-newlib
  
-dvi-target-libbacktrace: \
-    configure-target-libbacktrace 
+dvi-target-newlib: \
+    configure-target-newlib 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/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)/libbacktrace" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libbacktrace && \
+       (cd $(TARGET_SUBDIR)/newlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34395,25 +38323,25 @@ dvi-target-libbacktrace: \
                    dvi) \
           || exit 1
  
-@endif target-libbacktrace
+@endif target-newlib
  
-.PHONY: maybe-pdf-target-libbacktrace pdf-target-libbacktrace
-maybe-pdf-target-libbacktrace:
-@if target-libbacktrace
-maybe-pdf-target-libbacktrace: pdf-target-libbacktrace
+.PHONY: maybe-pdf-target-newlib pdf-target-newlib
+maybe-pdf-target-newlib:
+@if target-newlib
+maybe-pdf-target-newlib: pdf-target-newlib
  
-pdf-target-libbacktrace: \
-    configure-target-libbacktrace 
+pdf-target-newlib: \
+    configure-target-newlib 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/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)/libbacktrace" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libbacktrace && \
+       (cd $(TARGET_SUBDIR)/newlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34421,25 +38349,25 @@ pdf-target-libbacktrace: \
                    pdf) \
           || exit 1
  
-@endif target-libbacktrace
+@endif target-newlib
  
-.PHONY: maybe-html-target-libbacktrace html-target-libbacktrace
-maybe-html-target-libbacktrace:
-@if target-libbacktrace
-maybe-html-target-libbacktrace: html-target-libbacktrace
+.PHONY: maybe-html-target-newlib html-target-newlib
+maybe-html-target-newlib:
+@if target-newlib
+maybe-html-target-newlib: html-target-newlib
  
-html-target-libbacktrace: \
-    configure-target-libbacktrace 
+html-target-newlib: \
+    configure-target-newlib 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/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)/libbacktrace" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libbacktrace && \
+       (cd $(TARGET_SUBDIR)/newlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34447,25 +38375,25 @@ html-target-libbacktrace: \
                    html) \
           || exit 1
  
-@endif target-libbacktrace
+@endif target-newlib
  
-.PHONY: maybe-TAGS-target-libbacktrace TAGS-target-libbacktrace
-maybe-TAGS-target-libbacktrace:
-@if target-libbacktrace
-maybe-TAGS-target-libbacktrace: TAGS-target-libbacktrace
+.PHONY: maybe-TAGS-target-newlib TAGS-target-newlib
+maybe-TAGS-target-newlib:
+@if target-newlib
+maybe-TAGS-target-newlib: TAGS-target-newlib
  
-TAGS-target-libbacktrace: \
-    configure-target-libbacktrace 
+TAGS-target-newlib: \
+    configure-target-newlib 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/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)/libbacktrace" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libbacktrace && \
+       (cd $(TARGET_SUBDIR)/newlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34473,26 +38401,26 @@ TAGS-target-libbacktrace: \
                    TAGS) \
           || exit 1
  
-@endif target-libbacktrace
+@endif target-newlib
  
-.PHONY: maybe-install-info-target-libbacktrace install-info-target-libbacktrace
-maybe-install-info-target-libbacktrace:
-@if target-libbacktrace
-maybe-install-info-target-libbacktrace: install-info-target-libbacktrace
+.PHONY: maybe-install-info-target-newlib install-info-target-newlib
+maybe-install-info-target-newlib:
+@if target-newlib
+maybe-install-info-target-newlib: install-info-target-newlib
  
-install-info-target-libbacktrace: \
-    configure-target-libbacktrace \
-    info-target-libbacktrace 
+install-info-target-newlib: \
+    configure-target-newlib \
+    info-target-newlib 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/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)/libbacktrace" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libbacktrace && \
+       (cd $(TARGET_SUBDIR)/newlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34500,26 +38428,26 @@ install-info-target-libbacktrace: \
                    install-info) \
           || exit 1
  
-@endif target-libbacktrace
+@endif target-newlib
  
-.PHONY: maybe-install-pdf-target-libbacktrace install-pdf-target-libbacktrace
-maybe-install-pdf-target-libbacktrace:
-@if target-libbacktrace
-maybe-install-pdf-target-libbacktrace: install-pdf-target-libbacktrace
+.PHONY: maybe-install-pdf-target-newlib install-pdf-target-newlib
+maybe-install-pdf-target-newlib:
+@if target-newlib
+maybe-install-pdf-target-newlib: install-pdf-target-newlib
  
-install-pdf-target-libbacktrace: \
-    configure-target-libbacktrace \
-    pdf-target-libbacktrace 
+install-pdf-target-newlib: \
+    configure-target-newlib \
+    pdf-target-newlib 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/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)/libbacktrace" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libbacktrace && \
+       (cd $(TARGET_SUBDIR)/newlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34527,26 +38455,26 @@ install-pdf-target-libbacktrace: \
                    install-pdf) \
           || exit 1
  
-@endif target-libbacktrace
+@endif target-newlib
  
-.PHONY: maybe-install-html-target-libbacktrace install-html-target-libbacktrace
-maybe-install-html-target-libbacktrace:
-@if target-libbacktrace
-maybe-install-html-target-libbacktrace: install-html-target-libbacktrace
+.PHONY: maybe-install-html-target-newlib install-html-target-newlib
+maybe-install-html-target-newlib:
+@if target-newlib
+maybe-install-html-target-newlib: install-html-target-newlib
  
-install-html-target-libbacktrace: \
-    configure-target-libbacktrace \
-    html-target-libbacktrace 
+install-html-target-newlib: \
+    configure-target-newlib \
+    html-target-newlib 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/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)/libbacktrace" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libbacktrace && \
+       (cd $(TARGET_SUBDIR)/newlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34554,25 +38482,25 @@ install-html-target-libbacktrace: \
                    install-html) \
           || exit 1
  
-@endif target-libbacktrace
+@endif target-newlib
  
-.PHONY: maybe-installcheck-target-libbacktrace installcheck-target-libbacktrace
-maybe-installcheck-target-libbacktrace:
-@if target-libbacktrace
-maybe-installcheck-target-libbacktrace: installcheck-target-libbacktrace
+.PHONY: maybe-installcheck-target-newlib installcheck-target-newlib
+maybe-installcheck-target-newlib:
+@if target-newlib
+maybe-installcheck-target-newlib: installcheck-target-newlib
  
-installcheck-target-libbacktrace: \
-    configure-target-libbacktrace 
+installcheck-target-newlib: \
+    configure-target-newlib 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/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)/libbacktrace" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libbacktrace && \
+       (cd $(TARGET_SUBDIR)/newlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34580,24 +38508,24 @@ installcheck-target-libbacktrace: \
                    installcheck) \
           || exit 1
  
-@endif target-libbacktrace
+@endif target-newlib
  
-.PHONY: maybe-mostlyclean-target-libbacktrace mostlyclean-target-libbacktrace
-maybe-mostlyclean-target-libbacktrace:
-@if target-libbacktrace
-maybe-mostlyclean-target-libbacktrace: mostlyclean-target-libbacktrace
+.PHONY: maybe-mostlyclean-target-newlib mostlyclean-target-newlib
+maybe-mostlyclean-target-newlib:
+@if target-newlib
+maybe-mostlyclean-target-newlib: mostlyclean-target-newlib
  
-mostlyclean-target-libbacktrace: 
+mostlyclean-target-newlib: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/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)/libbacktrace" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libbacktrace && \
+       (cd $(TARGET_SUBDIR)/newlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34605,24 +38533,24 @@ mostlyclean-target-libbacktrace:
                    mostlyclean) \
           || exit 1
  
-@endif target-libbacktrace
+@endif target-newlib
  
-.PHONY: maybe-clean-target-libbacktrace clean-target-libbacktrace
-maybe-clean-target-libbacktrace:
-@if target-libbacktrace
-maybe-clean-target-libbacktrace: clean-target-libbacktrace
+.PHONY: maybe-clean-target-newlib clean-target-newlib
+maybe-clean-target-newlib:
+@if target-newlib
+maybe-clean-target-newlib: clean-target-newlib
  
-clean-target-libbacktrace: 
+clean-target-newlib: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/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)/libbacktrace" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libbacktrace && \
+       (cd $(TARGET_SUBDIR)/newlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34630,24 +38558,24 @@ clean-target-libbacktrace:
                    clean) \
           || exit 1
  
-@endif target-libbacktrace
+@endif target-newlib
  
-.PHONY: maybe-distclean-target-libbacktrace distclean-target-libbacktrace
-maybe-distclean-target-libbacktrace:
-@if target-libbacktrace
-maybe-distclean-target-libbacktrace: distclean-target-libbacktrace
+.PHONY: maybe-distclean-target-newlib distclean-target-newlib
+maybe-distclean-target-newlib:
+@if target-newlib
+maybe-distclean-target-newlib: distclean-target-newlib
  
-distclean-target-libbacktrace: 
+distclean-target-newlib: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/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)/libbacktrace" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libbacktrace && \
+       (cd $(TARGET_SUBDIR)/newlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34655,24 +38583,24 @@ distclean-target-libbacktrace:
                    distclean) \
           || exit 1
  
-@endif target-libbacktrace
+@endif target-newlib
  
-.PHONY: maybe-maintainer-clean-target-libbacktrace maintainer-clean-target-libbacktrace
-maybe-maintainer-clean-target-libbacktrace:
-@if target-libbacktrace
-maybe-maintainer-clean-target-libbacktrace: maintainer-clean-target-libbacktrace
+.PHONY: maybe-maintainer-clean-target-newlib maintainer-clean-target-newlib
+maybe-maintainer-clean-target-newlib:
+@if target-newlib
+maybe-maintainer-clean-target-newlib: maintainer-clean-target-newlib
  
-maintainer-clean-target-libbacktrace: 
+maintainer-clean-target-newlib: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libbacktrace/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)/libbacktrace" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libbacktrace && \
+       (cd $(TARGET_SUBDIR)/newlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34680,145 +38608,665 @@ maintainer-clean-target-libbacktrace:
                    maintainer-clean) \
           || exit 1
  
-@endif target-libbacktrace
+@endif target-newlib
+
+
+
+
+
+.PHONY: configure-target-libgcc maybe-configure-target-libgcc
+maybe-configure-target-libgcc:
+@if gcc-bootstrap
+configure-target-libgcc: stage_current
+@endif gcc-bootstrap
+@if target-libgcc
+maybe-configure-target-libgcc: configure-target-libgcc
+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; \
+       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; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
+           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+         fi; \
+       else \
+         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; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libgcc; \
+       cd "$(TARGET_SUBDIR)/libgcc" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libgcc; \
+       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-libgcc
+
+
+
+.PHONY: configure-stage1-target-libgcc maybe-configure-stage1-target-libgcc
+maybe-configure-stage1-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-configure-stage1-target-libgcc: configure-stage1-target-libgcc
+configure-stage1-target-libgcc:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
+       @r=`${PWD_COMMAND}`; export r; \
+       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; \
+       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; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
+           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libgcc/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)/libgcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
+       cd $(TARGET_SUBDIR)/libgcc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libgcc; \
+       $(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-libgcc-bootstrap
+
+.PHONY: configure-stage2-target-libgcc maybe-configure-stage2-target-libgcc
+maybe-configure-stage2-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-configure-stage2-target-libgcc: configure-stage2-target-libgcc
+configure-stage2-target-libgcc:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
+       @r=`${PWD_COMMAND}`; export r; \
+       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; \
+       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; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
+           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libgcc/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)/libgcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
+       cd $(TARGET_SUBDIR)/libgcc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libgcc; \
+       $(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-libgcc-bootstrap
+
+.PHONY: configure-stage3-target-libgcc maybe-configure-stage3-target-libgcc
+maybe-configure-stage3-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-configure-stage3-target-libgcc: configure-stage3-target-libgcc
+configure-stage3-target-libgcc:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
+       @r=`${PWD_COMMAND}`; export r; \
+       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; \
+       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; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
+           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libgcc/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)/libgcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
+       cd $(TARGET_SUBDIR)/libgcc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libgcc; \
+       $(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-libgcc-bootstrap
+
+.PHONY: configure-stage4-target-libgcc maybe-configure-stage4-target-libgcc
+maybe-configure-stage4-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-configure-stage4-target-libgcc: configure-stage4-target-libgcc
+configure-stage4-target-libgcc:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
+       @r=`${PWD_COMMAND}`; export r; \
+       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; \
+       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; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
+           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libgcc/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)/libgcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
+       cd $(TARGET_SUBDIR)/libgcc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libgcc; \
+       $(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-libgcc-bootstrap
+
+.PHONY: configure-stageprofile-target-libgcc maybe-configure-stageprofile-target-libgcc
+maybe-configure-stageprofile-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-configure-stageprofile-target-libgcc: configure-stageprofile-target-libgcc
+configure-stageprofile-target-libgcc:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
+       @r=`${PWD_COMMAND}`; export r; \
+       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; \
+       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; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
+           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libgcc/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)/libgcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
+       cd $(TARGET_SUBDIR)/libgcc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libgcc; \
+       $(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-libgcc-bootstrap
+
+.PHONY: configure-stagefeedback-target-libgcc maybe-configure-stagefeedback-target-libgcc
+maybe-configure-stagefeedback-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-configure-stagefeedback-target-libgcc: configure-stagefeedback-target-libgcc
+configure-stagefeedback-target-libgcc:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
+       @r=`${PWD_COMMAND}`; export r; \
+       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; \
+       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; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
+           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libgcc/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)/libgcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
+       cd $(TARGET_SUBDIR)/libgcc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libgcc; \
+       $(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-libgcc-bootstrap
+
+
+
+
+
+.PHONY: all-target-libgcc maybe-all-target-libgcc
+maybe-all-target-libgcc:
+@if gcc-bootstrap
+all-target-libgcc: stage_current
+@endif gcc-bootstrap
+@if target-libgcc
+TARGET-target-libgcc=all
+maybe-all-target-libgcc: all-target-libgcc
+all-target-libgcc: configure-target-libgcc
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libgcc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libgcc))
+@endif target-libgcc
+
+
+
+.PHONY: all-stage1-target-libgcc maybe-all-stage1-target-libgcc
+.PHONY: clean-stage1-target-libgcc maybe-clean-stage1-target-libgcc
+maybe-all-stage1-target-libgcc:
+maybe-clean-stage1-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-all-stage1-target-libgcc: all-stage1-target-libgcc
+all-stage1: all-stage1-target-libgcc
+TARGET-stage1-target-libgcc = $(TARGET-target-libgcc)
+all-stage1-target-libgcc: configure-stage1-target-libgcc
+       @[ $(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)/libgcc && \
+        \
+       $(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-libgcc)
+
+maybe-clean-stage1-target-libgcc: clean-stage1-target-libgcc
+clean-stage1: clean-stage1-target-libgcc
+clean-stage1-target-libgcc:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage1-libgcc/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libgcc && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
+         clean
+@endif target-libgcc-bootstrap
+
+
+.PHONY: all-stage2-target-libgcc maybe-all-stage2-target-libgcc
+.PHONY: clean-stage2-target-libgcc maybe-clean-stage2-target-libgcc
+maybe-all-stage2-target-libgcc:
+maybe-clean-stage2-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-all-stage2-target-libgcc: all-stage2-target-libgcc
+all-stage2: all-stage2-target-libgcc
+TARGET-stage2-target-libgcc = $(TARGET-target-libgcc)
+all-stage2-target-libgcc: configure-stage2-target-libgcc
+       @[ $(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)/libgcc && \
+        \
+       $(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-libgcc)
+
+maybe-clean-stage2-target-libgcc: clean-stage2-target-libgcc
+clean-stage2: clean-stage2-target-libgcc
+clean-stage2-target-libgcc:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage2-libgcc/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libgcc && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libgcc-bootstrap
  
  
+.PHONY: all-stage3-target-libgcc maybe-all-stage3-target-libgcc
+.PHONY: clean-stage3-target-libgcc maybe-clean-stage3-target-libgcc
+maybe-all-stage3-target-libgcc:
+maybe-clean-stage3-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-all-stage3-target-libgcc: all-stage3-target-libgcc
+all-stage3: all-stage3-target-libgcc
+TARGET-stage3-target-libgcc = $(TARGET-target-libgcc)
+all-stage3-target-libgcc: configure-stage3-target-libgcc
+       @[ $(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)/libgcc && \
+        \
+       $(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-libgcc)
  
+maybe-clean-stage3-target-libgcc: clean-stage3-target-libgcc
+clean-stage3: clean-stage3-target-libgcc
+clean-stage3-target-libgcc:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage3-libgcc/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libgcc && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libgcc-bootstrap
  
  
-.PHONY: configure-target-libquadmath maybe-configure-target-libquadmath
-maybe-configure-target-libquadmath:
-@if gcc-bootstrap
-configure-target-libquadmath: stage_current
-@endif gcc-bootstrap
-@if target-libquadmath
-maybe-configure-target-libquadmath: configure-target-libquadmath
-configure-target-libquadmath: 
-       @: $(MAKE); $(unstage)
+.PHONY: all-stage4-target-libgcc maybe-all-stage4-target-libgcc
+.PHONY: clean-stage4-target-libgcc maybe-clean-stage4-target-libgcc
+maybe-all-stage4-target-libgcc:
+maybe-clean-stage4-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-all-stage4-target-libgcc: all-stage4-target-libgcc
+all-stage4: all-stage4-target-libgcc
+TARGET-stage4-target-libgcc = $(TARGET-target-libgcc)
+all-stage4-target-libgcc: configure-stage4-target-libgcc
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
         @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 ; \
-       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; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libquadmath/Makefile; \
-           mv $(TARGET_SUBDIR)/libquadmath/multilib.tmp $(TARGET_SUBDIR)/libquadmath/multilib.out; \
-         fi; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       $(NORMAL_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libgcc && \
+        \
+       $(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-libgcc)
+
+maybe-clean-stage4-target-libgcc: clean-stage4-target-libgcc
+clean-stage4: clean-stage4-target-libgcc
+clean-stage4-target-libgcc:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
         else \
-         mv $(TARGET_SUBDIR)/libquadmath/multilib.tmp $(TARGET_SUBDIR)/libquadmath/multilib.out; \
+         [ -f $(TARGET_SUBDIR)/stage4-libgcc/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
         fi; \
-       test ! -f $(TARGET_SUBDIR)/libquadmath/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libquadmath ; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libquadmath; \
-       cd "$(TARGET_SUBDIR)/libquadmath" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libquadmath/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libquadmath"; \
-       libsrcdir="$$s/libquadmath"; \
-       rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif target-libquadmath
+       cd $(TARGET_SUBDIR)/libgcc && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libgcc-bootstrap
  
  
+.PHONY: all-stageprofile-target-libgcc maybe-all-stageprofile-target-libgcc
+.PHONY: clean-stageprofile-target-libgcc maybe-clean-stageprofile-target-libgcc
+maybe-all-stageprofile-target-libgcc:
+maybe-clean-stageprofile-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-all-stageprofile-target-libgcc: all-stageprofile-target-libgcc
+all-stageprofile: all-stageprofile-target-libgcc
+TARGET-stageprofile-target-libgcc = $(TARGET-target-libgcc)
+all-stageprofile-target-libgcc: configure-stageprofile-target-libgcc
+       @[ $(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)/libgcc && \
+        \
+       $(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-libgcc)
  
+maybe-clean-stageprofile-target-libgcc: clean-stageprofile-target-libgcc
+clean-stageprofile: clean-stageprofile-target-libgcc
+clean-stageprofile-target-libgcc:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stageprofile-libgcc/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libgcc && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libgcc-bootstrap
  
  
-.PHONY: all-target-libquadmath maybe-all-target-libquadmath
-maybe-all-target-libquadmath:
-@if gcc-bootstrap
-all-target-libquadmath: stage_current
-@endif gcc-bootstrap
-@if target-libquadmath
-TARGET-target-libquadmath=all
-maybe-all-target-libquadmath: all-target-libquadmath
-all-target-libquadmath: configure-target-libquadmath
-       @: $(MAKE); $(unstage)
+.PHONY: all-stagefeedback-target-libgcc maybe-all-stagefeedback-target-libgcc
+.PHONY: clean-stagefeedback-target-libgcc maybe-clean-stagefeedback-target-libgcc
+maybe-all-stagefeedback-target-libgcc:
+maybe-clean-stagefeedback-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-all-stagefeedback-target-libgcc: all-stagefeedback-target-libgcc
+all-stagefeedback: all-stagefeedback-target-libgcc
+TARGET-stagefeedback-target-libgcc = $(TARGET-target-libgcc)
+all-stagefeedback-target-libgcc: configure-stagefeedback-target-libgcc
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libquadmath))
-@endif target-libquadmath
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       $(NORMAL_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libgcc && \
+        \
+       $(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-libgcc)
  
+maybe-clean-stagefeedback-target-libgcc: clean-stagefeedback-target-libgcc
+clean-stagefeedback: clean-stagefeedback-target-libgcc
+clean-stagefeedback-target-libgcc:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stagefeedback-libgcc/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libgcc && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libgcc-bootstrap
  
  
  
  
-.PHONY: check-target-libquadmath maybe-check-target-libquadmath
-maybe-check-target-libquadmath:
-@if target-libquadmath
-maybe-check-target-libquadmath: check-target-libquadmath
  
-check-target-libquadmath:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
-@endif target-libquadmath
+.PHONY: check-target-libgcc maybe-check-target-libgcc
+maybe-check-target-libgcc:
+@if target-libgcc
+maybe-check-target-libgcc: check-target-libgcc
  
-.PHONY: install-target-libquadmath maybe-install-target-libquadmath
-maybe-install-target-libquadmath:
-@if target-libquadmath
-maybe-install-target-libquadmath: install-target-libquadmath
+# Dummy target for uncheckable module.
+check-target-libgcc:
  
-install-target-libquadmath: installdirs
+@endif target-libgcc
+
+.PHONY: install-target-libgcc maybe-install-target-libgcc
+maybe-install-target-libgcc:
+@if target-libgcc
+maybe-install-target-libgcc: install-target-libgcc
+
+install-target-libgcc: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
-@endif target-libquadmath
+@endif target-libgcc
  
-.PHONY: install-strip-target-libquadmath maybe-install-strip-target-libquadmath
-maybe-install-strip-target-libquadmath:
-@if target-libquadmath
-maybe-install-strip-target-libquadmath: install-strip-target-libquadmath
+.PHONY: install-strip-target-libgcc maybe-install-strip-target-libgcc
+maybe-install-strip-target-libgcc:
+@if target-libgcc
+maybe-install-strip-target-libgcc: install-strip-target-libgcc
  
-install-strip-target-libquadmath: installdirs
+install-strip-target-libgcc: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
  
-@endif target-libquadmath
+@endif target-libgcc
  
  # Other targets (info, dvi, pdf, etc.)
  
-.PHONY: maybe-info-target-libquadmath info-target-libquadmath
-maybe-info-target-libquadmath:
-@if target-libquadmath
-maybe-info-target-libquadmath: info-target-libquadmath
+.PHONY: maybe-info-target-libgcc info-target-libgcc
+maybe-info-target-libgcc:
+@if target-libgcc
+maybe-info-target-libgcc: info-target-libgcc
  
-info-target-libquadmath: \
-    configure-target-libquadmath 
+info-target-libgcc: \
+    configure-target-libgcc 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/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)/libquadmath" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34826,25 +39274,25 @@ info-target-libquadmath: \
                    info) \
           || exit 1
  
-@endif target-libquadmath
+@endif target-libgcc
  
-.PHONY: maybe-dvi-target-libquadmath dvi-target-libquadmath
-maybe-dvi-target-libquadmath:
-@if target-libquadmath
-maybe-dvi-target-libquadmath: dvi-target-libquadmath
+.PHONY: maybe-dvi-target-libgcc dvi-target-libgcc
+maybe-dvi-target-libgcc:
+@if target-libgcc
+maybe-dvi-target-libgcc: dvi-target-libgcc
  
-dvi-target-libquadmath: \
-    configure-target-libquadmath 
+dvi-target-libgcc: \
+    configure-target-libgcc 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/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)/libquadmath" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34852,25 +39300,25 @@ dvi-target-libquadmath: \
                    dvi) \
           || exit 1
  
-@endif target-libquadmath
+@endif target-libgcc
  
-.PHONY: maybe-pdf-target-libquadmath pdf-target-libquadmath
-maybe-pdf-target-libquadmath:
-@if target-libquadmath
-maybe-pdf-target-libquadmath: pdf-target-libquadmath
+.PHONY: maybe-pdf-target-libgcc pdf-target-libgcc
+maybe-pdf-target-libgcc:
+@if target-libgcc
+maybe-pdf-target-libgcc: pdf-target-libgcc
  
-pdf-target-libquadmath: \
-    configure-target-libquadmath 
+pdf-target-libgcc: \
+    configure-target-libgcc 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/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)/libquadmath" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34878,25 +39326,25 @@ pdf-target-libquadmath: \
                    pdf) \
           || exit 1
  
-@endif target-libquadmath
+@endif target-libgcc
  
-.PHONY: maybe-html-target-libquadmath html-target-libquadmath
-maybe-html-target-libquadmath:
-@if target-libquadmath
-maybe-html-target-libquadmath: html-target-libquadmath
+.PHONY: maybe-html-target-libgcc html-target-libgcc
+maybe-html-target-libgcc:
+@if target-libgcc
+maybe-html-target-libgcc: html-target-libgcc
  
-html-target-libquadmath: \
-    configure-target-libquadmath 
+html-target-libgcc: \
+    configure-target-libgcc 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/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)/libquadmath" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34904,25 +39352,25 @@ html-target-libquadmath: \
                    html) \
           || exit 1
  
-@endif target-libquadmath
+@endif target-libgcc
  
-.PHONY: maybe-TAGS-target-libquadmath TAGS-target-libquadmath
-maybe-TAGS-target-libquadmath:
-@if target-libquadmath
-maybe-TAGS-target-libquadmath: TAGS-target-libquadmath
+.PHONY: maybe-TAGS-target-libgcc TAGS-target-libgcc
+maybe-TAGS-target-libgcc:
+@if target-libgcc
+maybe-TAGS-target-libgcc: TAGS-target-libgcc
  
-TAGS-target-libquadmath: \
-    configure-target-libquadmath 
+TAGS-target-libgcc: \
+    configure-target-libgcc 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/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)/libquadmath" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34930,26 +39378,26 @@ TAGS-target-libquadmath: \
                    TAGS) \
           || exit 1
  
-@endif target-libquadmath
+@endif target-libgcc
  
-.PHONY: maybe-install-info-target-libquadmath install-info-target-libquadmath
-maybe-install-info-target-libquadmath:
-@if target-libquadmath
-maybe-install-info-target-libquadmath: install-info-target-libquadmath
+.PHONY: maybe-install-info-target-libgcc install-info-target-libgcc
+maybe-install-info-target-libgcc:
+@if target-libgcc
+maybe-install-info-target-libgcc: install-info-target-libgcc
  
-install-info-target-libquadmath: \
-    configure-target-libquadmath \
-    info-target-libquadmath 
+install-info-target-libgcc: \
+    configure-target-libgcc \
+    info-target-libgcc 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/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)/libquadmath" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34957,26 +39405,26 @@ install-info-target-libquadmath: \
                    install-info) \
           || exit 1
  
-@endif target-libquadmath
+@endif target-libgcc
  
-.PHONY: maybe-install-pdf-target-libquadmath install-pdf-target-libquadmath
-maybe-install-pdf-target-libquadmath:
-@if target-libquadmath
-maybe-install-pdf-target-libquadmath: install-pdf-target-libquadmath
+.PHONY: maybe-install-pdf-target-libgcc install-pdf-target-libgcc
+maybe-install-pdf-target-libgcc:
+@if target-libgcc
+maybe-install-pdf-target-libgcc: install-pdf-target-libgcc
  
-install-pdf-target-libquadmath: \
-    configure-target-libquadmath \
-    pdf-target-libquadmath 
+install-pdf-target-libgcc: \
+    configure-target-libgcc \
+    pdf-target-libgcc 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/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)/libquadmath" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -34984,26 +39432,26 @@ install-pdf-target-libquadmath: \
                    install-pdf) \
           || exit 1
  
-@endif target-libquadmath
+@endif target-libgcc
  
-.PHONY: maybe-install-html-target-libquadmath install-html-target-libquadmath
-maybe-install-html-target-libquadmath:
-@if target-libquadmath
-maybe-install-html-target-libquadmath: install-html-target-libquadmath
+.PHONY: maybe-install-html-target-libgcc install-html-target-libgcc
+maybe-install-html-target-libgcc:
+@if target-libgcc
+maybe-install-html-target-libgcc: install-html-target-libgcc
  
-install-html-target-libquadmath: \
-    configure-target-libquadmath \
-    html-target-libquadmath 
+install-html-target-libgcc: \
+    configure-target-libgcc \
+    html-target-libgcc 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/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)/libquadmath" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35011,25 +39459,25 @@ install-html-target-libquadmath: \
                    install-html) \
           || exit 1
  
-@endif target-libquadmath
+@endif target-libgcc
  
-.PHONY: maybe-installcheck-target-libquadmath installcheck-target-libquadmath
-maybe-installcheck-target-libquadmath:
-@if target-libquadmath
-maybe-installcheck-target-libquadmath: installcheck-target-libquadmath
+.PHONY: maybe-installcheck-target-libgcc installcheck-target-libgcc
+maybe-installcheck-target-libgcc:
+@if target-libgcc
+maybe-installcheck-target-libgcc: installcheck-target-libgcc
  
-installcheck-target-libquadmath: \
-    configure-target-libquadmath 
+installcheck-target-libgcc: \
+    configure-target-libgcc 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/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)/libquadmath" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35037,24 +39485,24 @@ installcheck-target-libquadmath: \
                    installcheck) \
           || exit 1
  
-@endif target-libquadmath
+@endif target-libgcc
  
-.PHONY: maybe-mostlyclean-target-libquadmath mostlyclean-target-libquadmath
-maybe-mostlyclean-target-libquadmath:
-@if target-libquadmath
-maybe-mostlyclean-target-libquadmath: mostlyclean-target-libquadmath
+.PHONY: maybe-mostlyclean-target-libgcc mostlyclean-target-libgcc
+maybe-mostlyclean-target-libgcc:
+@if target-libgcc
+maybe-mostlyclean-target-libgcc: mostlyclean-target-libgcc
  
-mostlyclean-target-libquadmath: 
+mostlyclean-target-libgcc: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/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)/libquadmath" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35062,24 +39510,24 @@ mostlyclean-target-libquadmath:
                    mostlyclean) \
           || exit 1
  
-@endif target-libquadmath
+@endif target-libgcc
  
-.PHONY: maybe-clean-target-libquadmath clean-target-libquadmath
-maybe-clean-target-libquadmath:
-@if target-libquadmath
-maybe-clean-target-libquadmath: clean-target-libquadmath
+.PHONY: maybe-clean-target-libgcc clean-target-libgcc
+maybe-clean-target-libgcc:
+@if target-libgcc
+maybe-clean-target-libgcc: clean-target-libgcc
  
-clean-target-libquadmath: 
+clean-target-libgcc: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/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)/libquadmath" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35087,24 +39535,24 @@ clean-target-libquadmath:
                    clean) \
           || exit 1
  
-@endif target-libquadmath
+@endif target-libgcc
  
-.PHONY: maybe-distclean-target-libquadmath distclean-target-libquadmath
-maybe-distclean-target-libquadmath:
-@if target-libquadmath
-maybe-distclean-target-libquadmath: distclean-target-libquadmath
+.PHONY: maybe-distclean-target-libgcc distclean-target-libgcc
+maybe-distclean-target-libgcc:
+@if target-libgcc
+maybe-distclean-target-libgcc: distclean-target-libgcc
  
-distclean-target-libquadmath: 
+distclean-target-libgcc: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/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)/libquadmath" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35112,24 +39560,24 @@ distclean-target-libquadmath:
                    distclean) \
           || exit 1
  
-@endif target-libquadmath
+@endif target-libgcc
  
-.PHONY: maybe-maintainer-clean-target-libquadmath maintainer-clean-target-libquadmath
-maybe-maintainer-clean-target-libquadmath:
-@if target-libquadmath
-maybe-maintainer-clean-target-libquadmath: maintainer-clean-target-libquadmath
+.PHONY: maybe-maintainer-clean-target-libgcc maintainer-clean-target-libgcc
+maybe-maintainer-clean-target-libgcc:
+@if target-libgcc
+maybe-maintainer-clean-target-libgcc: maintainer-clean-target-libgcc
  
-maintainer-clean-target-libquadmath: 
+maintainer-clean-target-libgcc: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/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)/libquadmath" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35137,145 +39585,146 @@ maintainer-clean-target-libquadmath:
                    maintainer-clean) \
           || exit 1
  
-@endif target-libquadmath
+@endif target-libgcc
  
  
  
  
  
-.PHONY: configure-target-libgfortran maybe-configure-target-libgfortran
-maybe-configure-target-libgfortran:
+.PHONY: configure-target-libbacktrace maybe-configure-target-libbacktrace
+maybe-configure-target-libbacktrace:
  @if gcc-bootstrap
-configure-target-libgfortran: stage_current
+configure-target-libbacktrace: stage_current
  @endif gcc-bootstrap
-@if target-libgfortran
-maybe-configure-target-libgfortran: configure-target-libgfortran
-configure-target-libgfortran: 
+@if target-libbacktrace
+maybe-configure-target-libbacktrace: configure-target-libbacktrace
+configure-target-libbacktrace: 
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for libgfortran..."; \
-       $(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; \
+       echo "Checking multilib configuration for libbacktrace..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libbacktrace; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libbacktrace/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libbacktrace/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libbacktrace/multilib.tmp $(TARGET_SUBDIR)/libbacktrace/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libbacktrace/multilib.tmp; \
           else \
-           rm -f $(TARGET_SUBDIR)/libgfortran/Makefile; \
-           mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libbacktrace/Makefile; \
+           mv $(TARGET_SUBDIR)/libbacktrace/multilib.tmp $(TARGET_SUBDIR)/libbacktrace/multilib.out; \
           fi; \
         else \
-         mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \
+         mv $(TARGET_SUBDIR)/libbacktrace/multilib.tmp $(TARGET_SUBDIR)/libbacktrace/multilib.out; \
         fi; \
-       test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
+       test ! -f $(TARGET_SUBDIR)/libbacktrace/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libbacktrace; \
         $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libgfortran; \
-       cd "$(TARGET_SUBDIR)/libgfortran" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/libbacktrace; \
+       cd "$(TARGET_SUBDIR)/libbacktrace" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgfortran/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libbacktrace/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libgfortran"; \
-       libsrcdir="$$s/libgfortran"; \
+       module_srcdir=libbacktrace; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
-@endif target-libgfortran
+@endif target-libbacktrace
  
  
  
  
  
-.PHONY: all-target-libgfortran maybe-all-target-libgfortran
-maybe-all-target-libgfortran:
+.PHONY: all-target-libbacktrace maybe-all-target-libbacktrace
+maybe-all-target-libbacktrace:
  @if gcc-bootstrap
-all-target-libgfortran: stage_current
+all-target-libbacktrace: stage_current
  @endif gcc-bootstrap
-@if target-libgfortran
-TARGET-target-libgfortran=all
-maybe-all-target-libgfortran: all-target-libgfortran
-all-target-libgfortran: configure-target-libgfortran
+@if target-libbacktrace
+TARGET-target-libbacktrace=all
+maybe-all-target-libbacktrace: all-target-libbacktrace
+all-target-libbacktrace: configure-target-libbacktrace
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libgfortran))
-@endif target-libgfortran
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libbacktrace))
+@endif target-libbacktrace
  
  
  
  
  
-.PHONY: check-target-libgfortran maybe-check-target-libgfortran
-maybe-check-target-libgfortran:
-@if target-libgfortran
-maybe-check-target-libgfortran: check-target-libgfortran
+.PHONY: check-target-libbacktrace maybe-check-target-libbacktrace
+maybe-check-target-libbacktrace:
+@if target-libbacktrace
+maybe-check-target-libbacktrace: check-target-libbacktrace
  
-check-target-libgfortran:
+check-target-libbacktrace:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
-@endif target-libgfortran
+@endif target-libbacktrace
  
-.PHONY: install-target-libgfortran maybe-install-target-libgfortran
-maybe-install-target-libgfortran:
-@if target-libgfortran
-maybe-install-target-libgfortran: install-target-libgfortran
+.PHONY: install-target-libbacktrace maybe-install-target-libbacktrace
+maybe-install-target-libbacktrace:
+@if target-libbacktrace
+maybe-install-target-libbacktrace: install-target-libbacktrace
  
-install-target-libgfortran: installdirs
+install-target-libbacktrace: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
-@endif target-libgfortran
+@endif target-libbacktrace
  
-.PHONY: install-strip-target-libgfortran maybe-install-strip-target-libgfortran
-maybe-install-strip-target-libgfortran:
-@if target-libgfortran
-maybe-install-strip-target-libgfortran: install-strip-target-libgfortran
+.PHONY: install-strip-target-libbacktrace maybe-install-strip-target-libbacktrace
+maybe-install-strip-target-libbacktrace:
+@if target-libbacktrace
+maybe-install-strip-target-libbacktrace: install-strip-target-libbacktrace
  
-install-strip-target-libgfortran: installdirs
+install-strip-target-libbacktrace: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
  
-@endif target-libgfortran
-
-# Other targets (info, dvi, pdf, etc.)
+@endif target-libbacktrace
  
-.PHONY: maybe-info-target-libgfortran info-target-libgfortran
-maybe-info-target-libgfortran:
-@if target-libgfortran
-maybe-info-target-libgfortran: info-target-libgfortran
+# Other targets (info, dvi, pdf, etc.)
  
-info-target-libgfortran: \
-    configure-target-libgfortran 
+.PHONY: maybe-info-target-libbacktrace info-target-libbacktrace
+maybe-info-target-libbacktrace:
+@if target-libbacktrace
+maybe-info-target-libbacktrace: info-target-libbacktrace
+
+info-target-libbacktrace: \
+    configure-target-libbacktrace 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libbacktrace"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35283,25 +39732,25 @@ info-target-libgfortran: \
                    info) \
           || exit 1
  
-@endif target-libgfortran
+@endif target-libbacktrace
  
-.PHONY: maybe-dvi-target-libgfortran dvi-target-libgfortran
-maybe-dvi-target-libgfortran:
-@if target-libgfortran
-maybe-dvi-target-libgfortran: dvi-target-libgfortran
+.PHONY: maybe-dvi-target-libbacktrace dvi-target-libbacktrace
+maybe-dvi-target-libbacktrace:
+@if target-libbacktrace
+maybe-dvi-target-libbacktrace: dvi-target-libbacktrace
  
-dvi-target-libgfortran: \
-    configure-target-libgfortran 
+dvi-target-libbacktrace: \
+    configure-target-libbacktrace 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libbacktrace"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35309,25 +39758,25 @@ dvi-target-libgfortran: \
                    dvi) \
           || exit 1
  
-@endif target-libgfortran
+@endif target-libbacktrace
  
-.PHONY: maybe-pdf-target-libgfortran pdf-target-libgfortran
-maybe-pdf-target-libgfortran:
-@if target-libgfortran
-maybe-pdf-target-libgfortran: pdf-target-libgfortran
+.PHONY: maybe-pdf-target-libbacktrace pdf-target-libbacktrace
+maybe-pdf-target-libbacktrace:
+@if target-libbacktrace
+maybe-pdf-target-libbacktrace: pdf-target-libbacktrace
  
-pdf-target-libgfortran: \
-    configure-target-libgfortran 
+pdf-target-libbacktrace: \
+    configure-target-libbacktrace 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libbacktrace"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35335,25 +39784,25 @@ pdf-target-libgfortran: \
                    pdf) \
           || exit 1
  
-@endif target-libgfortran
+@endif target-libbacktrace
  
-.PHONY: maybe-html-target-libgfortran html-target-libgfortran
-maybe-html-target-libgfortran:
-@if target-libgfortran
-maybe-html-target-libgfortran: html-target-libgfortran
+.PHONY: maybe-html-target-libbacktrace html-target-libbacktrace
+maybe-html-target-libbacktrace:
+@if target-libbacktrace
+maybe-html-target-libbacktrace: html-target-libbacktrace
  
-html-target-libgfortran: \
-    configure-target-libgfortran 
+html-target-libbacktrace: \
+    configure-target-libbacktrace 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libbacktrace"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35361,25 +39810,25 @@ html-target-libgfortran: \
                    html) \
           || exit 1
  
-@endif target-libgfortran
+@endif target-libbacktrace
  
-.PHONY: maybe-TAGS-target-libgfortran TAGS-target-libgfortran
-maybe-TAGS-target-libgfortran:
-@if target-libgfortran
-maybe-TAGS-target-libgfortran: TAGS-target-libgfortran
+.PHONY: maybe-TAGS-target-libbacktrace TAGS-target-libbacktrace
+maybe-TAGS-target-libbacktrace:
+@if target-libbacktrace
+maybe-TAGS-target-libbacktrace: TAGS-target-libbacktrace
  
-TAGS-target-libgfortran: \
-    configure-target-libgfortran 
+TAGS-target-libbacktrace: \
+    configure-target-libbacktrace 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libbacktrace"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35387,26 +39836,26 @@ TAGS-target-libgfortran: \
                    TAGS) \
           || exit 1
  
-@endif target-libgfortran
+@endif target-libbacktrace
  
-.PHONY: maybe-install-info-target-libgfortran install-info-target-libgfortran
-maybe-install-info-target-libgfortran:
-@if target-libgfortran
-maybe-install-info-target-libgfortran: install-info-target-libgfortran
+.PHONY: maybe-install-info-target-libbacktrace install-info-target-libbacktrace
+maybe-install-info-target-libbacktrace:
+@if target-libbacktrace
+maybe-install-info-target-libbacktrace: install-info-target-libbacktrace
  
-install-info-target-libgfortran: \
-    configure-target-libgfortran \
-    info-target-libgfortran 
+install-info-target-libbacktrace: \
+    configure-target-libbacktrace \
+    info-target-libbacktrace 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libbacktrace"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35414,26 +39863,26 @@ install-info-target-libgfortran: \
                    install-info) \
           || exit 1
  
-@endif target-libgfortran
+@endif target-libbacktrace
  
-.PHONY: maybe-install-pdf-target-libgfortran install-pdf-target-libgfortran
-maybe-install-pdf-target-libgfortran:
-@if target-libgfortran
-maybe-install-pdf-target-libgfortran: install-pdf-target-libgfortran
+.PHONY: maybe-install-pdf-target-libbacktrace install-pdf-target-libbacktrace
+maybe-install-pdf-target-libbacktrace:
+@if target-libbacktrace
+maybe-install-pdf-target-libbacktrace: install-pdf-target-libbacktrace
  
-install-pdf-target-libgfortran: \
-    configure-target-libgfortran \
-    pdf-target-libgfortran 
+install-pdf-target-libbacktrace: \
+    configure-target-libbacktrace \
+    pdf-target-libbacktrace 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libbacktrace"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35441,26 +39890,26 @@ install-pdf-target-libgfortran: \
                    install-pdf) \
           || exit 1
  
-@endif target-libgfortran
+@endif target-libbacktrace
  
-.PHONY: maybe-install-html-target-libgfortran install-html-target-libgfortran
-maybe-install-html-target-libgfortran:
-@if target-libgfortran
-maybe-install-html-target-libgfortran: install-html-target-libgfortran
+.PHONY: maybe-install-html-target-libbacktrace install-html-target-libbacktrace
+maybe-install-html-target-libbacktrace:
+@if target-libbacktrace
+maybe-install-html-target-libbacktrace: install-html-target-libbacktrace
  
-install-html-target-libgfortran: \
-    configure-target-libgfortran \
-    html-target-libgfortran 
+install-html-target-libbacktrace: \
+    configure-target-libbacktrace \
+    html-target-libbacktrace 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libbacktrace"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35468,25 +39917,25 @@ install-html-target-libgfortran: \
                    install-html) \
           || exit 1
  
-@endif target-libgfortran
+@endif target-libbacktrace
  
-.PHONY: maybe-installcheck-target-libgfortran installcheck-target-libgfortran
-maybe-installcheck-target-libgfortran:
-@if target-libgfortran
-maybe-installcheck-target-libgfortran: installcheck-target-libgfortran
+.PHONY: maybe-installcheck-target-libbacktrace installcheck-target-libbacktrace
+maybe-installcheck-target-libbacktrace:
+@if target-libbacktrace
+maybe-installcheck-target-libbacktrace: installcheck-target-libbacktrace
  
-installcheck-target-libgfortran: \
-    configure-target-libgfortran 
+installcheck-target-libbacktrace: \
+    configure-target-libbacktrace 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libbacktrace"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35494,24 +39943,24 @@ installcheck-target-libgfortran: \
                    installcheck) \
           || exit 1
  
-@endif target-libgfortran
+@endif target-libbacktrace
  
-.PHONY: maybe-mostlyclean-target-libgfortran mostlyclean-target-libgfortran
-maybe-mostlyclean-target-libgfortran:
-@if target-libgfortran
-maybe-mostlyclean-target-libgfortran: mostlyclean-target-libgfortran
+.PHONY: maybe-mostlyclean-target-libbacktrace mostlyclean-target-libbacktrace
+maybe-mostlyclean-target-libbacktrace:
+@if target-libbacktrace
+maybe-mostlyclean-target-libbacktrace: mostlyclean-target-libbacktrace
  
-mostlyclean-target-libgfortran: 
+mostlyclean-target-libbacktrace: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libbacktrace"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35519,24 +39968,24 @@ mostlyclean-target-libgfortran:
                    mostlyclean) \
           || exit 1
  
-@endif target-libgfortran
+@endif target-libbacktrace
  
-.PHONY: maybe-clean-target-libgfortran clean-target-libgfortran
-maybe-clean-target-libgfortran:
-@if target-libgfortran
-maybe-clean-target-libgfortran: clean-target-libgfortran
+.PHONY: maybe-clean-target-libbacktrace clean-target-libbacktrace
+maybe-clean-target-libbacktrace:
+@if target-libbacktrace
+maybe-clean-target-libbacktrace: clean-target-libbacktrace
  
-clean-target-libgfortran: 
+clean-target-libbacktrace: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libbacktrace"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35544,24 +39993,24 @@ clean-target-libgfortran:
                    clean) \
           || exit 1
  
-@endif target-libgfortran
+@endif target-libbacktrace
  
-.PHONY: maybe-distclean-target-libgfortran distclean-target-libgfortran
-maybe-distclean-target-libgfortran:
-@if target-libgfortran
-maybe-distclean-target-libgfortran: distclean-target-libgfortran
+.PHONY: maybe-distclean-target-libbacktrace distclean-target-libbacktrace
+maybe-distclean-target-libbacktrace:
+@if target-libbacktrace
+maybe-distclean-target-libbacktrace: distclean-target-libbacktrace
  
-distclean-target-libgfortran: 
+distclean-target-libbacktrace: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libbacktrace"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35569,24 +40018,24 @@ distclean-target-libgfortran:
                    distclean) \
           || exit 1
  
-@endif target-libgfortran
+@endif target-libbacktrace
  
-.PHONY: maybe-maintainer-clean-target-libgfortran maintainer-clean-target-libgfortran
-maybe-maintainer-clean-target-libgfortran:
-@if target-libgfortran
-maybe-maintainer-clean-target-libgfortran: maintainer-clean-target-libgfortran
+.PHONY: maybe-maintainer-clean-target-libbacktrace maintainer-clean-target-libbacktrace
+maybe-maintainer-clean-target-libbacktrace:
+@if target-libbacktrace
+maybe-maintainer-clean-target-libbacktrace: maintainer-clean-target-libbacktrace
  
-maintainer-clean-target-libgfortran: 
+maintainer-clean-target-libbacktrace: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libbacktrace"; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35594,145 +40043,146 @@ maintainer-clean-target-libgfortran:
                    maintainer-clean) \
           || exit 1
  
-@endif target-libgfortran
+@endif target-libbacktrace
  
  
  
  
  
-.PHONY: configure-target-libobjc maybe-configure-target-libobjc
-maybe-configure-target-libobjc:
+.PHONY: configure-target-libquadmath maybe-configure-target-libquadmath
+maybe-configure-target-libquadmath:
  @if gcc-bootstrap
-configure-target-libobjc: stage_current
+configure-target-libquadmath: stage_current
  @endif gcc-bootstrap
-@if target-libobjc
-maybe-configure-target-libobjc: configure-target-libobjc
-configure-target-libobjc: 
+@if target-libquadmath
+maybe-configure-target-libquadmath: configure-target-libquadmath
+configure-target-libquadmath: 
         @: $(MAKE); $(unstage)
         @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 ; \
-       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; \
+       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; \
+       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; \
           else \
-           rm -f $(TARGET_SUBDIR)/libobjc/Makefile; \
-           mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libquadmath/Makefile; \
+           mv $(TARGET_SUBDIR)/libquadmath/multilib.tmp $(TARGET_SUBDIR)/libquadmath/multilib.out; \
           fi; \
         else \
-         mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \
+         mv $(TARGET_SUBDIR)/libquadmath/multilib.tmp $(TARGET_SUBDIR)/libquadmath/multilib.out; \
         fi; \
-       test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
+       test ! -f $(TARGET_SUBDIR)/libquadmath/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libquadmath; \
         $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libobjc; \
-       cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/libquadmath; \
+       cd "$(TARGET_SUBDIR)/libquadmath" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libobjc/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libquadmath/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libobjc"; \
-       libsrcdir="$$s/libobjc"; \
+       module_srcdir=libquadmath; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
-@endif target-libobjc
+@endif target-libquadmath
  
  
  
  
  
-.PHONY: all-target-libobjc maybe-all-target-libobjc
-maybe-all-target-libobjc:
+.PHONY: all-target-libquadmath maybe-all-target-libquadmath
+maybe-all-target-libquadmath:
  @if gcc-bootstrap
-all-target-libobjc: stage_current
+all-target-libquadmath: stage_current
  @endif gcc-bootstrap
-@if target-libobjc
-TARGET-target-libobjc=all
-maybe-all-target-libobjc: all-target-libobjc
-all-target-libobjc: configure-target-libobjc
+@if target-libquadmath
+TARGET-target-libquadmath=all
+maybe-all-target-libquadmath: all-target-libquadmath
+all-target-libquadmath: configure-target-libquadmath
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libobjc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libobjc))
-@endif target-libobjc
+       (cd $(TARGET_SUBDIR)/libquadmath && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libquadmath))
+@endif target-libquadmath
  
  
  
  
  
-.PHONY: check-target-libobjc maybe-check-target-libobjc
-maybe-check-target-libobjc:
-@if target-libobjc
-maybe-check-target-libobjc: check-target-libobjc
+.PHONY: check-target-libquadmath maybe-check-target-libquadmath
+maybe-check-target-libquadmath:
+@if target-libquadmath
+maybe-check-target-libquadmath: check-target-libquadmath
  
-check-target-libobjc:
+check-target-libquadmath:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libobjc && \
+       (cd $(TARGET_SUBDIR)/libquadmath && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
-@endif target-libobjc
+@endif target-libquadmath
  
-.PHONY: install-target-libobjc maybe-install-target-libobjc
-maybe-install-target-libobjc:
-@if target-libobjc
-maybe-install-target-libobjc: install-target-libobjc
+.PHONY: install-target-libquadmath maybe-install-target-libquadmath
+maybe-install-target-libquadmath:
+@if target-libquadmath
+maybe-install-target-libquadmath: install-target-libquadmath
  
-install-target-libobjc: installdirs
+install-target-libquadmath: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libobjc && \
+       (cd $(TARGET_SUBDIR)/libquadmath && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
-@endif target-libobjc
+@endif target-libquadmath
  
-.PHONY: install-strip-target-libobjc maybe-install-strip-target-libobjc
-maybe-install-strip-target-libobjc:
-@if target-libobjc
-maybe-install-strip-target-libobjc: install-strip-target-libobjc
+.PHONY: install-strip-target-libquadmath maybe-install-strip-target-libquadmath
+maybe-install-strip-target-libquadmath:
+@if target-libquadmath
+maybe-install-strip-target-libquadmath: install-strip-target-libquadmath
  
-install-strip-target-libobjc: installdirs
+install-strip-target-libquadmath: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libobjc && \
+       (cd $(TARGET_SUBDIR)/libquadmath && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
  
-@endif target-libobjc
+@endif target-libquadmath
  
  # Other targets (info, dvi, pdf, etc.)
  
-.PHONY: maybe-info-target-libobjc info-target-libobjc
-maybe-info-target-libobjc:
-@if target-libobjc
-maybe-info-target-libobjc: info-target-libobjc
+.PHONY: maybe-info-target-libquadmath info-target-libquadmath
+maybe-info-target-libquadmath:
+@if target-libquadmath
+maybe-info-target-libquadmath: info-target-libquadmath
  
-info-target-libobjc: \
-    configure-target-libobjc 
+info-target-libquadmath: \
+    configure-target-libquadmath 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/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)/libobjc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libobjc && \
+       (cd $(TARGET_SUBDIR)/libquadmath && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35740,25 +40190,25 @@ info-target-libobjc: \
                    info) \
           || exit 1
  
-@endif target-libobjc
+@endif target-libquadmath
  
-.PHONY: maybe-dvi-target-libobjc dvi-target-libobjc
-maybe-dvi-target-libobjc:
-@if target-libobjc
-maybe-dvi-target-libobjc: dvi-target-libobjc
+.PHONY: maybe-dvi-target-libquadmath dvi-target-libquadmath
+maybe-dvi-target-libquadmath:
+@if target-libquadmath
+maybe-dvi-target-libquadmath: dvi-target-libquadmath
  
-dvi-target-libobjc: \
-    configure-target-libobjc 
+dvi-target-libquadmath: \
+    configure-target-libquadmath 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/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)/libobjc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libobjc && \
+       (cd $(TARGET_SUBDIR)/libquadmath && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35766,25 +40216,25 @@ dvi-target-libobjc: \
                    dvi) \
           || exit 1
  
-@endif target-libobjc
+@endif target-libquadmath
  
-.PHONY: maybe-pdf-target-libobjc pdf-target-libobjc
-maybe-pdf-target-libobjc:
-@if target-libobjc
-maybe-pdf-target-libobjc: pdf-target-libobjc
+.PHONY: maybe-pdf-target-libquadmath pdf-target-libquadmath
+maybe-pdf-target-libquadmath:
+@if target-libquadmath
+maybe-pdf-target-libquadmath: pdf-target-libquadmath
  
-pdf-target-libobjc: \
-    configure-target-libobjc 
+pdf-target-libquadmath: \
+    configure-target-libquadmath 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/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)/libobjc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libobjc && \
+       (cd $(TARGET_SUBDIR)/libquadmath && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35792,25 +40242,25 @@ pdf-target-libobjc: \
                    pdf) \
           || exit 1
  
-@endif target-libobjc
+@endif target-libquadmath
  
-.PHONY: maybe-html-target-libobjc html-target-libobjc
-maybe-html-target-libobjc:
-@if target-libobjc
-maybe-html-target-libobjc: html-target-libobjc
+.PHONY: maybe-html-target-libquadmath html-target-libquadmath
+maybe-html-target-libquadmath:
+@if target-libquadmath
+maybe-html-target-libquadmath: html-target-libquadmath
  
-html-target-libobjc: \
-    configure-target-libobjc 
+html-target-libquadmath: \
+    configure-target-libquadmath 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/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)/libobjc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libobjc && \
+       (cd $(TARGET_SUBDIR)/libquadmath && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35818,25 +40268,25 @@ html-target-libobjc: \
                    html) \
           || exit 1
  
-@endif target-libobjc
+@endif target-libquadmath
  
-.PHONY: maybe-TAGS-target-libobjc TAGS-target-libobjc
-maybe-TAGS-target-libobjc:
-@if target-libobjc
-maybe-TAGS-target-libobjc: TAGS-target-libobjc
+.PHONY: maybe-TAGS-target-libquadmath TAGS-target-libquadmath
+maybe-TAGS-target-libquadmath:
+@if target-libquadmath
+maybe-TAGS-target-libquadmath: TAGS-target-libquadmath
  
-TAGS-target-libobjc: \
-    configure-target-libobjc 
+TAGS-target-libquadmath: \
+    configure-target-libquadmath 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/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)/libobjc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libobjc && \
+       (cd $(TARGET_SUBDIR)/libquadmath && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35844,26 +40294,26 @@ TAGS-target-libobjc: \
                    TAGS) \
           || exit 1
  
-@endif target-libobjc
+@endif target-libquadmath
  
-.PHONY: maybe-install-info-target-libobjc install-info-target-libobjc
-maybe-install-info-target-libobjc:
-@if target-libobjc
-maybe-install-info-target-libobjc: install-info-target-libobjc
+.PHONY: maybe-install-info-target-libquadmath install-info-target-libquadmath
+maybe-install-info-target-libquadmath:
+@if target-libquadmath
+maybe-install-info-target-libquadmath: install-info-target-libquadmath
  
-install-info-target-libobjc: \
-    configure-target-libobjc \
-    info-target-libobjc 
+install-info-target-libquadmath: \
+    configure-target-libquadmath \
+    info-target-libquadmath 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/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)/libobjc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libobjc && \
+       (cd $(TARGET_SUBDIR)/libquadmath && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35871,26 +40321,26 @@ install-info-target-libobjc: \
                    install-info) \
           || exit 1
  
-@endif target-libobjc
+@endif target-libquadmath
  
-.PHONY: maybe-install-pdf-target-libobjc install-pdf-target-libobjc
-maybe-install-pdf-target-libobjc:
-@if target-libobjc
-maybe-install-pdf-target-libobjc: install-pdf-target-libobjc
+.PHONY: maybe-install-pdf-target-libquadmath install-pdf-target-libquadmath
+maybe-install-pdf-target-libquadmath:
+@if target-libquadmath
+maybe-install-pdf-target-libquadmath: install-pdf-target-libquadmath
  
-install-pdf-target-libobjc: \
-    configure-target-libobjc \
-    pdf-target-libobjc 
+install-pdf-target-libquadmath: \
+    configure-target-libquadmath \
+    pdf-target-libquadmath 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/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)/libobjc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libobjc && \
+       (cd $(TARGET_SUBDIR)/libquadmath && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35898,26 +40348,26 @@ install-pdf-target-libobjc: \
                    install-pdf) \
           || exit 1
  
-@endif target-libobjc
+@endif target-libquadmath
  
-.PHONY: maybe-install-html-target-libobjc install-html-target-libobjc
-maybe-install-html-target-libobjc:
-@if target-libobjc
-maybe-install-html-target-libobjc: install-html-target-libobjc
+.PHONY: maybe-install-html-target-libquadmath install-html-target-libquadmath
+maybe-install-html-target-libquadmath:
+@if target-libquadmath
+maybe-install-html-target-libquadmath: install-html-target-libquadmath
  
-install-html-target-libobjc: \
-    configure-target-libobjc \
-    html-target-libobjc 
+install-html-target-libquadmath: \
+    configure-target-libquadmath \
+    html-target-libquadmath 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/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)/libobjc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libobjc && \
+       (cd $(TARGET_SUBDIR)/libquadmath && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35925,25 +40375,25 @@ install-html-target-libobjc: \
                    install-html) \
           || exit 1
  
-@endif target-libobjc
+@endif target-libquadmath
  
-.PHONY: maybe-installcheck-target-libobjc installcheck-target-libobjc
-maybe-installcheck-target-libobjc:
-@if target-libobjc
-maybe-installcheck-target-libobjc: installcheck-target-libobjc
+.PHONY: maybe-installcheck-target-libquadmath installcheck-target-libquadmath
+maybe-installcheck-target-libquadmath:
+@if target-libquadmath
+maybe-installcheck-target-libquadmath: installcheck-target-libquadmath
  
-installcheck-target-libobjc: \
-    configure-target-libobjc 
+installcheck-target-libquadmath: \
+    configure-target-libquadmath 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/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)/libobjc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libobjc && \
+       (cd $(TARGET_SUBDIR)/libquadmath && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35951,24 +40401,24 @@ installcheck-target-libobjc: \
                    installcheck) \
           || exit 1
  
-@endif target-libobjc
+@endif target-libquadmath
  
-.PHONY: maybe-mostlyclean-target-libobjc mostlyclean-target-libobjc
-maybe-mostlyclean-target-libobjc:
-@if target-libobjc
-maybe-mostlyclean-target-libobjc: mostlyclean-target-libobjc
+.PHONY: maybe-mostlyclean-target-libquadmath mostlyclean-target-libquadmath
+maybe-mostlyclean-target-libquadmath:
+@if target-libquadmath
+maybe-mostlyclean-target-libquadmath: mostlyclean-target-libquadmath
  
-mostlyclean-target-libobjc: 
+mostlyclean-target-libquadmath: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/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)/libobjc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libobjc && \
+       (cd $(TARGET_SUBDIR)/libquadmath && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -35976,24 +40426,24 @@ mostlyclean-target-libobjc:
                    mostlyclean) \
           || exit 1
  
-@endif target-libobjc
+@endif target-libquadmath
  
-.PHONY: maybe-clean-target-libobjc clean-target-libobjc
-maybe-clean-target-libobjc:
-@if target-libobjc
-maybe-clean-target-libobjc: clean-target-libobjc
+.PHONY: maybe-clean-target-libquadmath clean-target-libquadmath
+maybe-clean-target-libquadmath:
+@if target-libquadmath
+maybe-clean-target-libquadmath: clean-target-libquadmath
  
-clean-target-libobjc: 
+clean-target-libquadmath: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/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)/libobjc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libobjc && \
+       (cd $(TARGET_SUBDIR)/libquadmath && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -36001,24 +40451,24 @@ clean-target-libobjc:
                    clean) \
           || exit 1
  
-@endif target-libobjc
+@endif target-libquadmath
  
-.PHONY: maybe-distclean-target-libobjc distclean-target-libobjc
-maybe-distclean-target-libobjc:
-@if target-libobjc
-maybe-distclean-target-libobjc: distclean-target-libobjc
+.PHONY: maybe-distclean-target-libquadmath distclean-target-libquadmath
+maybe-distclean-target-libquadmath:
+@if target-libquadmath
+maybe-distclean-target-libquadmath: distclean-target-libquadmath
  
-distclean-target-libobjc: 
+distclean-target-libquadmath: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/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)/libobjc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libobjc && \
+       (cd $(TARGET_SUBDIR)/libquadmath && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -36026,24 +40476,24 @@ distclean-target-libobjc:
                    distclean) \
           || exit 1
  
-@endif target-libobjc
+@endif target-libquadmath
  
-.PHONY: maybe-maintainer-clean-target-libobjc maintainer-clean-target-libobjc
-maybe-maintainer-clean-target-libobjc:
-@if target-libobjc
-maybe-maintainer-clean-target-libobjc: maintainer-clean-target-libobjc
+.PHONY: maybe-maintainer-clean-target-libquadmath maintainer-clean-target-libquadmath
+maybe-maintainer-clean-target-libquadmath:
+@if target-libquadmath
+maybe-maintainer-clean-target-libquadmath: maintainer-clean-target-libquadmath
  
-maintainer-clean-target-libobjc: 
+maintainer-clean-target-libquadmath: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/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)/libobjc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libobjc && \
+       (cd $(TARGET_SUBDIR)/libquadmath && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -36051,145 +40501,146 @@ maintainer-clean-target-libobjc:
                    maintainer-clean) \
           || exit 1
  
-@endif target-libobjc
+@endif target-libquadmath
  
  
  
  
  
-.PHONY: configure-target-libgo maybe-configure-target-libgo
-maybe-configure-target-libgo:
+.PHONY: configure-target-libgfortran maybe-configure-target-libgfortran
+maybe-configure-target-libgfortran:
  @if gcc-bootstrap
-configure-target-libgo: stage_current
+configure-target-libgfortran: stage_current
  @endif gcc-bootstrap
-@if target-libgo
-maybe-configure-target-libgo: configure-target-libgo
-configure-target-libgo: 
+@if target-libgfortran
+maybe-configure-target-libgfortran: configure-target-libgfortran
+configure-target-libgfortran: 
         @: $(MAKE); $(unstage)
         @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 ; \
-       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; \
+       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; \
+       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; \
           else \
-           rm -f $(TARGET_SUBDIR)/libgo/Makefile; \
-           mv $(TARGET_SUBDIR)/libgo/multilib.tmp $(TARGET_SUBDIR)/libgo/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libgfortran/Makefile; \
+           mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \
           fi; \
         else \
-         mv $(TARGET_SUBDIR)/libgo/multilib.tmp $(TARGET_SUBDIR)/libgo/multilib.out; \
+         mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \
         fi; \
-       test ! -f $(TARGET_SUBDIR)/libgo/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgo ; \
+       test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran; \
         $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libgo; \
-       cd "$(TARGET_SUBDIR)/libgo" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/libgfortran; \
+       cd "$(TARGET_SUBDIR)/libgfortran" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgo/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libgfortran/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libgo"; \
-       libsrcdir="$$s/libgo"; \
+       module_srcdir=libgfortran; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
-@endif target-libgo
+@endif target-libgfortran
  
  
  
  
  
-.PHONY: all-target-libgo maybe-all-target-libgo
-maybe-all-target-libgo:
+.PHONY: all-target-libgfortran maybe-all-target-libgfortran
+maybe-all-target-libgfortran:
  @if gcc-bootstrap
-all-target-libgo: stage_current
+all-target-libgfortran: stage_current
  @endif gcc-bootstrap
-@if target-libgo
-TARGET-target-libgo=all
-maybe-all-target-libgo: all-target-libgo
-all-target-libgo: configure-target-libgo
+@if target-libgfortran
+TARGET-target-libgfortran=all
+maybe-all-target-libgfortran: all-target-libgfortran
+all-target-libgfortran: configure-target-libgfortran
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libgo && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libgo))
-@endif target-libgo
+       (cd $(TARGET_SUBDIR)/libgfortran && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libgfortran))
+@endif target-libgfortran
  
  
  
  
  
-.PHONY: check-target-libgo maybe-check-target-libgo
-maybe-check-target-libgo:
-@if target-libgo
-maybe-check-target-libgo: check-target-libgo
+.PHONY: check-target-libgfortran maybe-check-target-libgfortran
+maybe-check-target-libgfortran:
+@if target-libgfortran
+maybe-check-target-libgfortran: check-target-libgfortran
  
-check-target-libgo:
+check-target-libgfortran:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
-@endif target-libgo
+@endif target-libgfortran
  
-.PHONY: install-target-libgo maybe-install-target-libgo
-maybe-install-target-libgo:
-@if target-libgo
-maybe-install-target-libgo: install-target-libgo
+.PHONY: install-target-libgfortran maybe-install-target-libgfortran
+maybe-install-target-libgfortran:
+@if target-libgfortran
+maybe-install-target-libgfortran: install-target-libgfortran
  
-install-target-libgo: installdirs
+install-target-libgfortran: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
-@endif target-libgo
+@endif target-libgfortran
  
-.PHONY: install-strip-target-libgo maybe-install-strip-target-libgo
-maybe-install-strip-target-libgo:
-@if target-libgo
-maybe-install-strip-target-libgo: install-strip-target-libgo
+.PHONY: install-strip-target-libgfortran maybe-install-strip-target-libgfortran
+maybe-install-strip-target-libgfortran:
+@if target-libgfortran
+maybe-install-strip-target-libgfortran: install-strip-target-libgfortran
  
-install-strip-target-libgo: installdirs
+install-strip-target-libgfortran: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
  
-@endif target-libgo
+@endif target-libgfortran
  
  # Other targets (info, dvi, pdf, etc.)
  
-.PHONY: maybe-info-target-libgo info-target-libgo
-maybe-info-target-libgo:
-@if target-libgo
-maybe-info-target-libgo: info-target-libgo
+.PHONY: maybe-info-target-libgfortran info-target-libgfortran
+maybe-info-target-libgfortran:
+@if target-libgfortran
+maybe-info-target-libgfortran: info-target-libgfortran
  
-info-target-libgo: \
-    configure-target-libgo 
+info-target-libgfortran: \
+    configure-target-libgfortran 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/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)/libgo" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -36197,25 +40648,25 @@ info-target-libgo: \
                    info) \
           || exit 1
  
-@endif target-libgo
+@endif target-libgfortran
  
-.PHONY: maybe-dvi-target-libgo dvi-target-libgo
-maybe-dvi-target-libgo:
-@if target-libgo
-maybe-dvi-target-libgo: dvi-target-libgo
+.PHONY: maybe-dvi-target-libgfortran dvi-target-libgfortran
+maybe-dvi-target-libgfortran:
+@if target-libgfortran
+maybe-dvi-target-libgfortran: dvi-target-libgfortran
  
-dvi-target-libgo: \
-    configure-target-libgo 
+dvi-target-libgfortran: \
+    configure-target-libgfortran 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/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)/libgo" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -36223,25 +40674,25 @@ dvi-target-libgo: \
                    dvi) \
           || exit 1
  
-@endif target-libgo
+@endif target-libgfortran
  
-.PHONY: maybe-pdf-target-libgo pdf-target-libgo
-maybe-pdf-target-libgo:
-@if target-libgo
-maybe-pdf-target-libgo: pdf-target-libgo
+.PHONY: maybe-pdf-target-libgfortran pdf-target-libgfortran
+maybe-pdf-target-libgfortran:
+@if target-libgfortran
+maybe-pdf-target-libgfortran: pdf-target-libgfortran
  
-pdf-target-libgo: \
-    configure-target-libgo 
+pdf-target-libgfortran: \
+    configure-target-libgfortran 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/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)/libgo" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -36249,25 +40700,25 @@ pdf-target-libgo: \
                    pdf) \
           || exit 1
  
-@endif target-libgo
+@endif target-libgfortran
  
-.PHONY: maybe-html-target-libgo html-target-libgo
-maybe-html-target-libgo:
-@if target-libgo
-maybe-html-target-libgo: html-target-libgo
+.PHONY: maybe-html-target-libgfortran html-target-libgfortran
+maybe-html-target-libgfortran:
+@if target-libgfortran
+maybe-html-target-libgfortran: html-target-libgfortran
  
-html-target-libgo: \
-    configure-target-libgo 
+html-target-libgfortran: \
+    configure-target-libgfortran 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/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)/libgo" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -36275,25 +40726,25 @@ html-target-libgo: \
                    html) \
           || exit 1
  
-@endif target-libgo
+@endif target-libgfortran
  
-.PHONY: maybe-TAGS-target-libgo TAGS-target-libgo
-maybe-TAGS-target-libgo:
-@if target-libgo
-maybe-TAGS-target-libgo: TAGS-target-libgo
+.PHONY: maybe-TAGS-target-libgfortran TAGS-target-libgfortran
+maybe-TAGS-target-libgfortran:
+@if target-libgfortran
+maybe-TAGS-target-libgfortran: TAGS-target-libgfortran
  
-TAGS-target-libgo: \
-    configure-target-libgo 
+TAGS-target-libgfortran: \
+    configure-target-libgfortran 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/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)/libgo" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -36301,26 +40752,26 @@ TAGS-target-libgo: \
                    TAGS) \
           || exit 1
  
-@endif target-libgo
+@endif target-libgfortran
  
-.PHONY: maybe-install-info-target-libgo install-info-target-libgo
-maybe-install-info-target-libgo:
-@if target-libgo
-maybe-install-info-target-libgo: install-info-target-libgo
+.PHONY: maybe-install-info-target-libgfortran install-info-target-libgfortran
+maybe-install-info-target-libgfortran:
+@if target-libgfortran
+maybe-install-info-target-libgfortran: install-info-target-libgfortran
  
-install-info-target-libgo: \
-    configure-target-libgo \
-    info-target-libgo 
+install-info-target-libgfortran: \
+    configure-target-libgfortran \
+    info-target-libgfortran 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/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)/libgo" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -36328,26 +40779,26 @@ install-info-target-libgo: \
                    install-info) \
           || exit 1
  
-@endif target-libgo
+@endif target-libgfortran
  
-.PHONY: maybe-install-pdf-target-libgo install-pdf-target-libgo
-maybe-install-pdf-target-libgo:
-@if target-libgo
-maybe-install-pdf-target-libgo: install-pdf-target-libgo
+.PHONY: maybe-install-pdf-target-libgfortran install-pdf-target-libgfortran
+maybe-install-pdf-target-libgfortran:
+@if target-libgfortran
+maybe-install-pdf-target-libgfortran: install-pdf-target-libgfortran
  
-install-pdf-target-libgo: \
-    configure-target-libgo \
-    pdf-target-libgo 
+install-pdf-target-libgfortran: \
+    configure-target-libgfortran \
+    pdf-target-libgfortran 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/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)/libgo" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -36355,26 +40806,26 @@ install-pdf-target-libgo: \
                    install-pdf) \
           || exit 1
  
-@endif target-libgo
+@endif target-libgfortran
  
-.PHONY: maybe-install-html-target-libgo install-html-target-libgo
-maybe-install-html-target-libgo:
-@if target-libgo
-maybe-install-html-target-libgo: install-html-target-libgo
+.PHONY: maybe-install-html-target-libgfortran install-html-target-libgfortran
+maybe-install-html-target-libgfortran:
+@if target-libgfortran
+maybe-install-html-target-libgfortran: install-html-target-libgfortran
  
-install-html-target-libgo: \
-    configure-target-libgo \
-    html-target-libgo 
+install-html-target-libgfortran: \
+    configure-target-libgfortran \
+    html-target-libgfortran 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/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)/libgo" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -36382,25 +40833,25 @@ install-html-target-libgo: \
                    install-html) \
           || exit 1
  
-@endif target-libgo
+@endif target-libgfortran
  
-.PHONY: maybe-installcheck-target-libgo installcheck-target-libgo
-maybe-installcheck-target-libgo:
-@if target-libgo
-maybe-installcheck-target-libgo: installcheck-target-libgo
+.PHONY: maybe-installcheck-target-libgfortran installcheck-target-libgfortran
+maybe-installcheck-target-libgfortran:
+@if target-libgfortran
+maybe-installcheck-target-libgfortran: installcheck-target-libgfortran
  
-installcheck-target-libgo: \
-    configure-target-libgo 
+installcheck-target-libgfortran: \
+    configure-target-libgfortran 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/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)/libgo" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -36408,24 +40859,24 @@ installcheck-target-libgo: \
                    installcheck) \
           || exit 1
  
-@endif target-libgo
+@endif target-libgfortran
  
-.PHONY: maybe-mostlyclean-target-libgo mostlyclean-target-libgo
-maybe-mostlyclean-target-libgo:
-@if target-libgo
-maybe-mostlyclean-target-libgo: mostlyclean-target-libgo
+.PHONY: maybe-mostlyclean-target-libgfortran mostlyclean-target-libgfortran
+maybe-mostlyclean-target-libgfortran:
+@if target-libgfortran
+maybe-mostlyclean-target-libgfortran: mostlyclean-target-libgfortran
  
-mostlyclean-target-libgo: 
+mostlyclean-target-libgfortran: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/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)/libgo" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -36433,24 +40884,24 @@ mostlyclean-target-libgo:
                    mostlyclean) \
           || exit 1
  
-@endif target-libgo
+@endif target-libgfortran
  
-.PHONY: maybe-clean-target-libgo clean-target-libgo
-maybe-clean-target-libgo:
-@if target-libgo
-maybe-clean-target-libgo: clean-target-libgo
+.PHONY: maybe-clean-target-libgfortran clean-target-libgfortran
+maybe-clean-target-libgfortran:
+@if target-libgfortran
+maybe-clean-target-libgfortran: clean-target-libgfortran
  
-clean-target-libgo: 
+clean-target-libgfortran: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/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)/libgo" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -36458,24 +40909,24 @@ clean-target-libgo:
                    clean) \
           || exit 1
  
-@endif target-libgo
+@endif target-libgfortran
  
-.PHONY: maybe-distclean-target-libgo distclean-target-libgo
-maybe-distclean-target-libgo:
-@if target-libgo
-maybe-distclean-target-libgo: distclean-target-libgo
+.PHONY: maybe-distclean-target-libgfortran distclean-target-libgfortran
+maybe-distclean-target-libgfortran:
+@if target-libgfortran
+maybe-distclean-target-libgfortran: distclean-target-libgfortran
  
-distclean-target-libgo: 
+distclean-target-libgfortran: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/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)/libgo" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -36483,24 +40934,24 @@ distclean-target-libgo:
                    distclean) \
           || exit 1
  
-@endif target-libgo
+@endif target-libgfortran
  
-.PHONY: maybe-maintainer-clean-target-libgo maintainer-clean-target-libgo
-maybe-maintainer-clean-target-libgo:
-@if target-libgo
-maybe-maintainer-clean-target-libgo: maintainer-clean-target-libgo
+.PHONY: maybe-maintainer-clean-target-libgfortran maintainer-clean-target-libgfortran
+maybe-maintainer-clean-target-libgfortran:
+@if target-libgfortran
+maybe-maintainer-clean-target-libgfortran: maintainer-clean-target-libgfortran
  
-maintainer-clean-target-libgo: 
+maintainer-clean-target-libgfortran: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/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)/libgo" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -36508,537 +40959,604 @@ maintainer-clean-target-libgo:
                    maintainer-clean) \
           || exit 1
  
-@endif target-libgo
+@endif target-libgfortran
  
  
  
  
  
-.PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
-maybe-configure-target-libtermcap:
+.PHONY: configure-target-libobjc maybe-configure-target-libobjc
+maybe-configure-target-libobjc:
  @if gcc-bootstrap
-configure-target-libtermcap: stage_current
+configure-target-libobjc: stage_current
  @endif gcc-bootstrap
-@if target-libtermcap
-maybe-configure-target-libtermcap: configure-target-libtermcap
-configure-target-libtermcap: 
+@if target-libobjc
+maybe-configure-target-libobjc: configure-target-libobjc
+configure-target-libobjc: 
         @: $(MAKE); $(unstage)
         @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 ; \
-       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; \
+       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; \
+       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; \
           else \
-           rm -f $(TARGET_SUBDIR)/libtermcap/Makefile; \
-           mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libobjc/Makefile; \
+           mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \
           fi; \
         else \
-         mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
+         mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \
         fi; \
-       test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
+       test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc; \
         $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libtermcap; \
-       cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/libobjc; \
+       cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libtermcap/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libobjc/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libtermcap"; \
-       libsrcdir="$$s/libtermcap"; \
+       module_srcdir=libobjc; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
-@endif target-libtermcap
+@endif target-libobjc
  
  
  
  
  
-.PHONY: all-target-libtermcap maybe-all-target-libtermcap
-maybe-all-target-libtermcap:
+.PHONY: all-target-libobjc maybe-all-target-libobjc
+maybe-all-target-libobjc:
  @if gcc-bootstrap
-all-target-libtermcap: stage_current
+all-target-libobjc: stage_current
  @endif gcc-bootstrap
-@if target-libtermcap
-TARGET-target-libtermcap=all
-maybe-all-target-libtermcap: all-target-libtermcap
-all-target-libtermcap: configure-target-libtermcap
+@if target-libobjc
+TARGET-target-libobjc=all
+maybe-all-target-libobjc: all-target-libobjc
+all-target-libobjc: configure-target-libobjc
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libtermcap && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libtermcap))
-@endif target-libtermcap
+       (cd $(TARGET_SUBDIR)/libobjc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libobjc))
+@endif target-libobjc
  
  
  
  
  
-.PHONY: check-target-libtermcap maybe-check-target-libtermcap
-maybe-check-target-libtermcap:
-@if target-libtermcap
-maybe-check-target-libtermcap: check-target-libtermcap
+.PHONY: check-target-libobjc maybe-check-target-libobjc
+maybe-check-target-libobjc:
+@if target-libobjc
+maybe-check-target-libobjc: check-target-libobjc
  
-# Dummy target for uncheckable module.
-check-target-libtermcap:
+check-target-libobjc:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libobjc && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
-@endif target-libtermcap
+@endif target-libobjc
  
-.PHONY: install-target-libtermcap maybe-install-target-libtermcap
-maybe-install-target-libtermcap:
-@if target-libtermcap
-maybe-install-target-libtermcap: install-target-libtermcap
+.PHONY: install-target-libobjc maybe-install-target-libobjc
+maybe-install-target-libobjc:
+@if target-libobjc
+maybe-install-target-libobjc: install-target-libobjc
  
-install-target-libtermcap: installdirs
+install-target-libobjc: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
-@endif target-libtermcap
+@endif target-libobjc
  
-.PHONY: install-strip-target-libtermcap maybe-install-strip-target-libtermcap
-maybe-install-strip-target-libtermcap:
-@if target-libtermcap
-maybe-install-strip-target-libtermcap: install-strip-target-libtermcap
+.PHONY: install-strip-target-libobjc maybe-install-strip-target-libobjc
+maybe-install-strip-target-libobjc:
+@if target-libobjc
+maybe-install-strip-target-libobjc: install-strip-target-libobjc
  
-install-strip-target-libtermcap: installdirs
+install-strip-target-libobjc: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
  
-@endif target-libtermcap
+@endif target-libobjc
  
  # Other targets (info, dvi, pdf, etc.)
  
-.PHONY: maybe-info-target-libtermcap info-target-libtermcap
-maybe-info-target-libtermcap:
-@if target-libtermcap
-maybe-info-target-libtermcap: info-target-libtermcap
+.PHONY: maybe-info-target-libobjc info-target-libobjc
+maybe-info-target-libobjc:
+@if target-libobjc
+maybe-info-target-libobjc: info-target-libobjc
  
-info-target-libtermcap: \
-    configure-target-libtermcap 
+info-target-libobjc: \
+    configure-target-libobjc 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/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)/libtermcap" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
+         $(MAKE) $(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-libobjc
+
+.PHONY: maybe-dvi-target-libobjc dvi-target-libobjc
+maybe-dvi-target-libobjc:
+@if target-libobjc
+maybe-dvi-target-libobjc: dvi-target-libobjc
+
+dvi-target-libobjc: \
+    configure-target-libobjc 
+       @: $(MAKE); $(unstage)
+       @[ -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"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libobjc && \
+         $(MAKE) $(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-libobjc
+
+.PHONY: maybe-pdf-target-libobjc pdf-target-libobjc
+maybe-pdf-target-libobjc:
+@if target-libobjc
+maybe-pdf-target-libobjc: pdf-target-libobjc
+
+pdf-target-libobjc: \
+    configure-target-libobjc 
+       @: $(MAKE); $(unstage)
+       @[ -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"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libobjc && \
+         $(MAKE) $(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-libobjc
+
+.PHONY: maybe-html-target-libobjc html-target-libobjc
+maybe-html-target-libobjc:
+@if target-libobjc
+maybe-html-target-libobjc: html-target-libobjc
+
+html-target-libobjc: \
+    configure-target-libobjc 
+       @: $(MAKE); $(unstage)
+       @[ -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"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libobjc && \
+         $(MAKE) $(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-libobjc
+
+.PHONY: maybe-TAGS-target-libobjc TAGS-target-libobjc
+maybe-TAGS-target-libobjc:
+@if target-libobjc
+maybe-TAGS-target-libobjc: TAGS-target-libobjc
+
+TAGS-target-libobjc: \
+    configure-target-libobjc 
+       @: $(MAKE); $(unstage)
+       @[ -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"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libobjc && \
           $(MAKE) $(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) \
+                  TAGS) \
           || exit 1
  
-@endif target-libtermcap
+@endif target-libobjc
  
-.PHONY: maybe-dvi-target-libtermcap dvi-target-libtermcap
-maybe-dvi-target-libtermcap:
-@if target-libtermcap
-maybe-dvi-target-libtermcap: dvi-target-libtermcap
+.PHONY: maybe-install-info-target-libobjc install-info-target-libobjc
+maybe-install-info-target-libobjc:
+@if target-libobjc
+maybe-install-info-target-libobjc: install-info-target-libobjc
  
-dvi-target-libtermcap: \
-    configure-target-libtermcap 
+install-info-target-libobjc: \
+    configure-target-libobjc \
+    info-target-libobjc 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/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)/libtermcap" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
           $(MAKE) $(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) \
+                  install-info) \
           || exit 1
  
-@endif target-libtermcap
+@endif target-libobjc
  
-.PHONY: maybe-pdf-target-libtermcap pdf-target-libtermcap
-maybe-pdf-target-libtermcap:
-@if target-libtermcap
-maybe-pdf-target-libtermcap: pdf-target-libtermcap
+.PHONY: maybe-install-pdf-target-libobjc install-pdf-target-libobjc
+maybe-install-pdf-target-libobjc:
+@if target-libobjc
+maybe-install-pdf-target-libobjc: install-pdf-target-libobjc
  
-pdf-target-libtermcap: \
-    configure-target-libtermcap 
+install-pdf-target-libobjc: \
+    configure-target-libobjc \
+    pdf-target-libobjc 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/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)/libtermcap" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
           $(MAKE) $(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) \
+                  install-pdf) \
           || exit 1
  
-@endif target-libtermcap
+@endif target-libobjc
  
-.PHONY: maybe-html-target-libtermcap html-target-libtermcap
-maybe-html-target-libtermcap:
-@if target-libtermcap
-maybe-html-target-libtermcap: html-target-libtermcap
+.PHONY: maybe-install-html-target-libobjc install-html-target-libobjc
+maybe-install-html-target-libobjc:
+@if target-libobjc
+maybe-install-html-target-libobjc: install-html-target-libobjc
  
-html-target-libtermcap: \
-    configure-target-libtermcap 
+install-html-target-libobjc: \
+    configure-target-libobjc \
+    html-target-libobjc 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/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)/libtermcap" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
           $(MAKE) $(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) \
+                  install-html) \
           || exit 1
  
-@endif target-libtermcap
+@endif target-libobjc
  
-.PHONY: maybe-TAGS-target-libtermcap TAGS-target-libtermcap
-maybe-TAGS-target-libtermcap:
-@if target-libtermcap
-maybe-TAGS-target-libtermcap: TAGS-target-libtermcap
+.PHONY: maybe-installcheck-target-libobjc installcheck-target-libobjc
+maybe-installcheck-target-libobjc:
+@if target-libobjc
+maybe-installcheck-target-libobjc: installcheck-target-libobjc
  
-TAGS-target-libtermcap: \
-    configure-target-libtermcap 
+installcheck-target-libobjc: \
+    configure-target-libobjc 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/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)/libtermcap" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
           $(MAKE) $(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) \
+                  installcheck) \
           || exit 1
  
-@endif target-libtermcap
+@endif target-libobjc
  
-.PHONY: maybe-install-info-target-libtermcap install-info-target-libtermcap
-maybe-install-info-target-libtermcap:
-@if target-libtermcap
-maybe-install-info-target-libtermcap: install-info-target-libtermcap
+.PHONY: maybe-mostlyclean-target-libobjc mostlyclean-target-libobjc
+maybe-mostlyclean-target-libobjc:
+@if target-libobjc
+maybe-mostlyclean-target-libobjc: mostlyclean-target-libobjc
  
-install-info-target-libtermcap: \
-    configure-target-libtermcap \
-    info-target-libtermcap 
+mostlyclean-target-libobjc: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/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)/libtermcap" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
           $(MAKE) $(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) \
+                  mostlyclean) \
           || exit 1
  
-@endif target-libtermcap
+@endif target-libobjc
  
-.PHONY: maybe-install-pdf-target-libtermcap install-pdf-target-libtermcap
-maybe-install-pdf-target-libtermcap:
-@if target-libtermcap
-maybe-install-pdf-target-libtermcap: install-pdf-target-libtermcap
+.PHONY: maybe-clean-target-libobjc clean-target-libobjc
+maybe-clean-target-libobjc:
+@if target-libobjc
+maybe-clean-target-libobjc: clean-target-libobjc
  
-install-pdf-target-libtermcap: \
-    configure-target-libtermcap \
-    pdf-target-libtermcap 
+clean-target-libobjc: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/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)/libtermcap" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
           $(MAKE) $(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) \
+                  clean) \
           || exit 1
  
-@endif target-libtermcap
+@endif target-libobjc
  
-.PHONY: maybe-install-html-target-libtermcap install-html-target-libtermcap
-maybe-install-html-target-libtermcap:
-@if target-libtermcap
-maybe-install-html-target-libtermcap: install-html-target-libtermcap
+.PHONY: maybe-distclean-target-libobjc distclean-target-libobjc
+maybe-distclean-target-libobjc:
+@if target-libobjc
+maybe-distclean-target-libobjc: distclean-target-libobjc
  
-install-html-target-libtermcap: \
-    configure-target-libtermcap \
-    html-target-libtermcap 
+distclean-target-libobjc: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/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)/libtermcap" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
           $(MAKE) $(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) \
+                  distclean) \
           || exit 1
  
-@endif target-libtermcap
+@endif target-libobjc
  
-.PHONY: maybe-installcheck-target-libtermcap installcheck-target-libtermcap
-maybe-installcheck-target-libtermcap:
-@if target-libtermcap
-maybe-installcheck-target-libtermcap: installcheck-target-libtermcap
+.PHONY: maybe-maintainer-clean-target-libobjc maintainer-clean-target-libobjc
+maybe-maintainer-clean-target-libobjc:
+@if target-libobjc
+maybe-maintainer-clean-target-libobjc: maintainer-clean-target-libobjc
  
-installcheck-target-libtermcap: \
-    configure-target-libtermcap 
+maintainer-clean-target-libobjc: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/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)/libtermcap" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
           $(MAKE) $(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) \
+                  maintainer-clean) \
           || exit 1
  
-@endif target-libtermcap
-
-.PHONY: maybe-mostlyclean-target-libtermcap mostlyclean-target-libtermcap
-maybe-mostlyclean-target-libtermcap:
-@if target-libtermcap
-maybe-mostlyclean-target-libtermcap: mostlyclean-target-libtermcap
-
-# libtermcap doesn't support mostlyclean.
-mostlyclean-target-libtermcap:
-
-@endif target-libtermcap
-
-.PHONY: maybe-clean-target-libtermcap clean-target-libtermcap
-maybe-clean-target-libtermcap:
-@if target-libtermcap
-maybe-clean-target-libtermcap: clean-target-libtermcap
-
-# libtermcap doesn't support clean.
-clean-target-libtermcap:
-
-@endif target-libtermcap
-
-.PHONY: maybe-distclean-target-libtermcap distclean-target-libtermcap
-maybe-distclean-target-libtermcap:
-@if target-libtermcap
-maybe-distclean-target-libtermcap: distclean-target-libtermcap
-
-# libtermcap doesn't support distclean.
-distclean-target-libtermcap:
-
-@endif target-libtermcap
-
-.PHONY: maybe-maintainer-clean-target-libtermcap maintainer-clean-target-libtermcap
-maybe-maintainer-clean-target-libtermcap:
-@if target-libtermcap
-maybe-maintainer-clean-target-libtermcap: maintainer-clean-target-libtermcap
-
-# libtermcap doesn't support maintainer-clean.
-maintainer-clean-target-libtermcap:
-
-@endif target-libtermcap
+@endif target-libobjc
  
  
  
  
  
-.PHONY: configure-target-winsup maybe-configure-target-winsup
-maybe-configure-target-winsup:
+.PHONY: configure-target-libgo maybe-configure-target-libgo
+maybe-configure-target-libgo:
  @if gcc-bootstrap
-configure-target-winsup: stage_current
+configure-target-libgo: stage_current
  @endif gcc-bootstrap
-@if target-winsup
-maybe-configure-target-winsup: configure-target-winsup
-configure-target-winsup: 
+@if target-libgo
+maybe-configure-target-libgo: configure-target-libgo
+configure-target-libgo: 
         @: $(MAKE); $(unstage)
         @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 ; \
-       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; \
+       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; \
+       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; \
           else \
-           rm -f $(TARGET_SUBDIR)/winsup/Makefile; \
-           mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libgo/Makefile; \
+           mv $(TARGET_SUBDIR)/libgo/multilib.tmp $(TARGET_SUBDIR)/libgo/multilib.out; \
           fi; \
         else \
-         mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
+         mv $(TARGET_SUBDIR)/libgo/multilib.tmp $(TARGET_SUBDIR)/libgo/multilib.out; \
         fi; \
-       test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
+       test ! -f $(TARGET_SUBDIR)/libgo/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgo; \
         $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/winsup; \
-       cd "$(TARGET_SUBDIR)/winsup" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/libgo; \
+       cd "$(TARGET_SUBDIR)/libgo" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/winsup/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libgo/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/winsup"; \
-       libsrcdir="$$s/winsup"; \
+       module_srcdir=libgo; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
-@endif target-winsup
+@endif target-libgo
  
  
  
  
  
-.PHONY: all-target-winsup maybe-all-target-winsup
-maybe-all-target-winsup:
+.PHONY: all-target-libgo maybe-all-target-libgo
+maybe-all-target-libgo:
  @if gcc-bootstrap
-all-target-winsup: stage_current
+all-target-libgo: stage_current
  @endif gcc-bootstrap
-@if target-winsup
-TARGET-target-winsup=all
-maybe-all-target-winsup: all-target-winsup
-all-target-winsup: configure-target-winsup
+@if target-libgo
+TARGET-target-libgo=all
+maybe-all-target-libgo: all-target-libgo
+all-target-libgo: configure-target-libgo
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/winsup && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-winsup))
-@endif target-winsup
+       (cd $(TARGET_SUBDIR)/libgo && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libgo))
+@endif target-libgo
  
  
  
  
  
-.PHONY: check-target-winsup maybe-check-target-winsup
-maybe-check-target-winsup:
-@if target-winsup
-maybe-check-target-winsup: check-target-winsup
+.PHONY: check-target-libgo maybe-check-target-libgo
+maybe-check-target-libgo:
+@if target-libgo
+maybe-check-target-libgo: check-target-libgo
  
-check-target-winsup:
+check-target-libgo:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
-@endif target-winsup
+@endif target-libgo
  
-.PHONY: install-target-winsup maybe-install-target-winsup
-maybe-install-target-winsup:
-@if target-winsup
-maybe-install-target-winsup: install-target-winsup
+.PHONY: install-target-libgo maybe-install-target-libgo
+maybe-install-target-libgo:
+@if target-libgo
+maybe-install-target-libgo: install-target-libgo
  
-install-target-winsup: installdirs
+install-target-libgo: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
-@endif target-winsup
+@endif target-libgo
  
-.PHONY: install-strip-target-winsup maybe-install-strip-target-winsup
-maybe-install-strip-target-winsup:
-@if target-winsup
-maybe-install-strip-target-winsup: install-strip-target-winsup
+.PHONY: install-strip-target-libgo maybe-install-strip-target-libgo
+maybe-install-strip-target-libgo:
+@if target-libgo
+maybe-install-strip-target-libgo: install-strip-target-libgo
  
-install-strip-target-winsup: installdirs
+install-strip-target-libgo: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
  
-@endif target-winsup
+@endif target-libgo
  
  # Other targets (info, dvi, pdf, etc.)
  
-.PHONY: maybe-info-target-winsup info-target-winsup
-maybe-info-target-winsup:
-@if target-winsup
-maybe-info-target-winsup: info-target-winsup
+.PHONY: maybe-info-target-libgo info-target-libgo
+maybe-info-target-libgo:
+@if target-libgo
+maybe-info-target-libgo: info-target-libgo
  
-info-target-winsup: \
-    configure-target-winsup 
+info-target-libgo: \
+    configure-target-libgo 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37046,25 +41564,25 @@ info-target-winsup: \
                    info) \
           || exit 1
  
-@endif target-winsup
+@endif target-libgo
  
-.PHONY: maybe-dvi-target-winsup dvi-target-winsup
-maybe-dvi-target-winsup:
-@if target-winsup
-maybe-dvi-target-winsup: dvi-target-winsup
+.PHONY: maybe-dvi-target-libgo dvi-target-libgo
+maybe-dvi-target-libgo:
+@if target-libgo
+maybe-dvi-target-libgo: dvi-target-libgo
  
-dvi-target-winsup: \
-    configure-target-winsup 
+dvi-target-libgo: \
+    configure-target-libgo 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37072,25 +41590,25 @@ dvi-target-winsup: \
                    dvi) \
           || exit 1
  
-@endif target-winsup
+@endif target-libgo
  
-.PHONY: maybe-pdf-target-winsup pdf-target-winsup
-maybe-pdf-target-winsup:
-@if target-winsup
-maybe-pdf-target-winsup: pdf-target-winsup
+.PHONY: maybe-pdf-target-libgo pdf-target-libgo
+maybe-pdf-target-libgo:
+@if target-libgo
+maybe-pdf-target-libgo: pdf-target-libgo
  
-pdf-target-winsup: \
-    configure-target-winsup 
+pdf-target-libgo: \
+    configure-target-libgo 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37098,25 +41616,25 @@ pdf-target-winsup: \
                    pdf) \
           || exit 1
  
-@endif target-winsup
+@endif target-libgo
  
-.PHONY: maybe-html-target-winsup html-target-winsup
-maybe-html-target-winsup:
-@if target-winsup
-maybe-html-target-winsup: html-target-winsup
+.PHONY: maybe-html-target-libgo html-target-libgo
+maybe-html-target-libgo:
+@if target-libgo
+maybe-html-target-libgo: html-target-libgo
  
-html-target-winsup: \
-    configure-target-winsup 
+html-target-libgo: \
+    configure-target-libgo 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37124,25 +41642,25 @@ html-target-winsup: \
                    html) \
           || exit 1
  
-@endif target-winsup
+@endif target-libgo
  
-.PHONY: maybe-TAGS-target-winsup TAGS-target-winsup
-maybe-TAGS-target-winsup:
-@if target-winsup
-maybe-TAGS-target-winsup: TAGS-target-winsup
+.PHONY: maybe-TAGS-target-libgo TAGS-target-libgo
+maybe-TAGS-target-libgo:
+@if target-libgo
+maybe-TAGS-target-libgo: TAGS-target-libgo
  
-TAGS-target-winsup: \
-    configure-target-winsup 
+TAGS-target-libgo: \
+    configure-target-libgo 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37150,26 +41668,26 @@ TAGS-target-winsup: \
                    TAGS) \
           || exit 1
  
-@endif target-winsup
+@endif target-libgo
  
-.PHONY: maybe-install-info-target-winsup install-info-target-winsup
-maybe-install-info-target-winsup:
-@if target-winsup
-maybe-install-info-target-winsup: install-info-target-winsup
+.PHONY: maybe-install-info-target-libgo install-info-target-libgo
+maybe-install-info-target-libgo:
+@if target-libgo
+maybe-install-info-target-libgo: install-info-target-libgo
  
-install-info-target-winsup: \
-    configure-target-winsup \
-    info-target-winsup 
+install-info-target-libgo: \
+    configure-target-libgo \
+    info-target-libgo 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37177,26 +41695,26 @@ install-info-target-winsup: \
                    install-info) \
           || exit 1
  
-@endif target-winsup
+@endif target-libgo
  
-.PHONY: maybe-install-pdf-target-winsup install-pdf-target-winsup
-maybe-install-pdf-target-winsup:
-@if target-winsup
-maybe-install-pdf-target-winsup: install-pdf-target-winsup
+.PHONY: maybe-install-pdf-target-libgo install-pdf-target-libgo
+maybe-install-pdf-target-libgo:
+@if target-libgo
+maybe-install-pdf-target-libgo: install-pdf-target-libgo
  
-install-pdf-target-winsup: \
-    configure-target-winsup \
-    pdf-target-winsup 
+install-pdf-target-libgo: \
+    configure-target-libgo \
+    pdf-target-libgo 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37204,26 +41722,26 @@ install-pdf-target-winsup: \
                    install-pdf) \
           || exit 1
  
-@endif target-winsup
+@endif target-libgo
  
-.PHONY: maybe-install-html-target-winsup install-html-target-winsup
-maybe-install-html-target-winsup:
-@if target-winsup
-maybe-install-html-target-winsup: install-html-target-winsup
+.PHONY: maybe-install-html-target-libgo install-html-target-libgo
+maybe-install-html-target-libgo:
+@if target-libgo
+maybe-install-html-target-libgo: install-html-target-libgo
  
-install-html-target-winsup: \
-    configure-target-winsup \
-    html-target-winsup 
+install-html-target-libgo: \
+    configure-target-libgo \
+    html-target-libgo 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37231,25 +41749,25 @@ install-html-target-winsup: \
                    install-html) \
           || exit 1
  
-@endif target-winsup
+@endif target-libgo
  
-.PHONY: maybe-installcheck-target-winsup installcheck-target-winsup
-maybe-installcheck-target-winsup:
-@if target-winsup
-maybe-installcheck-target-winsup: installcheck-target-winsup
+.PHONY: maybe-installcheck-target-libgo installcheck-target-libgo
+maybe-installcheck-target-libgo:
+@if target-libgo
+maybe-installcheck-target-libgo: installcheck-target-libgo
  
-installcheck-target-winsup: \
-    configure-target-winsup 
+installcheck-target-libgo: \
+    configure-target-libgo 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37257,24 +41775,24 @@ installcheck-target-winsup: \
                    installcheck) \
           || exit 1
  
-@endif target-winsup
+@endif target-libgo
  
-.PHONY: maybe-mostlyclean-target-winsup mostlyclean-target-winsup
-maybe-mostlyclean-target-winsup:
-@if target-winsup
-maybe-mostlyclean-target-winsup: mostlyclean-target-winsup
+.PHONY: maybe-mostlyclean-target-libgo mostlyclean-target-libgo
+maybe-mostlyclean-target-libgo:
+@if target-libgo
+maybe-mostlyclean-target-libgo: mostlyclean-target-libgo
  
-mostlyclean-target-winsup: 
+mostlyclean-target-libgo: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37282,24 +41800,24 @@ mostlyclean-target-winsup:
                    mostlyclean) \
           || exit 1
  
-@endif target-winsup
+@endif target-libgo
  
-.PHONY: maybe-clean-target-winsup clean-target-winsup
-maybe-clean-target-winsup:
-@if target-winsup
-maybe-clean-target-winsup: clean-target-winsup
+.PHONY: maybe-clean-target-libgo clean-target-libgo
+maybe-clean-target-libgo:
+@if target-libgo
+maybe-clean-target-libgo: clean-target-libgo
  
-clean-target-winsup: 
+clean-target-libgo: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37307,24 +41825,24 @@ clean-target-winsup:
                    clean) \
           || exit 1
  
-@endif target-winsup
+@endif target-libgo
  
-.PHONY: maybe-distclean-target-winsup distclean-target-winsup
-maybe-distclean-target-winsup:
-@if target-winsup
-maybe-distclean-target-winsup: distclean-target-winsup
+.PHONY: maybe-distclean-target-libgo distclean-target-libgo
+maybe-distclean-target-libgo:
+@if target-libgo
+maybe-distclean-target-libgo: distclean-target-libgo
  
-distclean-target-winsup: 
+distclean-target-libgo: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37332,24 +41850,24 @@ distclean-target-winsup:
                    distclean) \
           || exit 1
  
-@endif target-winsup
+@endif target-libgo
  
-.PHONY: maybe-maintainer-clean-target-winsup maintainer-clean-target-winsup
-maybe-maintainer-clean-target-winsup:
-@if target-winsup
-maybe-maintainer-clean-target-winsup: maintainer-clean-target-winsup
+.PHONY: maybe-maintainer-clean-target-libgo maintainer-clean-target-libgo
+maybe-maintainer-clean-target-libgo:
+@if target-libgo
+maybe-maintainer-clean-target-libgo: maintainer-clean-target-libgo
  
-maintainer-clean-target-winsup: 
+maintainer-clean-target-libgo: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37357,140 +41875,141 @@ maintainer-clean-target-winsup:
                    maintainer-clean) \
           || exit 1
  
-@endif target-winsup
+@endif target-libgo
  
  
  
  
  
-.PHONY: configure-target-libgloss maybe-configure-target-libgloss
-maybe-configure-target-libgloss:
+.PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
+maybe-configure-target-libtermcap:
  @if gcc-bootstrap
-configure-target-libgloss: stage_current
+configure-target-libtermcap: stage_current
  @endif gcc-bootstrap
-@if target-libgloss
-maybe-configure-target-libgloss: configure-target-libgloss
-configure-target-libgloss: 
+@if target-libtermcap
+maybe-configure-target-libtermcap: configure-target-libtermcap
+configure-target-libtermcap: 
         @: $(MAKE); $(unstage)
         @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 ; \
-       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; \
+       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; \
+       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; \
           else \
-           rm -f $(TARGET_SUBDIR)/libgloss/Makefile; \
-           mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libtermcap/Makefile; \
+           mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
           fi; \
         else \
-         mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
+         mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
         fi; \
-       test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
+       test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap; \
         $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libgloss; \
-       cd "$(TARGET_SUBDIR)/libgloss" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/libtermcap; \
+       cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgloss/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libtermcap/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libgloss"; \
-       libsrcdir="$$s/libgloss"; \
+       module_srcdir=libtermcap; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
-@endif target-libgloss
+@endif target-libtermcap
  
  
  
  
  
-.PHONY: all-target-libgloss maybe-all-target-libgloss
-maybe-all-target-libgloss:
+.PHONY: all-target-libtermcap maybe-all-target-libtermcap
+maybe-all-target-libtermcap:
  @if gcc-bootstrap
-all-target-libgloss: stage_current
+all-target-libtermcap: stage_current
  @endif gcc-bootstrap
-@if target-libgloss
-TARGET-target-libgloss=all
-maybe-all-target-libgloss: all-target-libgloss
-all-target-libgloss: configure-target-libgloss
+@if target-libtermcap
+TARGET-target-libtermcap=all
+maybe-all-target-libtermcap: all-target-libtermcap
+all-target-libtermcap: configure-target-libtermcap
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libgloss && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libgloss))
-@endif target-libgloss
+       (cd $(TARGET_SUBDIR)/libtermcap && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libtermcap))
+@endif target-libtermcap
  
  
  
  
  
-.PHONY: check-target-libgloss maybe-check-target-libgloss
-maybe-check-target-libgloss:
-@if target-libgloss
-maybe-check-target-libgloss: check-target-libgloss
+.PHONY: check-target-libtermcap maybe-check-target-libtermcap
+maybe-check-target-libtermcap:
+@if target-libtermcap
+maybe-check-target-libtermcap: check-target-libtermcap
  
  # Dummy target for uncheckable module.
-check-target-libgloss:
+check-target-libtermcap:
  
-@endif target-libgloss
+@endif target-libtermcap
  
-.PHONY: install-target-libgloss maybe-install-target-libgloss
-maybe-install-target-libgloss:
-@if target-libgloss
-maybe-install-target-libgloss: install-target-libgloss
+.PHONY: install-target-libtermcap maybe-install-target-libtermcap
+maybe-install-target-libtermcap:
+@if target-libtermcap
+maybe-install-target-libtermcap: install-target-libtermcap
  
-install-target-libgloss: installdirs
+install-target-libtermcap: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
-@endif target-libgloss
+@endif target-libtermcap
  
-.PHONY: install-strip-target-libgloss maybe-install-strip-target-libgloss
-maybe-install-strip-target-libgloss:
-@if target-libgloss
-maybe-install-strip-target-libgloss: install-strip-target-libgloss
+.PHONY: install-strip-target-libtermcap maybe-install-strip-target-libtermcap
+maybe-install-strip-target-libtermcap:
+@if target-libtermcap
+maybe-install-strip-target-libtermcap: install-strip-target-libtermcap
  
-install-strip-target-libgloss: installdirs
+install-strip-target-libtermcap: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
  
-@endif target-libgloss
+@endif target-libtermcap
  
  # Other targets (info, dvi, pdf, etc.)
  
-.PHONY: maybe-info-target-libgloss info-target-libgloss
-maybe-info-target-libgloss:
-@if target-libgloss
-maybe-info-target-libgloss: info-target-libgloss
+.PHONY: maybe-info-target-libtermcap info-target-libtermcap
+maybe-info-target-libtermcap:
+@if target-libtermcap
+maybe-info-target-libtermcap: info-target-libtermcap
  
-info-target-libgloss: \
-    configure-target-libgloss 
+info-target-libtermcap: \
+    configure-target-libtermcap 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37498,25 +42017,25 @@ info-target-libgloss: \
                    info) \
           || exit 1
  
-@endif target-libgloss
+@endif target-libtermcap
  
-.PHONY: maybe-dvi-target-libgloss dvi-target-libgloss
-maybe-dvi-target-libgloss:
-@if target-libgloss
-maybe-dvi-target-libgloss: dvi-target-libgloss
+.PHONY: maybe-dvi-target-libtermcap dvi-target-libtermcap
+maybe-dvi-target-libtermcap:
+@if target-libtermcap
+maybe-dvi-target-libtermcap: dvi-target-libtermcap
  
-dvi-target-libgloss: \
-    configure-target-libgloss 
+dvi-target-libtermcap: \
+    configure-target-libtermcap 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37524,25 +42043,25 @@ dvi-target-libgloss: \
                    dvi) \
           || exit 1
  
-@endif target-libgloss
+@endif target-libtermcap
  
-.PHONY: maybe-pdf-target-libgloss pdf-target-libgloss
-maybe-pdf-target-libgloss:
-@if target-libgloss
-maybe-pdf-target-libgloss: pdf-target-libgloss
+.PHONY: maybe-pdf-target-libtermcap pdf-target-libtermcap
+maybe-pdf-target-libtermcap:
+@if target-libtermcap
+maybe-pdf-target-libtermcap: pdf-target-libtermcap
  
-pdf-target-libgloss: \
-    configure-target-libgloss 
+pdf-target-libtermcap: \
+    configure-target-libtermcap 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37550,25 +42069,25 @@ pdf-target-libgloss: \
                    pdf) \
           || exit 1
  
-@endif target-libgloss
+@endif target-libtermcap
  
-.PHONY: maybe-html-target-libgloss html-target-libgloss
-maybe-html-target-libgloss:
-@if target-libgloss
-maybe-html-target-libgloss: html-target-libgloss
+.PHONY: maybe-html-target-libtermcap html-target-libtermcap
+maybe-html-target-libtermcap:
+@if target-libtermcap
+maybe-html-target-libtermcap: html-target-libtermcap
  
-html-target-libgloss: \
-    configure-target-libgloss 
+html-target-libtermcap: \
+    configure-target-libtermcap 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37576,25 +42095,25 @@ html-target-libgloss: \
                    html) \
           || exit 1
  
-@endif target-libgloss
+@endif target-libtermcap
  
-.PHONY: maybe-TAGS-target-libgloss TAGS-target-libgloss
-maybe-TAGS-target-libgloss:
-@if target-libgloss
-maybe-TAGS-target-libgloss: TAGS-target-libgloss
+.PHONY: maybe-TAGS-target-libtermcap TAGS-target-libtermcap
+maybe-TAGS-target-libtermcap:
+@if target-libtermcap
+maybe-TAGS-target-libtermcap: TAGS-target-libtermcap
  
-TAGS-target-libgloss: \
-    configure-target-libgloss 
+TAGS-target-libtermcap: \
+    configure-target-libtermcap 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37602,26 +42121,26 @@ TAGS-target-libgloss: \
                    TAGS) \
           || exit 1
  
-@endif target-libgloss
+@endif target-libtermcap
  
-.PHONY: maybe-install-info-target-libgloss install-info-target-libgloss
-maybe-install-info-target-libgloss:
-@if target-libgloss
-maybe-install-info-target-libgloss: install-info-target-libgloss
+.PHONY: maybe-install-info-target-libtermcap install-info-target-libtermcap
+maybe-install-info-target-libtermcap:
+@if target-libtermcap
+maybe-install-info-target-libtermcap: install-info-target-libtermcap
  
-install-info-target-libgloss: \
-    configure-target-libgloss \
-    info-target-libgloss 
+install-info-target-libtermcap: \
+    configure-target-libtermcap \
+    info-target-libtermcap 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37629,26 +42148,26 @@ install-info-target-libgloss: \
                    install-info) \
           || exit 1
  
-@endif target-libgloss
+@endif target-libtermcap
  
-.PHONY: maybe-install-pdf-target-libgloss install-pdf-target-libgloss
-maybe-install-pdf-target-libgloss:
-@if target-libgloss
-maybe-install-pdf-target-libgloss: install-pdf-target-libgloss
+.PHONY: maybe-install-pdf-target-libtermcap install-pdf-target-libtermcap
+maybe-install-pdf-target-libtermcap:
+@if target-libtermcap
+maybe-install-pdf-target-libtermcap: install-pdf-target-libtermcap
  
-install-pdf-target-libgloss: \
-    configure-target-libgloss \
-    pdf-target-libgloss 
+install-pdf-target-libtermcap: \
+    configure-target-libtermcap \
+    pdf-target-libtermcap 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37656,26 +42175,26 @@ install-pdf-target-libgloss: \
                    install-pdf) \
           || exit 1
  
-@endif target-libgloss
+@endif target-libtermcap
  
-.PHONY: maybe-install-html-target-libgloss install-html-target-libgloss
-maybe-install-html-target-libgloss:
-@if target-libgloss
-maybe-install-html-target-libgloss: install-html-target-libgloss
+.PHONY: maybe-install-html-target-libtermcap install-html-target-libtermcap
+maybe-install-html-target-libtermcap:
+@if target-libtermcap
+maybe-install-html-target-libtermcap: install-html-target-libtermcap
  
-install-html-target-libgloss: \
-    configure-target-libgloss \
-    html-target-libgloss 
+install-html-target-libtermcap: \
+    configure-target-libtermcap \
+    html-target-libtermcap 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37683,25 +42202,25 @@ install-html-target-libgloss: \
                    install-html) \
           || exit 1
  
-@endif target-libgloss
+@endif target-libtermcap
  
-.PHONY: maybe-installcheck-target-libgloss installcheck-target-libgloss
-maybe-installcheck-target-libgloss:
-@if target-libgloss
-maybe-installcheck-target-libgloss: installcheck-target-libgloss
+.PHONY: maybe-installcheck-target-libtermcap installcheck-target-libtermcap
+maybe-installcheck-target-libtermcap:
+@if target-libtermcap
+maybe-installcheck-target-libtermcap: installcheck-target-libtermcap
  
-installcheck-target-libgloss: \
-    configure-target-libgloss 
+installcheck-target-libtermcap: \
+    configure-target-libtermcap 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37709,245 +42228,186 @@ installcheck-target-libgloss: \
                    installcheck) \
           || exit 1
  
-@endif target-libgloss
+@endif target-libtermcap
  
-.PHONY: maybe-mostlyclean-target-libgloss mostlyclean-target-libgloss
-maybe-mostlyclean-target-libgloss:
-@if target-libgloss
-maybe-mostlyclean-target-libgloss: mostlyclean-target-libgloss
+.PHONY: maybe-mostlyclean-target-libtermcap mostlyclean-target-libtermcap
+maybe-mostlyclean-target-libtermcap:
+@if target-libtermcap
+maybe-mostlyclean-target-libtermcap: mostlyclean-target-libtermcap
  
-mostlyclean-target-libgloss: 
-       @: $(MAKE); $(unstage)
-       @[ -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" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
-         $(MAKE) $(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
+# libtermcap doesn't support mostlyclean.
+mostlyclean-target-libtermcap:
  
-@endif target-libgloss
+@endif target-libtermcap
  
-.PHONY: maybe-clean-target-libgloss clean-target-libgloss
-maybe-clean-target-libgloss:
-@if target-libgloss
-maybe-clean-target-libgloss: clean-target-libgloss
+.PHONY: maybe-clean-target-libtermcap clean-target-libtermcap
+maybe-clean-target-libtermcap:
+@if target-libtermcap
+maybe-clean-target-libtermcap: clean-target-libtermcap
  
-clean-target-libgloss: 
-       @: $(MAKE); $(unstage)
-       @[ -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" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
-         $(MAKE) $(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
+# libtermcap doesn't support clean.
+clean-target-libtermcap:
  
-@endif target-libgloss
+@endif target-libtermcap
  
-.PHONY: maybe-distclean-target-libgloss distclean-target-libgloss
-maybe-distclean-target-libgloss:
-@if target-libgloss
-maybe-distclean-target-libgloss: distclean-target-libgloss
+.PHONY: maybe-distclean-target-libtermcap distclean-target-libtermcap
+maybe-distclean-target-libtermcap:
+@if target-libtermcap
+maybe-distclean-target-libtermcap: distclean-target-libtermcap
  
-distclean-target-libgloss: 
-       @: $(MAKE); $(unstage)
-       @[ -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" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
-         $(MAKE) $(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
+# libtermcap doesn't support distclean.
+distclean-target-libtermcap:
  
-@endif target-libgloss
+@endif target-libtermcap
  
-.PHONY: maybe-maintainer-clean-target-libgloss maintainer-clean-target-libgloss
-maybe-maintainer-clean-target-libgloss:
-@if target-libgloss
-maybe-maintainer-clean-target-libgloss: maintainer-clean-target-libgloss
+.PHONY: maybe-maintainer-clean-target-libtermcap maintainer-clean-target-libtermcap
+maybe-maintainer-clean-target-libtermcap:
+@if target-libtermcap
+maybe-maintainer-clean-target-libtermcap: maintainer-clean-target-libtermcap
  
-maintainer-clean-target-libgloss: 
-       @: $(MAKE); $(unstage)
-       @[ -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" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
-         $(MAKE) $(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
+# libtermcap doesn't support maintainer-clean.
+maintainer-clean-target-libtermcap:
  
-@endif target-libgloss
+@endif target-libtermcap
  
  
  
  
  
-.PHONY: configure-target-libffi maybe-configure-target-libffi
-maybe-configure-target-libffi:
+.PHONY: configure-target-winsup maybe-configure-target-winsup
+maybe-configure-target-winsup:
  @if gcc-bootstrap
-configure-target-libffi: stage_current
+configure-target-winsup: stage_current
  @endif gcc-bootstrap
-@if target-libffi
-maybe-configure-target-libffi: configure-target-libffi
-configure-target-libffi: 
+@if target-winsup
+maybe-configure-target-winsup: configure-target-winsup
+configure-target-winsup: 
         @: $(MAKE); $(unstage)
         @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 ; \
-       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; \
+       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; \
+       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; \
           else \
-           rm -f $(TARGET_SUBDIR)/libffi/Makefile; \
-           mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/winsup/Makefile; \
+           mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
           fi; \
         else \
-         mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \
+         mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
         fi; \
-       test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
+       test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup; \
         $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libffi; \
-       cd "$(TARGET_SUBDIR)/libffi" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/winsup; \
+       cd "$(TARGET_SUBDIR)/winsup" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libffi/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/winsup/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libffi"; \
-       libsrcdir="$$s/libffi"; \
+       module_srcdir=winsup; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
-@endif target-libffi
+@endif target-winsup
  
  
  
  
  
-.PHONY: all-target-libffi maybe-all-target-libffi
-maybe-all-target-libffi:
+.PHONY: all-target-winsup maybe-all-target-winsup
+maybe-all-target-winsup:
  @if gcc-bootstrap
-all-target-libffi: stage_current
+all-target-winsup: stage_current
  @endif gcc-bootstrap
-@if target-libffi
-TARGET-target-libffi=all
-maybe-all-target-libffi: all-target-libffi
-all-target-libffi: configure-target-libffi
+@if target-winsup
+TARGET-target-winsup=all
+maybe-all-target-winsup: all-target-winsup
+all-target-winsup: configure-target-winsup
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libffi && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libffi))
-@endif target-libffi
+       (cd $(TARGET_SUBDIR)/winsup && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-winsup))
+@endif target-winsup
  
  
  
  
  
-.PHONY: check-target-libffi maybe-check-target-libffi
-maybe-check-target-libffi:
-@if target-libffi
-maybe-check-target-libffi: check-target-libffi
+.PHONY: check-target-winsup maybe-check-target-winsup
+maybe-check-target-winsup:
+@if target-winsup
+maybe-check-target-winsup: check-target-winsup
  
-check-target-libffi:
+check-target-winsup:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libffi && \
+       (cd $(TARGET_SUBDIR)/winsup && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
-@endif target-libffi
+@endif target-winsup
  
-.PHONY: install-target-libffi maybe-install-target-libffi
-maybe-install-target-libffi:
-@if target-libffi
-maybe-install-target-libffi: install-target-libffi
+.PHONY: install-target-winsup maybe-install-target-winsup
+maybe-install-target-winsup:
+@if target-winsup
+maybe-install-target-winsup: install-target-winsup
  
-install-target-libffi: installdirs
+install-target-winsup: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libffi && \
+       (cd $(TARGET_SUBDIR)/winsup && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
-@endif target-libffi
+@endif target-winsup
  
-.PHONY: install-strip-target-libffi maybe-install-strip-target-libffi
-maybe-install-strip-target-libffi:
-@if target-libffi
-maybe-install-strip-target-libffi: install-strip-target-libffi
+.PHONY: install-strip-target-winsup maybe-install-strip-target-winsup
+maybe-install-strip-target-winsup:
+@if target-winsup
+maybe-install-strip-target-winsup: install-strip-target-winsup
  
-install-strip-target-libffi: installdirs
+install-strip-target-winsup: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libffi && \
+       (cd $(TARGET_SUBDIR)/winsup && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
  
-@endif target-libffi
+@endif target-winsup
  
  # Other targets (info, dvi, pdf, etc.)
  
-.PHONY: maybe-info-target-libffi info-target-libffi
-maybe-info-target-libffi:
-@if target-libffi
-maybe-info-target-libffi: info-target-libffi
+.PHONY: maybe-info-target-winsup info-target-winsup
+maybe-info-target-winsup:
+@if target-winsup
+maybe-info-target-winsup: info-target-winsup
  
-info-target-libffi: \
-    configure-target-libffi 
+info-target-winsup: \
+    configure-target-winsup 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/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)/libffi" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libffi && \
+       (cd $(TARGET_SUBDIR)/winsup && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37955,25 +42415,25 @@ info-target-libffi: \
                    info) \
           || exit 1
  
-@endif target-libffi
+@endif target-winsup
  
-.PHONY: maybe-dvi-target-libffi dvi-target-libffi
-maybe-dvi-target-libffi:
-@if target-libffi
-maybe-dvi-target-libffi: dvi-target-libffi
+.PHONY: maybe-dvi-target-winsup dvi-target-winsup
+maybe-dvi-target-winsup:
+@if target-winsup
+maybe-dvi-target-winsup: dvi-target-winsup
  
-dvi-target-libffi: \
-    configure-target-libffi 
+dvi-target-winsup: \
+    configure-target-winsup 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/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)/libffi" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libffi && \
+       (cd $(TARGET_SUBDIR)/winsup && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -37981,25 +42441,25 @@ dvi-target-libffi: \
                    dvi) \
           || exit 1
  
-@endif target-libffi
+@endif target-winsup
  
-.PHONY: maybe-pdf-target-libffi pdf-target-libffi
-maybe-pdf-target-libffi:
-@if target-libffi
-maybe-pdf-target-libffi: pdf-target-libffi
+.PHONY: maybe-pdf-target-winsup pdf-target-winsup
+maybe-pdf-target-winsup:
+@if target-winsup
+maybe-pdf-target-winsup: pdf-target-winsup
  
-pdf-target-libffi: \
-    configure-target-libffi 
+pdf-target-winsup: \
+    configure-target-winsup 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/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)/libffi" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libffi && \
+       (cd $(TARGET_SUBDIR)/winsup && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38007,25 +42467,25 @@ pdf-target-libffi: \
                    pdf) \
           || exit 1
  
-@endif target-libffi
+@endif target-winsup
  
-.PHONY: maybe-html-target-libffi html-target-libffi
-maybe-html-target-libffi:
-@if target-libffi
-maybe-html-target-libffi: html-target-libffi
+.PHONY: maybe-html-target-winsup html-target-winsup
+maybe-html-target-winsup:
+@if target-winsup
+maybe-html-target-winsup: html-target-winsup
  
-html-target-libffi: \
-    configure-target-libffi 
+html-target-winsup: \
+    configure-target-winsup 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/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)/libffi" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libffi && \
+       (cd $(TARGET_SUBDIR)/winsup && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38033,25 +42493,25 @@ html-target-libffi: \
                    html) \
           || exit 1
  
-@endif target-libffi
+@endif target-winsup
  
-.PHONY: maybe-TAGS-target-libffi TAGS-target-libffi
-maybe-TAGS-target-libffi:
-@if target-libffi
-maybe-TAGS-target-libffi: TAGS-target-libffi
+.PHONY: maybe-TAGS-target-winsup TAGS-target-winsup
+maybe-TAGS-target-winsup:
+@if target-winsup
+maybe-TAGS-target-winsup: TAGS-target-winsup
  
-TAGS-target-libffi: \
-    configure-target-libffi 
+TAGS-target-winsup: \
+    configure-target-winsup 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/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)/libffi" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libffi && \
+       (cd $(TARGET_SUBDIR)/winsup && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38059,26 +42519,26 @@ TAGS-target-libffi: \
                    TAGS) \
           || exit 1
  
-@endif target-libffi
+@endif target-winsup
  
-.PHONY: maybe-install-info-target-libffi install-info-target-libffi
-maybe-install-info-target-libffi:
-@if target-libffi
-maybe-install-info-target-libffi: install-info-target-libffi
+.PHONY: maybe-install-info-target-winsup install-info-target-winsup
+maybe-install-info-target-winsup:
+@if target-winsup
+maybe-install-info-target-winsup: install-info-target-winsup
  
-install-info-target-libffi: \
-    configure-target-libffi \
-    info-target-libffi 
+install-info-target-winsup: \
+    configure-target-winsup \
+    info-target-winsup 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/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)/libffi" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libffi && \
+       (cd $(TARGET_SUBDIR)/winsup && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38086,26 +42546,26 @@ install-info-target-libffi: \
                    install-info) \
           || exit 1
  
-@endif target-libffi
+@endif target-winsup
  
-.PHONY: maybe-install-pdf-target-libffi install-pdf-target-libffi
-maybe-install-pdf-target-libffi:
-@if target-libffi
-maybe-install-pdf-target-libffi: install-pdf-target-libffi
+.PHONY: maybe-install-pdf-target-winsup install-pdf-target-winsup
+maybe-install-pdf-target-winsup:
+@if target-winsup
+maybe-install-pdf-target-winsup: install-pdf-target-winsup
  
-install-pdf-target-libffi: \
-    configure-target-libffi \
-    pdf-target-libffi 
+install-pdf-target-winsup: \
+    configure-target-winsup \
+    pdf-target-winsup 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/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)/libffi" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libffi && \
+       (cd $(TARGET_SUBDIR)/winsup && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38113,26 +42573,26 @@ install-pdf-target-libffi: \
                    install-pdf) \
           || exit 1
  
-@endif target-libffi
+@endif target-winsup
  
-.PHONY: maybe-install-html-target-libffi install-html-target-libffi
-maybe-install-html-target-libffi:
-@if target-libffi
-maybe-install-html-target-libffi: install-html-target-libffi
+.PHONY: maybe-install-html-target-winsup install-html-target-winsup
+maybe-install-html-target-winsup:
+@if target-winsup
+maybe-install-html-target-winsup: install-html-target-winsup
  
-install-html-target-libffi: \
-    configure-target-libffi \
-    html-target-libffi 
+install-html-target-winsup: \
+    configure-target-winsup \
+    html-target-winsup 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/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)/libffi" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libffi && \
+       (cd $(TARGET_SUBDIR)/winsup && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38140,25 +42600,25 @@ install-html-target-libffi: \
                    install-html) \
           || exit 1
  
-@endif target-libffi
+@endif target-winsup
  
-.PHONY: maybe-installcheck-target-libffi installcheck-target-libffi
-maybe-installcheck-target-libffi:
-@if target-libffi
-maybe-installcheck-target-libffi: installcheck-target-libffi
+.PHONY: maybe-installcheck-target-winsup installcheck-target-winsup
+maybe-installcheck-target-winsup:
+@if target-winsup
+maybe-installcheck-target-winsup: installcheck-target-winsup
  
-installcheck-target-libffi: \
-    configure-target-libffi 
+installcheck-target-winsup: \
+    configure-target-winsup 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/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)/libffi" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libffi && \
+       (cd $(TARGET_SUBDIR)/winsup && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38166,24 +42626,24 @@ installcheck-target-libffi: \
                    installcheck) \
           || exit 1
  
-@endif target-libffi
+@endif target-winsup
  
-.PHONY: maybe-mostlyclean-target-libffi mostlyclean-target-libffi
-maybe-mostlyclean-target-libffi:
-@if target-libffi
-maybe-mostlyclean-target-libffi: mostlyclean-target-libffi
+.PHONY: maybe-mostlyclean-target-winsup mostlyclean-target-winsup
+maybe-mostlyclean-target-winsup:
+@if target-winsup
+maybe-mostlyclean-target-winsup: mostlyclean-target-winsup
  
-mostlyclean-target-libffi: 
+mostlyclean-target-winsup: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/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)/libffi" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libffi && \
+       (cd $(TARGET_SUBDIR)/winsup && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38191,24 +42651,24 @@ mostlyclean-target-libffi:
                    mostlyclean) \
           || exit 1
  
-@endif target-libffi
+@endif target-winsup
  
-.PHONY: maybe-clean-target-libffi clean-target-libffi
-maybe-clean-target-libffi:
-@if target-libffi
-maybe-clean-target-libffi: clean-target-libffi
+.PHONY: maybe-clean-target-winsup clean-target-winsup
+maybe-clean-target-winsup:
+@if target-winsup
+maybe-clean-target-winsup: clean-target-winsup
  
-clean-target-libffi: 
+clean-target-winsup: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/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)/libffi" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libffi && \
+       (cd $(TARGET_SUBDIR)/winsup && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38216,24 +42676,24 @@ clean-target-libffi:
                    clean) \
           || exit 1
  
-@endif target-libffi
+@endif target-winsup
  
-.PHONY: maybe-distclean-target-libffi distclean-target-libffi
-maybe-distclean-target-libffi:
-@if target-libffi
-maybe-distclean-target-libffi: distclean-target-libffi
+.PHONY: maybe-distclean-target-winsup distclean-target-winsup
+maybe-distclean-target-winsup:
+@if target-winsup
+maybe-distclean-target-winsup: distclean-target-winsup
  
-distclean-target-libffi: 
+distclean-target-winsup: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/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)/libffi" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libffi && \
+       (cd $(TARGET_SUBDIR)/winsup && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38241,24 +42701,24 @@ distclean-target-libffi:
                    distclean) \
           || exit 1
  
-@endif target-libffi
+@endif target-winsup
  
-.PHONY: maybe-maintainer-clean-target-libffi maintainer-clean-target-libffi
-maybe-maintainer-clean-target-libffi:
-@if target-libffi
-maybe-maintainer-clean-target-libffi: maintainer-clean-target-libffi
+.PHONY: maybe-maintainer-clean-target-winsup maintainer-clean-target-winsup
+maybe-maintainer-clean-target-winsup:
+@if target-winsup
+maybe-maintainer-clean-target-winsup: maintainer-clean-target-winsup
  
-maintainer-clean-target-libffi: 
+maintainer-clean-target-winsup: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/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)/libffi" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libffi && \
+       (cd $(TARGET_SUBDIR)/winsup && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38266,145 +42726,141 @@ maintainer-clean-target-libffi:
                    maintainer-clean) \
           || exit 1
  
-@endif target-libffi
+@endif target-winsup
  
  
  
  
  
-.PHONY: configure-target-libjava maybe-configure-target-libjava
-maybe-configure-target-libjava:
+.PHONY: configure-target-libgloss maybe-configure-target-libgloss
+maybe-configure-target-libgloss:
  @if gcc-bootstrap
-configure-target-libjava: stage_current
+configure-target-libgloss: stage_current
  @endif gcc-bootstrap
-@if target-libjava
-maybe-configure-target-libjava: configure-target-libjava
-configure-target-libjava: 
+@if target-libgloss
+maybe-configure-target-libgloss: configure-target-libgloss
+configure-target-libgloss: 
         @: $(MAKE); $(unstage)
         @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 ; \
-       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; \
+       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; \
+       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; \
           else \
-           rm -f $(TARGET_SUBDIR)/libjava/Makefile; \
-           mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libgloss/Makefile; \
+           mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
           fi; \
         else \
-         mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \
+         mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
         fi; \
-       test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
-       $(RAW_CXX_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libjava; \
-       cd "$(TARGET_SUBDIR)/libjava" || exit 1; \
+       test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libgloss; \
+       cd "$(TARGET_SUBDIR)/libgloss" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libjava/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libgloss/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libjava"; \
-       libsrcdir="$$s/libjava"; \
+       module_srcdir=libgloss; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} $(EXTRA_CONFIGARGS_LIBJAVA) \
+         --target=${target_alias}  \
           || exit 1
-@endif target-libjava
+@endif target-libgloss
  
  
  
  
  
-.PHONY: all-target-libjava maybe-all-target-libjava
-maybe-all-target-libjava:
+.PHONY: all-target-libgloss maybe-all-target-libgloss
+maybe-all-target-libgloss:
  @if gcc-bootstrap
-all-target-libjava: stage_current
+all-target-libgloss: stage_current
  @endif gcc-bootstrap
-@if target-libjava
-TARGET-target-libjava=all
-maybe-all-target-libjava: all-target-libjava
-all-target-libjava: configure-target-libjava
+@if target-libgloss
+TARGET-target-libgloss=all
+maybe-all-target-libgloss: all-target-libgloss
+all-target-libgloss: configure-target-libgloss
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libjava && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
-               $(TARGET-target-libjava))
-@endif target-libjava
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libgloss && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libgloss))
+@endif target-libgloss
  
  
  
  
  
-.PHONY: check-target-libjava maybe-check-target-libjava
-maybe-check-target-libjava:
-@if target-libjava
-maybe-check-target-libjava: check-target-libjava
+.PHONY: check-target-libgloss maybe-check-target-libgloss
+maybe-check-target-libgloss:
+@if target-libgloss
+maybe-check-target-libgloss: check-target-libgloss
  
-check-target-libjava:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libjava && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
+# Dummy target for uncheckable module.
+check-target-libgloss:
  
-@endif target-libjava
+@endif target-libgloss
  
-.PHONY: install-target-libjava maybe-install-target-libjava
-maybe-install-target-libjava:
-@if target-libjava
-maybe-install-target-libjava: install-target-libjava
+.PHONY: install-target-libgloss maybe-install-target-libgloss
+maybe-install-target-libgloss:
+@if target-libgloss
+maybe-install-target-libgloss: install-target-libgloss
  
-install-target-libjava: installdirs
+install-target-libgloss: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libjava && \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libgloss && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
-@endif target-libjava
+@endif target-libgloss
  
-.PHONY: install-strip-target-libjava maybe-install-strip-target-libjava
-maybe-install-strip-target-libjava:
-@if target-libjava
-maybe-install-strip-target-libjava: install-strip-target-libjava
+.PHONY: install-strip-target-libgloss maybe-install-strip-target-libgloss
+maybe-install-strip-target-libgloss:
+@if target-libgloss
+maybe-install-strip-target-libgloss: install-strip-target-libgloss
  
-install-strip-target-libjava: installdirs
+install-strip-target-libgloss: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libjava && \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libgloss && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
  
-@endif target-libjava
+@endif target-libgloss
  
  # Other targets (info, dvi, pdf, etc.)
  
-.PHONY: maybe-info-target-libjava info-target-libjava
-maybe-info-target-libjava:
-@if target-libjava
-maybe-info-target-libjava: info-target-libjava
+.PHONY: maybe-info-target-libgloss info-target-libgloss
+maybe-info-target-libgloss:
+@if target-libgloss
+maybe-info-target-libgloss: info-target-libgloss
  
-info-target-libjava: \
-    configure-target-libjava 
+info-target-libgloss: \
+    configure-target-libgloss 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/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" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       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; \
-       (cd $(TARGET_SUBDIR)/libjava && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38412,25 +42868,25 @@ info-target-libjava: \
                    info) \
           || exit 1
  
-@endif target-libjava
+@endif target-libgloss
  
-.PHONY: maybe-dvi-target-libjava dvi-target-libjava
-maybe-dvi-target-libjava:
-@if target-libjava
-maybe-dvi-target-libjava: dvi-target-libjava
+.PHONY: maybe-dvi-target-libgloss dvi-target-libgloss
+maybe-dvi-target-libgloss:
+@if target-libgloss
+maybe-dvi-target-libgloss: dvi-target-libgloss
  
-dvi-target-libjava: \
-    configure-target-libjava 
+dvi-target-libgloss: \
+    configure-target-libgloss 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/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" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       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; \
-       (cd $(TARGET_SUBDIR)/libjava && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38438,25 +42894,25 @@ dvi-target-libjava: \
                    dvi) \
           || exit 1
  
-@endif target-libjava
+@endif target-libgloss
  
-.PHONY: maybe-pdf-target-libjava pdf-target-libjava
-maybe-pdf-target-libjava:
-@if target-libjava
-maybe-pdf-target-libjava: pdf-target-libjava
+.PHONY: maybe-pdf-target-libgloss pdf-target-libgloss
+maybe-pdf-target-libgloss:
+@if target-libgloss
+maybe-pdf-target-libgloss: pdf-target-libgloss
  
-pdf-target-libjava: \
-    configure-target-libjava 
+pdf-target-libgloss: \
+    configure-target-libgloss 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/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" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       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; \
-       (cd $(TARGET_SUBDIR)/libjava && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38464,25 +42920,25 @@ pdf-target-libjava: \
                    pdf) \
           || exit 1
  
-@endif target-libjava
+@endif target-libgloss
  
-.PHONY: maybe-html-target-libjava html-target-libjava
-maybe-html-target-libjava:
-@if target-libjava
-maybe-html-target-libjava: html-target-libjava
+.PHONY: maybe-html-target-libgloss html-target-libgloss
+maybe-html-target-libgloss:
+@if target-libgloss
+maybe-html-target-libgloss: html-target-libgloss
  
-html-target-libjava: \
-    configure-target-libjava 
+html-target-libgloss: \
+    configure-target-libgloss 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/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" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       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; \
-       (cd $(TARGET_SUBDIR)/libjava && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38490,25 +42946,25 @@ html-target-libjava: \
                    html) \
           || exit 1
  
-@endif target-libjava
+@endif target-libgloss
  
-.PHONY: maybe-TAGS-target-libjava TAGS-target-libjava
-maybe-TAGS-target-libjava:
-@if target-libjava
-maybe-TAGS-target-libjava: TAGS-target-libjava
+.PHONY: maybe-TAGS-target-libgloss TAGS-target-libgloss
+maybe-TAGS-target-libgloss:
+@if target-libgloss
+maybe-TAGS-target-libgloss: TAGS-target-libgloss
  
-TAGS-target-libjava: \
-    configure-target-libjava 
+TAGS-target-libgloss: \
+    configure-target-libgloss 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/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" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       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; \
-       (cd $(TARGET_SUBDIR)/libjava && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38516,26 +42972,26 @@ TAGS-target-libjava: \
                    TAGS) \
           || exit 1
  
-@endif target-libjava
+@endif target-libgloss
  
-.PHONY: maybe-install-info-target-libjava install-info-target-libjava
-maybe-install-info-target-libjava:
-@if target-libjava
-maybe-install-info-target-libjava: install-info-target-libjava
+.PHONY: maybe-install-info-target-libgloss install-info-target-libgloss
+maybe-install-info-target-libgloss:
+@if target-libgloss
+maybe-install-info-target-libgloss: install-info-target-libgloss
  
-install-info-target-libjava: \
-    configure-target-libjava \
-    info-target-libjava 
+install-info-target-libgloss: \
+    configure-target-libgloss \
+    info-target-libgloss 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/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" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       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; \
-       (cd $(TARGET_SUBDIR)/libjava && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38543,26 +42999,26 @@ install-info-target-libjava: \
                    install-info) \
           || exit 1
  
-@endif target-libjava
+@endif target-libgloss
  
-.PHONY: maybe-install-pdf-target-libjava install-pdf-target-libjava
-maybe-install-pdf-target-libjava:
-@if target-libjava
-maybe-install-pdf-target-libjava: install-pdf-target-libjava
+.PHONY: maybe-install-pdf-target-libgloss install-pdf-target-libgloss
+maybe-install-pdf-target-libgloss:
+@if target-libgloss
+maybe-install-pdf-target-libgloss: install-pdf-target-libgloss
  
-install-pdf-target-libjava: \
-    configure-target-libjava \
-    pdf-target-libjava 
+install-pdf-target-libgloss: \
+    configure-target-libgloss \
+    pdf-target-libgloss 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/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" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       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; \
-       (cd $(TARGET_SUBDIR)/libjava && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38570,26 +43026,26 @@ install-pdf-target-libjava: \
                    install-pdf) \
           || exit 1
  
-@endif target-libjava
+@endif target-libgloss
  
-.PHONY: maybe-install-html-target-libjava install-html-target-libjava
-maybe-install-html-target-libjava:
-@if target-libjava
-maybe-install-html-target-libjava: install-html-target-libjava
+.PHONY: maybe-install-html-target-libgloss install-html-target-libgloss
+maybe-install-html-target-libgloss:
+@if target-libgloss
+maybe-install-html-target-libgloss: install-html-target-libgloss
  
-install-html-target-libjava: \
-    configure-target-libjava \
-    html-target-libjava 
+install-html-target-libgloss: \
+    configure-target-libgloss \
+    html-target-libgloss 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/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" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       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; \
-       (cd $(TARGET_SUBDIR)/libjava && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38597,25 +43053,25 @@ install-html-target-libjava: \
                    install-html) \
           || exit 1
  
-@endif target-libjava
+@endif target-libgloss
  
-.PHONY: maybe-installcheck-target-libjava installcheck-target-libjava
-maybe-installcheck-target-libjava:
-@if target-libjava
-maybe-installcheck-target-libjava: installcheck-target-libjava
+.PHONY: maybe-installcheck-target-libgloss installcheck-target-libgloss
+maybe-installcheck-target-libgloss:
+@if target-libgloss
+maybe-installcheck-target-libgloss: installcheck-target-libgloss
  
-installcheck-target-libjava: \
-    configure-target-libjava 
+installcheck-target-libgloss: \
+    configure-target-libgloss 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/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" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       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; \
-       (cd $(TARGET_SUBDIR)/libjava && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38623,24 +43079,24 @@ installcheck-target-libjava: \
                    installcheck) \
           || exit 1
  
-@endif target-libjava
+@endif target-libgloss
  
-.PHONY: maybe-mostlyclean-target-libjava mostlyclean-target-libjava
-maybe-mostlyclean-target-libjava:
-@if target-libjava
-maybe-mostlyclean-target-libjava: mostlyclean-target-libjava
+.PHONY: maybe-mostlyclean-target-libgloss mostlyclean-target-libgloss
+maybe-mostlyclean-target-libgloss:
+@if target-libgloss
+maybe-mostlyclean-target-libgloss: mostlyclean-target-libgloss
  
-mostlyclean-target-libjava: 
+mostlyclean-target-libgloss: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/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" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       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; \
-       (cd $(TARGET_SUBDIR)/libjava && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38648,24 +43104,24 @@ mostlyclean-target-libjava:
                    mostlyclean) \
           || exit 1
  
-@endif target-libjava
+@endif target-libgloss
  
-.PHONY: maybe-clean-target-libjava clean-target-libjava
-maybe-clean-target-libjava:
-@if target-libjava
-maybe-clean-target-libjava: clean-target-libjava
+.PHONY: maybe-clean-target-libgloss clean-target-libgloss
+maybe-clean-target-libgloss:
+@if target-libgloss
+maybe-clean-target-libgloss: clean-target-libgloss
  
-clean-target-libjava: 
+clean-target-libgloss: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/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" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       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; \
-       (cd $(TARGET_SUBDIR)/libjava && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38673,24 +43129,24 @@ clean-target-libjava:
                    clean) \
           || exit 1
  
-@endif target-libjava
+@endif target-libgloss
  
-.PHONY: maybe-distclean-target-libjava distclean-target-libjava
-maybe-distclean-target-libjava:
-@if target-libjava
-maybe-distclean-target-libjava: distclean-target-libjava
+.PHONY: maybe-distclean-target-libgloss distclean-target-libgloss
+maybe-distclean-target-libgloss:
+@if target-libgloss
+maybe-distclean-target-libgloss: distclean-target-libgloss
  
-distclean-target-libjava: 
+distclean-target-libgloss: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/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" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       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; \
-       (cd $(TARGET_SUBDIR)/libjava && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38698,24 +43154,24 @@ distclean-target-libjava:
                    distclean) \
           || exit 1
  
-@endif target-libjava
+@endif target-libgloss
  
-.PHONY: maybe-maintainer-clean-target-libjava maintainer-clean-target-libjava
-maybe-maintainer-clean-target-libjava:
-@if target-libjava
-maybe-maintainer-clean-target-libjava: maintainer-clean-target-libjava
+.PHONY: maybe-maintainer-clean-target-libgloss maintainer-clean-target-libgloss
+maybe-maintainer-clean-target-libgloss:
+@if target-libgloss
+maybe-maintainer-clean-target-libgloss: maintainer-clean-target-libgloss
  
-maintainer-clean-target-libjava: 
+maintainer-clean-target-libgloss: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/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" ; \
+       $(NORMAL_TARGET_EXPORTS) \
+       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; \
-       (cd $(TARGET_SUBDIR)/libjava && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38723,145 +43179,136 @@ maintainer-clean-target-libjava:
                    maintainer-clean) \
           || exit 1
  
-@endif target-libjava
+@endif target-libgloss
  
  
  
  
  
-.PHONY: configure-target-zlib maybe-configure-target-zlib
-maybe-configure-target-zlib:
+.PHONY: configure-target-libffi maybe-configure-target-libffi
+maybe-configure-target-libffi:
  @if gcc-bootstrap
-configure-target-zlib: stage_current
+configure-target-libffi: stage_current
  @endif gcc-bootstrap
-@if target-zlib
-maybe-configure-target-zlib: configure-target-zlib
-configure-target-zlib: 
+@if target-libffi
+maybe-configure-target-libffi: configure-target-libffi
+configure-target-libffi: 
         @: $(MAKE); $(unstage)
         @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 ; \
-       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; \
+       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; \
+       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; \
           else \
-           rm -f $(TARGET_SUBDIR)/zlib/Makefile; \
-           mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libffi/Makefile; \
+           mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \
           fi; \
         else \
-         mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; \
+         mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \
         fi; \
-       test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
+       test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi; \
         $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/zlib; \
-       cd "$(TARGET_SUBDIR)/zlib" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/libffi; \
+       cd "$(TARGET_SUBDIR)/libffi" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/zlib/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libffi/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
+       module_srcdir=libffi; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
-@endif target-zlib
+@endif target-libffi
  
  
  
  
  
-.PHONY: all-target-zlib maybe-all-target-zlib
-maybe-all-target-zlib:
+.PHONY: all-target-libffi maybe-all-target-libffi
+maybe-all-target-libffi:
  @if gcc-bootstrap
-all-target-zlib: stage_current
+all-target-libffi: stage_current
  @endif gcc-bootstrap
-@if target-zlib
-TARGET-target-zlib=all
-maybe-all-target-zlib: all-target-zlib
-all-target-zlib: configure-target-zlib
+@if target-libffi
+TARGET-target-libffi=all
+maybe-all-target-libffi: all-target-libffi
+all-target-libffi: configure-target-libffi
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/zlib && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-zlib))
-@endif target-zlib
+       (cd $(TARGET_SUBDIR)/libffi && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libffi))
+@endif target-libffi
  
  
  
  
  
-.PHONY: check-target-zlib maybe-check-target-zlib
-maybe-check-target-zlib:
-@if target-zlib
-maybe-check-target-zlib: check-target-zlib
+.PHONY: check-target-libffi maybe-check-target-libffi
+maybe-check-target-libffi:
+@if target-libffi
+maybe-check-target-libffi: check-target-libffi
  
-check-target-zlib:
+check-target-libffi:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/libffi && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
-@endif target-zlib
+@endif target-libffi
  
-.PHONY: install-target-zlib maybe-install-target-zlib
-maybe-install-target-zlib:
-@if target-zlib
-maybe-install-target-zlib: install-target-zlib
+.PHONY: install-target-libffi maybe-install-target-libffi
+maybe-install-target-libffi:
+@if target-libffi
+maybe-install-target-libffi: install-target-libffi
  
-install-target-zlib: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/zlib && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+# Dummy target for uninstallable.
+install-target-libffi:
  
-@endif target-zlib
+@endif target-libffi
  
-.PHONY: install-strip-target-zlib maybe-install-strip-target-zlib
-maybe-install-strip-target-zlib:
-@if target-zlib
-maybe-install-strip-target-zlib: install-strip-target-zlib
+.PHONY: install-strip-target-libffi maybe-install-strip-target-libffi
+maybe-install-strip-target-libffi:
+@if target-libffi
+maybe-install-strip-target-libffi: install-strip-target-libffi
  
-install-strip-target-zlib: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/zlib && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+# Dummy target for uninstallable.
+install-strip-target-libffi:
  
-@endif target-zlib
+@endif target-libffi
  
  # Other targets (info, dvi, pdf, etc.)
  
-.PHONY: maybe-info-target-zlib info-target-zlib
-maybe-info-target-zlib:
-@if target-zlib
-maybe-info-target-zlib: info-target-zlib
+.PHONY: maybe-info-target-libffi info-target-libffi
+maybe-info-target-libffi:
+@if target-libffi
+maybe-info-target-libffi: info-target-libffi
  
-info-target-zlib: \
-    configure-target-zlib 
+info-target-libffi: \
+    configure-target-libffi 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/libffi && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38869,25 +43316,25 @@ info-target-zlib: \
                    info) \
           || exit 1
  
-@endif target-zlib
+@endif target-libffi
  
-.PHONY: maybe-dvi-target-zlib dvi-target-zlib
-maybe-dvi-target-zlib:
-@if target-zlib
-maybe-dvi-target-zlib: dvi-target-zlib
+.PHONY: maybe-dvi-target-libffi dvi-target-libffi
+maybe-dvi-target-libffi:
+@if target-libffi
+maybe-dvi-target-libffi: dvi-target-libffi
  
-dvi-target-zlib: \
-    configure-target-zlib 
+dvi-target-libffi: \
+    configure-target-libffi 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/libffi && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38895,25 +43342,25 @@ dvi-target-zlib: \
                    dvi) \
           || exit 1
  
-@endif target-zlib
+@endif target-libffi
  
-.PHONY: maybe-pdf-target-zlib pdf-target-zlib
-maybe-pdf-target-zlib:
-@if target-zlib
-maybe-pdf-target-zlib: pdf-target-zlib
+.PHONY: maybe-pdf-target-libffi pdf-target-libffi
+maybe-pdf-target-libffi:
+@if target-libffi
+maybe-pdf-target-libffi: pdf-target-libffi
  
-pdf-target-zlib: \
-    configure-target-zlib 
+pdf-target-libffi: \
+    configure-target-libffi 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/libffi && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38921,25 +43368,25 @@ pdf-target-zlib: \
                    pdf) \
           || exit 1
  
-@endif target-zlib
+@endif target-libffi
  
-.PHONY: maybe-html-target-zlib html-target-zlib
-maybe-html-target-zlib:
-@if target-zlib
-maybe-html-target-zlib: html-target-zlib
+.PHONY: maybe-html-target-libffi html-target-libffi
+maybe-html-target-libffi:
+@if target-libffi
+maybe-html-target-libffi: html-target-libffi
  
-html-target-zlib: \
-    configure-target-zlib 
+html-target-libffi: \
+    configure-target-libffi 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/libffi && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38947,25 +43394,25 @@ html-target-zlib: \
                    html) \
           || exit 1
  
-@endif target-zlib
+@endif target-libffi
  
-.PHONY: maybe-TAGS-target-zlib TAGS-target-zlib
-maybe-TAGS-target-zlib:
-@if target-zlib
-maybe-TAGS-target-zlib: TAGS-target-zlib
+.PHONY: maybe-TAGS-target-libffi TAGS-target-libffi
+maybe-TAGS-target-libffi:
+@if target-libffi
+maybe-TAGS-target-libffi: TAGS-target-libffi
  
-TAGS-target-zlib: \
-    configure-target-zlib 
+TAGS-target-libffi: \
+    configure-target-libffi 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/libffi && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -38973,26 +43420,26 @@ TAGS-target-zlib: \
                    TAGS) \
           || exit 1
  
-@endif target-zlib
+@endif target-libffi
  
-.PHONY: maybe-install-info-target-zlib install-info-target-zlib
-maybe-install-info-target-zlib:
-@if target-zlib
-maybe-install-info-target-zlib: install-info-target-zlib
+.PHONY: maybe-install-info-target-libffi install-info-target-libffi
+maybe-install-info-target-libffi:
+@if target-libffi
+maybe-install-info-target-libffi: install-info-target-libffi
  
-install-info-target-zlib: \
-    configure-target-zlib \
-    info-target-zlib 
+install-info-target-libffi: \
+    configure-target-libffi \
+    info-target-libffi 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/libffi && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -39000,26 +43447,26 @@ install-info-target-zlib: \
                    install-info) \
           || exit 1
  
-@endif target-zlib
+@endif target-libffi
  
-.PHONY: maybe-install-pdf-target-zlib install-pdf-target-zlib
-maybe-install-pdf-target-zlib:
-@if target-zlib
-maybe-install-pdf-target-zlib: install-pdf-target-zlib
+.PHONY: maybe-install-pdf-target-libffi install-pdf-target-libffi
+maybe-install-pdf-target-libffi:
+@if target-libffi
+maybe-install-pdf-target-libffi: install-pdf-target-libffi
  
-install-pdf-target-zlib: \
-    configure-target-zlib \
-    pdf-target-zlib 
+install-pdf-target-libffi: \
+    configure-target-libffi \
+    pdf-target-libffi 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/libffi && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -39027,26 +43474,26 @@ install-pdf-target-zlib: \
                    install-pdf) \
           || exit 1
  
-@endif target-zlib
+@endif target-libffi
  
-.PHONY: maybe-install-html-target-zlib install-html-target-zlib
-maybe-install-html-target-zlib:
-@if target-zlib
-maybe-install-html-target-zlib: install-html-target-zlib
+.PHONY: maybe-install-html-target-libffi install-html-target-libffi
+maybe-install-html-target-libffi:
+@if target-libffi
+maybe-install-html-target-libffi: install-html-target-libffi
  
-install-html-target-zlib: \
-    configure-target-zlib \
-    html-target-zlib 
+install-html-target-libffi: \
+    configure-target-libffi \
+    html-target-libffi 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/libffi && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -39054,25 +43501,25 @@ install-html-target-zlib: \
                    install-html) \
           || exit 1
  
-@endif target-zlib
+@endif target-libffi
  
-.PHONY: maybe-installcheck-target-zlib installcheck-target-zlib
-maybe-installcheck-target-zlib:
-@if target-zlib
-maybe-installcheck-target-zlib: installcheck-target-zlib
+.PHONY: maybe-installcheck-target-libffi installcheck-target-libffi
+maybe-installcheck-target-libffi:
+@if target-libffi
+maybe-installcheck-target-libffi: installcheck-target-libffi
  
-installcheck-target-zlib: \
-    configure-target-zlib 
+installcheck-target-libffi: \
+    configure-target-libffi 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/libffi && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -39080,24 +43527,24 @@ installcheck-target-zlib: \
                    installcheck) \
           || exit 1
  
-@endif target-zlib
+@endif target-libffi
  
-.PHONY: maybe-mostlyclean-target-zlib mostlyclean-target-zlib
-maybe-mostlyclean-target-zlib:
-@if target-zlib
-maybe-mostlyclean-target-zlib: mostlyclean-target-zlib
+.PHONY: maybe-mostlyclean-target-libffi mostlyclean-target-libffi
+maybe-mostlyclean-target-libffi:
+@if target-libffi
+maybe-mostlyclean-target-libffi: mostlyclean-target-libffi
  
-mostlyclean-target-zlib: 
+mostlyclean-target-libffi: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/libffi && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -39105,24 +43552,24 @@ mostlyclean-target-zlib:
                    mostlyclean) \
           || exit 1
  
-@endif target-zlib
+@endif target-libffi
  
-.PHONY: maybe-clean-target-zlib clean-target-zlib
-maybe-clean-target-zlib:
-@if target-zlib
-maybe-clean-target-zlib: clean-target-zlib
+.PHONY: maybe-clean-target-libffi clean-target-libffi
+maybe-clean-target-libffi:
+@if target-libffi
+maybe-clean-target-libffi: clean-target-libffi
  
-clean-target-zlib: 
+clean-target-libffi: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/libffi && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -39130,24 +43577,24 @@ clean-target-zlib:
                    clean) \
           || exit 1
  
-@endif target-zlib
+@endif target-libffi
  
-.PHONY: maybe-distclean-target-zlib distclean-target-zlib
-maybe-distclean-target-zlib:
-@if target-zlib
-maybe-distclean-target-zlib: distclean-target-zlib
+.PHONY: maybe-distclean-target-libffi distclean-target-libffi
+maybe-distclean-target-libffi:
+@if target-libffi
+maybe-distclean-target-libffi: distclean-target-libffi
  
-distclean-target-zlib: 
+distclean-target-libffi: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/libffi && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -39155,24 +43602,24 @@ distclean-target-zlib:
                    distclean) \
           || exit 1
  
-@endif target-zlib
+@endif target-libffi
  
-.PHONY: maybe-maintainer-clean-target-zlib maintainer-clean-target-zlib
-maybe-maintainer-clean-target-zlib:
-@if target-zlib
-maybe-maintainer-clean-target-zlib: maintainer-clean-target-zlib
+.PHONY: maybe-maintainer-clean-target-libffi maintainer-clean-target-libffi
+maybe-maintainer-clean-target-libffi:
+@if target-libffi
+maybe-maintainer-clean-target-libffi: maintainer-clean-target-libffi
  
-maintainer-clean-target-zlib: 
+maintainer-clean-target-libffi: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/libffi && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -39180,145 +43627,146 @@ maintainer-clean-target-zlib:
                    maintainer-clean) \
           || exit 1
  
-@endif target-zlib
+@endif target-libffi
  
  
  
  
  
-.PHONY: configure-target-boehm-gc maybe-configure-target-boehm-gc
-maybe-configure-target-boehm-gc:
+.PHONY: configure-target-zlib maybe-configure-target-zlib
+maybe-configure-target-zlib:
  @if gcc-bootstrap
-configure-target-boehm-gc: stage_current
+configure-target-zlib: stage_current
  @endif gcc-bootstrap
-@if target-boehm-gc
-maybe-configure-target-boehm-gc: configure-target-boehm-gc
-configure-target-boehm-gc: 
+@if target-zlib
+maybe-configure-target-zlib: configure-target-zlib
+configure-target-zlib: 
         @: $(MAKE); $(unstage)
         @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 ; \
-       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; \
+       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; \
+       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; \
           else \
-           rm -f $(TARGET_SUBDIR)/boehm-gc/Makefile; \
-           mv $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/zlib/Makefile; \
+           mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; \
           fi; \
         else \
-         mv $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; \
+         mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; \
         fi; \
-       test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
+       test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib; \
         $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/boehm-gc; \
-       cd "$(TARGET_SUBDIR)/boehm-gc" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/zlib; \
+       cd "$(TARGET_SUBDIR)/zlib" || exit 1; \
         case $(srcdir) in \
           /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/boehm-gc/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/zlib/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/boehm-gc"; \
-       libsrcdir="$$s/boehm-gc"; \
+       module_srcdir=zlib; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
-@endif target-boehm-gc
+@endif target-zlib
  
  
  
  
  
-.PHONY: all-target-boehm-gc maybe-all-target-boehm-gc
-maybe-all-target-boehm-gc:
+.PHONY: all-target-zlib maybe-all-target-zlib
+maybe-all-target-zlib:
  @if gcc-bootstrap
-all-target-boehm-gc: stage_current
+all-target-zlib: stage_current
  @endif gcc-bootstrap
-@if target-boehm-gc
-TARGET-target-boehm-gc=all
-maybe-all-target-boehm-gc: all-target-boehm-gc
-all-target-boehm-gc: configure-target-boehm-gc
+@if target-zlib
+TARGET-target-zlib=all
+maybe-all-target-zlib: all-target-zlib
+all-target-zlib: configure-target-zlib
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-boehm-gc))
-@endif target-boehm-gc
+       (cd $(TARGET_SUBDIR)/zlib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-zlib))
+@endif target-zlib
  
  
  
  
  
-.PHONY: check-target-boehm-gc maybe-check-target-boehm-gc
-maybe-check-target-boehm-gc:
-@if target-boehm-gc
-maybe-check-target-boehm-gc: check-target-boehm-gc
+.PHONY: check-target-zlib maybe-check-target-zlib
+maybe-check-target-zlib:
+@if target-zlib
+maybe-check-target-zlib: check-target-zlib
  
-check-target-boehm-gc:
+check-target-zlib:
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/zlib && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
  
-@endif target-boehm-gc
+@endif target-zlib
  
-.PHONY: install-target-boehm-gc maybe-install-target-boehm-gc
-maybe-install-target-boehm-gc:
-@if target-boehm-gc
-maybe-install-target-boehm-gc: install-target-boehm-gc
+.PHONY: install-target-zlib maybe-install-target-zlib
+maybe-install-target-zlib:
+@if target-zlib
+maybe-install-target-zlib: install-target-zlib
  
-install-target-boehm-gc: installdirs
+install-target-zlib: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/zlib && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
  
-@endif target-boehm-gc
+@endif target-zlib
  
-.PHONY: install-strip-target-boehm-gc maybe-install-strip-target-boehm-gc
-maybe-install-strip-target-boehm-gc:
-@if target-boehm-gc
-maybe-install-strip-target-boehm-gc: install-strip-target-boehm-gc
+.PHONY: install-strip-target-zlib maybe-install-strip-target-zlib
+maybe-install-strip-target-zlib:
+@if target-zlib
+maybe-install-strip-target-zlib: install-strip-target-zlib
  
-install-strip-target-boehm-gc: installdirs
+install-strip-target-zlib: installdirs
         @: $(MAKE); $(unstage)
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/zlib && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
  
-@endif target-boehm-gc
+@endif target-zlib
  
  # Other targets (info, dvi, pdf, etc.)
  
-.PHONY: maybe-info-target-boehm-gc info-target-boehm-gc
-maybe-info-target-boehm-gc:
-@if target-boehm-gc
-maybe-info-target-boehm-gc: info-target-boehm-gc
+.PHONY: maybe-info-target-zlib info-target-zlib
+maybe-info-target-zlib:
+@if target-zlib
+maybe-info-target-zlib: info-target-zlib
  
-info-target-boehm-gc: \
-    configure-target-boehm-gc 
+info-target-zlib: \
+    configure-target-zlib 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -39326,25 +43774,25 @@ info-target-boehm-gc: \
                    info) \
           || exit 1
  
-@endif target-boehm-gc
+@endif target-zlib
  
-.PHONY: maybe-dvi-target-boehm-gc dvi-target-boehm-gc
-maybe-dvi-target-boehm-gc:
-@if target-boehm-gc
-maybe-dvi-target-boehm-gc: dvi-target-boehm-gc
+.PHONY: maybe-dvi-target-zlib dvi-target-zlib
+maybe-dvi-target-zlib:
+@if target-zlib
+maybe-dvi-target-zlib: dvi-target-zlib
  
-dvi-target-boehm-gc: \
-    configure-target-boehm-gc 
+dvi-target-zlib: \
+    configure-target-zlib 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -39352,25 +43800,25 @@ dvi-target-boehm-gc: \
                    dvi) \
           || exit 1
  
-@endif target-boehm-gc
+@endif target-zlib
  
-.PHONY: maybe-pdf-target-boehm-gc pdf-target-boehm-gc
-maybe-pdf-target-boehm-gc:
-@if target-boehm-gc
-maybe-pdf-target-boehm-gc: pdf-target-boehm-gc
+.PHONY: maybe-pdf-target-zlib pdf-target-zlib
+maybe-pdf-target-zlib:
+@if target-zlib
+maybe-pdf-target-zlib: pdf-target-zlib
  
-pdf-target-boehm-gc: \
-    configure-target-boehm-gc 
+pdf-target-zlib: \
+    configure-target-zlib 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -39378,25 +43826,25 @@ pdf-target-boehm-gc: \
                    pdf) \
           || exit 1
  
-@endif target-boehm-gc
+@endif target-zlib
  
-.PHONY: maybe-html-target-boehm-gc html-target-boehm-gc
-maybe-html-target-boehm-gc:
-@if target-boehm-gc
-maybe-html-target-boehm-gc: html-target-boehm-gc
+.PHONY: maybe-html-target-zlib html-target-zlib
+maybe-html-target-zlib:
+@if target-zlib
+maybe-html-target-zlib: html-target-zlib
  
-html-target-boehm-gc: \
-    configure-target-boehm-gc 
+html-target-zlib: \
+    configure-target-zlib 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -39404,25 +43852,25 @@ html-target-boehm-gc: \
                    html) \
           || exit 1
  
-@endif target-boehm-gc
+@endif target-zlib
  
-.PHONY: maybe-TAGS-target-boehm-gc TAGS-target-boehm-gc
-maybe-TAGS-target-boehm-gc:
-@if target-boehm-gc
-maybe-TAGS-target-boehm-gc: TAGS-target-boehm-gc
+.PHONY: maybe-TAGS-target-zlib TAGS-target-zlib
+maybe-TAGS-target-zlib:
+@if target-zlib
+maybe-TAGS-target-zlib: TAGS-target-zlib
  
-TAGS-target-boehm-gc: \
-    configure-target-boehm-gc 
+TAGS-target-zlib: \
+    configure-target-zlib 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -39430,26 +43878,26 @@ TAGS-target-boehm-gc: \
                    TAGS) \
           || exit 1
  
-@endif target-boehm-gc
+@endif target-zlib
  
-.PHONY: maybe-install-info-target-boehm-gc install-info-target-boehm-gc
-maybe-install-info-target-boehm-gc:
-@if target-boehm-gc
-maybe-install-info-target-boehm-gc: install-info-target-boehm-gc
+.PHONY: maybe-install-info-target-zlib install-info-target-zlib
+maybe-install-info-target-zlib:
+@if target-zlib
+maybe-install-info-target-zlib: install-info-target-zlib
  
-install-info-target-boehm-gc: \
-    configure-target-boehm-gc \
-    info-target-boehm-gc 
+install-info-target-zlib: \
+    configure-target-zlib \
+    info-target-zlib 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -39457,26 +43905,26 @@ install-info-target-boehm-gc: \
                    install-info) \
           || exit 1
  
-@endif target-boehm-gc
+@endif target-zlib
  
-.PHONY: maybe-install-pdf-target-boehm-gc install-pdf-target-boehm-gc
-maybe-install-pdf-target-boehm-gc:
-@if target-boehm-gc
-maybe-install-pdf-target-boehm-gc: install-pdf-target-boehm-gc
+.PHONY: maybe-install-pdf-target-zlib install-pdf-target-zlib
+maybe-install-pdf-target-zlib:
+@if target-zlib
+maybe-install-pdf-target-zlib: install-pdf-target-zlib
  
-install-pdf-target-boehm-gc: \
-    configure-target-boehm-gc \
-    pdf-target-boehm-gc 
+install-pdf-target-zlib: \
+    configure-target-zlib \
+    pdf-target-zlib 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -39484,26 +43932,26 @@ install-pdf-target-boehm-gc: \
                    install-pdf) \
           || exit 1
  
-@endif target-boehm-gc
+@endif target-zlib
  
-.PHONY: maybe-install-html-target-boehm-gc install-html-target-boehm-gc
-maybe-install-html-target-boehm-gc:
-@if target-boehm-gc
-maybe-install-html-target-boehm-gc: install-html-target-boehm-gc
+.PHONY: maybe-install-html-target-zlib install-html-target-zlib
+maybe-install-html-target-zlib:
+@if target-zlib
+maybe-install-html-target-zlib: install-html-target-zlib
  
-install-html-target-boehm-gc: \
-    configure-target-boehm-gc \
-    html-target-boehm-gc 
+install-html-target-zlib: \
+    configure-target-zlib \
+    html-target-zlib 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -39511,25 +43959,25 @@ install-html-target-boehm-gc: \
                    install-html) \
           || exit 1
  
-@endif target-boehm-gc
+@endif target-zlib
  
-.PHONY: maybe-installcheck-target-boehm-gc installcheck-target-boehm-gc
-maybe-installcheck-target-boehm-gc:
-@if target-boehm-gc
-maybe-installcheck-target-boehm-gc: installcheck-target-boehm-gc
+.PHONY: maybe-installcheck-target-zlib installcheck-target-zlib
+maybe-installcheck-target-zlib:
+@if target-zlib
+maybe-installcheck-target-zlib: installcheck-target-zlib
  
-installcheck-target-boehm-gc: \
-    configure-target-boehm-gc 
+installcheck-target-zlib: \
+    configure-target-zlib 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -39537,24 +43985,24 @@ installcheck-target-boehm-gc: \
                    installcheck) \
           || exit 1
  
-@endif target-boehm-gc
+@endif target-zlib
  
-.PHONY: maybe-mostlyclean-target-boehm-gc mostlyclean-target-boehm-gc
-maybe-mostlyclean-target-boehm-gc:
-@if target-boehm-gc
-maybe-mostlyclean-target-boehm-gc: mostlyclean-target-boehm-gc
+.PHONY: maybe-mostlyclean-target-zlib mostlyclean-target-zlib
+maybe-mostlyclean-target-zlib:
+@if target-zlib
+maybe-mostlyclean-target-zlib: mostlyclean-target-zlib
  
-mostlyclean-target-boehm-gc: 
+mostlyclean-target-zlib: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -39562,24 +44010,24 @@ mostlyclean-target-boehm-gc:
                    mostlyclean) \
           || exit 1
  
-@endif target-boehm-gc
+@endif target-zlib
  
-.PHONY: maybe-clean-target-boehm-gc clean-target-boehm-gc
-maybe-clean-target-boehm-gc:
-@if target-boehm-gc
-maybe-clean-target-boehm-gc: clean-target-boehm-gc
+.PHONY: maybe-clean-target-zlib clean-target-zlib
+maybe-clean-target-zlib:
+@if target-zlib
+maybe-clean-target-zlib: clean-target-zlib
  
-clean-target-boehm-gc: 
+clean-target-zlib: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -39587,24 +44035,24 @@ clean-target-boehm-gc:
                    clean) \
           || exit 1
  
-@endif target-boehm-gc
+@endif target-zlib
  
-.PHONY: maybe-distclean-target-boehm-gc distclean-target-boehm-gc
-maybe-distclean-target-boehm-gc:
-@if target-boehm-gc
-maybe-distclean-target-boehm-gc: distclean-target-boehm-gc
+.PHONY: maybe-distclean-target-zlib distclean-target-zlib
+maybe-distclean-target-zlib:
+@if target-zlib
+maybe-distclean-target-zlib: distclean-target-zlib
  
-distclean-target-boehm-gc: 
+distclean-target-zlib: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -39612,24 +44060,24 @@ distclean-target-boehm-gc:
                    distclean) \
           || exit 1
  
-@endif target-boehm-gc
+@endif target-zlib
  
-.PHONY: maybe-maintainer-clean-target-boehm-gc maintainer-clean-target-boehm-gc
-maybe-maintainer-clean-target-boehm-gc:
-@if target-boehm-gc
-maybe-maintainer-clean-target-boehm-gc: maintainer-clean-target-boehm-gc
+.PHONY: maybe-maintainer-clean-target-zlib maintainer-clean-target-zlib
+maybe-maintainer-clean-target-zlib:
+@if target-zlib
+maybe-maintainer-clean-target-zlib: maintainer-clean-target-zlib
  
-maintainer-clean-target-boehm-gc: 
+maintainer-clean-target-zlib: 
         @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/zlib && \
           $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                   "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                   "RANLIB=$${RANLIB}" \
@@ -39637,7 +44085,7 @@ maintainer-clean-target-boehm-gc:
                    maintainer-clean) \
           || exit 1
  
-@endif target-boehm-gc
+@endif target-zlib
  
  
  
@@ -39655,8 +44103,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; \
@@ -39668,7 +44116,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; \
@@ -39677,12 +44125,13 @@ configure-target-rda:
           *) topdir=`echo $(TARGET_SUBDIR)/rda/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/rda"; \
-       libsrcdir="$$s/rda"; \
+       module_srcdir=rda; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif target-rda
  
@@ -39704,7 +44153,7 @@ all-target-rda: configure-target-rda
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS)  \
         (cd $(TARGET_SUBDIR)/rda && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                 $(TARGET-target-rda))
  @endif target-rda
  
@@ -39767,11 +44216,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; \
@@ -39793,11 +44242,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; \
@@ -39819,11 +44268,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; \
@@ -39845,11 +44294,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; \
@@ -39871,11 +44320,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; \
@@ -39898,11 +44347,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; \
@@ -39925,11 +44374,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; \
@@ -39952,11 +44401,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; \
@@ -39978,11 +44427,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; \
@@ -40003,11 +44452,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; \
@@ -40028,11 +44477,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; \
@@ -40053,11 +44502,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; \
@@ -40078,11 +44527,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; \
@@ -40112,8 +44561,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; \
@@ -40125,7 +44574,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; \
@@ -40134,12 +44583,13 @@ configure-target-libada:
           *) topdir=`echo $(TARGET_SUBDIR)/libada/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libada"; \
-       libsrcdir="$$s/libada"; \
+       module_srcdir=libada; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif target-libada
  
@@ -40161,7 +44611,7 @@ all-target-libada: configure-target-libada
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS)  \
         (cd $(TARGET_SUBDIR)/libada && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                 $(TARGET-target-libada))
  @endif target-libada
  
@@ -40224,11 +44674,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; \
@@ -40250,11 +44700,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; \
@@ -40276,11 +44726,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; \
@@ -40302,11 +44752,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; \
@@ -40328,11 +44778,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; \
@@ -40355,11 +44805,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; \
@@ -40382,11 +44832,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; \
@@ -40409,11 +44859,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; \
@@ -40435,11 +44885,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; \
@@ -40460,11 +44910,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; \
@@ -40485,11 +44935,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; \
@@ -40510,11 +44960,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; \
@@ -40535,11 +44985,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; \
@@ -40568,8 +45018,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; \
@@ -40581,7 +45031,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; \
@@ -40590,12 +45040,13 @@ configure-target-libgomp:
           *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libgomp"; \
-       libsrcdir="$$s/libgomp"; \
+       module_srcdir=libgomp; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif target-libgomp
  
@@ -40612,7 +45063,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; \
@@ -40628,19 +45079,20 @@ 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) ;; \
           *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libgomp"; \
-       libsrcdir="$$s/libgomp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgomp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
           $(STAGE1_CONFIGURE_FLAGS)
  @endif target-libgomp-bootstrap
  
@@ -40655,7 +45107,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; \
@@ -40672,19 +45124,19 @@ 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) ;; \
           *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libgomp"; \
-       libsrcdir="$$s/libgomp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgomp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE2_CONFIGURE_FLAGS)
  @endif target-libgomp-bootstrap
@@ -40700,7 +45152,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; \
@@ -40717,19 +45169,19 @@ 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) ;; \
           *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libgomp"; \
-       libsrcdir="$$s/libgomp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgomp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE3_CONFIGURE_FLAGS)
  @endif target-libgomp-bootstrap
@@ -40745,7 +45197,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; \
@@ -40762,19 +45214,19 @@ 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) ;; \
           *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libgomp"; \
-       libsrcdir="$$s/libgomp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgomp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGE4_CONFIGURE_FLAGS)
  @endif target-libgomp-bootstrap
@@ -40790,7 +45242,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; \
@@ -40807,19 +45259,19 @@ 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) ;; \
           *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libgomp"; \
-       libsrcdir="$$s/libgomp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgomp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEprofile_CONFIGURE_FLAGS)
  @endif target-libgomp-bootstrap
@@ -40835,7 +45287,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; \
@@ -40852,19 +45304,19 @@ 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) ;; \
           *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libgomp"; \
-       libsrcdir="$$s/libgomp"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgomp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           --with-build-libsubdir=$(HOST_SUBDIR) \
           $(STAGEfeedback_CONFIGURE_FLAGS)
  @endif target-libgomp-bootstrap
@@ -40886,7 +45338,7 @@ all-target-libgomp: configure-target-libgomp
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS)  \
         (cd $(TARGET_SUBDIR)/libgomp && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                 $(TARGET-target-libgomp))
  @endif target-libgomp
  
@@ -40907,6 +45359,7 @@ all-stage1-target-libgomp: configure-stage1-target-libgomp
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(NORMAL_TARGET_EXPORTS)  \
         cd $(TARGET_SUBDIR)/libgomp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -40914,8 +45367,9 @@ all-stage1-target-libgomp: configure-stage1-target-libgomp
                 CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(EXTRA_TARGET_FLAGS)  \
+                 \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-target-libgomp)
  
  maybe-clean-stage1-target-libgomp: clean-stage1-target-libgomp
@@ -40929,7 +45383,7 @@ clean-stage1-target-libgomp:
         fi; \
         cd $(TARGET_SUBDIR)/libgomp && \
         $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                clean
+         clean
  @endif target-libgomp-bootstrap
  
  
@@ -40949,6 +45403,7 @@ all-stage2-target-libgomp: configure-stage2-target-libgomp
         $(NORMAL_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libgomp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -40957,7 +45412,7 @@ all-stage2-target-libgomp: configure-stage2-target-libgomp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-target-libgomp)
  
  maybe-clean-stage2-target-libgomp: clean-stage2-target-libgomp
@@ -40970,9 +45425,7 @@ clean-stage2-target-libgomp:
           $(MAKE) stage2-start; \
         fi; \
         cd $(TARGET_SUBDIR)/libgomp && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
  @endif target-libgomp-bootstrap
  
  
@@ -40992,6 +45445,7 @@ all-stage3-target-libgomp: configure-stage3-target-libgomp
         $(NORMAL_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libgomp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -41000,7 +45454,7 @@ all-stage3-target-libgomp: configure-stage3-target-libgomp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-target-libgomp)
  
  maybe-clean-stage3-target-libgomp: clean-stage3-target-libgomp
@@ -41013,9 +45467,7 @@ clean-stage3-target-libgomp:
           $(MAKE) stage3-start; \
         fi; \
         cd $(TARGET_SUBDIR)/libgomp && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
  @endif target-libgomp-bootstrap
  
  
@@ -41035,6 +45487,7 @@ all-stage4-target-libgomp: configure-stage4-target-libgomp
         $(NORMAL_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libgomp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -41043,7 +45496,7 @@ all-stage4-target-libgomp: configure-stage4-target-libgomp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-target-libgomp)
  
  maybe-clean-stage4-target-libgomp: clean-stage4-target-libgomp
@@ -41056,9 +45509,7 @@ clean-stage4-target-libgomp:
           $(MAKE) stage4-start; \
         fi; \
         cd $(TARGET_SUBDIR)/libgomp && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
  @endif target-libgomp-bootstrap
  
  
@@ -41078,6 +45529,7 @@ all-stageprofile-target-libgomp: configure-stageprofile-target-libgomp
         $(NORMAL_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libgomp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -41086,7 +45538,7 @@ all-stageprofile-target-libgomp: configure-stageprofile-target-libgomp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-target-libgomp)
  
  maybe-clean-stageprofile-target-libgomp: clean-stageprofile-target-libgomp
@@ -41099,9 +45551,7 @@ clean-stageprofile-target-libgomp:
           $(MAKE) stageprofile-start; \
         fi; \
         cd $(TARGET_SUBDIR)/libgomp && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
  @endif target-libgomp-bootstrap
  
  
@@ -41121,6 +45571,7 @@ all-stagefeedback-target-libgomp: configure-stagefeedback-target-libgomp
         $(NORMAL_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libgomp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -41129,7 +45580,7 @@ all-stagefeedback-target-libgomp: configure-stagefeedback-target-libgomp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-target-libgomp)
  
  maybe-clean-stagefeedback-target-libgomp: clean-stagefeedback-target-libgomp
@@ -41142,9 +45593,7 @@ clean-stagefeedback-target-libgomp:
           $(MAKE) stagefeedback-start; \
         fi; \
         cd $(TARGET_SUBDIR)/libgomp && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
  @endif target-libgomp-bootstrap
  
  
@@ -41207,11 +45656,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; \
@@ -41233,11 +45682,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; \
@@ -41259,11 +45708,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; \
@@ -41285,11 +45734,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; \
@@ -41311,11 +45760,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; \
@@ -41338,11 +45787,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; \
@@ -41365,11 +45814,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; \
@@ -41392,11 +45841,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; \
@@ -41418,11 +45867,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; \
@@ -41443,11 +45892,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; \
@@ -41468,11 +45917,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; \
@@ -41493,11 +45942,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; \
@@ -41518,11 +45967,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; \
@@ -41552,8 +46001,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; \
@@ -41565,7 +46014,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; \
@@ -41574,12 +46023,13 @@ configure-target-libitm:
           *) topdir=`echo $(TARGET_SUBDIR)/libitm/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libitm"; \
-       libsrcdir="$$s/libitm"; \
+       module_srcdir=libitm; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif target-libitm
  
@@ -41601,7 +46051,7 @@ all-target-libitm: configure-target-libitm
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS)  \
         (cd $(TARGET_SUBDIR)/libitm && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                 $(TARGET-target-libitm))
  @endif target-libitm
  
@@ -41664,11 +46114,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; \
@@ -41690,11 +46140,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; \
@@ -41716,11 +46166,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; \
@@ -41742,11 +46192,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; \
@@ -41768,11 +46218,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; \
@@ -41795,11 +46245,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; \
@@ -41822,11 +46272,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; \
@@ -41849,11 +46299,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; \
@@ -41875,11 +46325,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; \
@@ -41900,11 +46350,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; \
@@ -41925,11 +46375,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; \
@@ -41950,11 +46400,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; \
@@ -41975,11 +46425,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; \
@@ -42009,8 +46459,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; \
@@ -42022,7 +46472,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; \
@@ -42031,12 +46481,13 @@ configure-target-libatomic:
           *) topdir=`echo $(TARGET_SUBDIR)/libatomic/ | \
                 sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
         esac; \
-       srcdiroption="--srcdir=$${topdir}/libatomic"; \
-       libsrcdir="$$s/libatomic"; \
+       module_srcdir=libatomic; \
         rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
           $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
           || exit 1
  @endif target-libatomic
  
@@ -42058,7 +46509,7 @@ all-target-libatomic: configure-target-libatomic
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(NORMAL_TARGET_EXPORTS)  \
         (cd $(TARGET_SUBDIR)/libatomic && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                 $(TARGET-target-libatomic))
  @endif target-libatomic
  
@@ -42121,11 +46572,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; \
@@ -42147,11 +46598,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; \
@@ -42173,11 +46624,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; \
@@ -42199,11 +46650,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; \
@@ -42225,11 +46676,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; \
@@ -42252,11 +46703,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; \
@@ -42279,11 +46730,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; \
@@ -42306,11 +46757,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; \
@@ -42332,11 +46783,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; \
@@ -42357,11 +46808,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; \
@@ -42382,11 +46833,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; \
@@ -42407,11 +46858,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; \
@@ -42432,11 +46883,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; \
@@ -42452,13 +46903,6 @@ maintainer-clean-target-libatomic:
  
  
  
-@if target-libmudflap
-.PHONY: check-target-libmudflap-c++
-check-target-libmudflap-c++:
-       $(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) c++frags.exp" check-target-libmudflap
-
-@endif target-libmudflap
-
  @if target-libgomp
  .PHONY: check-target-libgomp-c++
  check-target-libgomp-c++:
@@ -42486,7 +46930,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
@@ -42507,7 +46951,7 @@ check-gcc-c++:
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
         (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++);
-check-c++: check-gcc-c++ check-target-libstdc++-v3 check-target-libmudflap-c++ check-target-libitm-c++ check-target-libgomp-c++
+check-c++: check-gcc-c++ check-target-libstdc++-v3 check-target-libitm-c++ check-target-libgomp-c++
  
  .PHONY: check-gcc-fortran check-fortran
  check-gcc-fortran:
@@ -42517,14 +46961,6 @@ check-gcc-fortran:
         (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-fortran);
  check-fortran: check-gcc-fortran check-target-libquadmath check-target-libgfortran
  
-.PHONY: check-gcc-java check-java
-check-gcc-java:
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-java);
-check-java: check-gcc-java check-target-libjava
-
  .PHONY: check-gcc-ada check-ada
  check-gcc-ada:
         r=`${PWD_COMMAND}`; export r; \
@@ -42626,511 +47062,555 @@ objext = .o
  
  stage1-start::
         @: $(MAKE); $(stage); \
-       echo stage1 > stage_current ; \
+       echo stage1 > stage_current; \
         echo stage1 > stage_last; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
  @if bfd
         @cd $(HOST_SUBDIR); [ -d stage1-bfd ] || \
           mkdir stage1-bfd; \
-       mv stage1-bfd bfd 
+       mv stage1-bfd bfd
  @endif bfd
  @if opcodes
         @cd $(HOST_SUBDIR); [ -d stage1-opcodes ] || \
           mkdir stage1-opcodes; \
-       mv stage1-opcodes opcodes 
+       mv stage1-opcodes opcodes
  @endif opcodes
  @if binutils
         @cd $(HOST_SUBDIR); [ -d stage1-binutils ] || \
           mkdir stage1-binutils; \
-       mv stage1-binutils binutils 
+       mv stage1-binutils binutils
  @endif binutils
+@if fixincludes
+       @cd $(HOST_SUBDIR); [ -d stage1-fixincludes ] || \
+         mkdir stage1-fixincludes; \
+       mv stage1-fixincludes fixincludes
+@endif fixincludes
  @if gas
         @cd $(HOST_SUBDIR); [ -d stage1-gas ] || \
           mkdir stage1-gas; \
-       mv stage1-gas gas 
+       mv stage1-gas gas
  @endif gas
  @if gcc
         @cd $(HOST_SUBDIR); [ -d stage1-gcc ] || \
           mkdir stage1-gcc; \
-       mv stage1-gcc gcc 
+       mv stage1-gcc gcc
  @endif gcc
  @if gmp
         @cd $(HOST_SUBDIR); [ -d stage1-gmp ] || \
           mkdir stage1-gmp; \
-       mv stage1-gmp gmp 
+       mv stage1-gmp gmp
  @endif gmp
  @if mpfr
         @cd $(HOST_SUBDIR); [ -d stage1-mpfr ] || \
           mkdir stage1-mpfr; \
-       mv stage1-mpfr mpfr 
+       mv stage1-mpfr mpfr
  @endif mpfr
  @if mpc
         @cd $(HOST_SUBDIR); [ -d stage1-mpc ] || \
           mkdir stage1-mpc; \
-       mv stage1-mpc mpc 
+       mv stage1-mpc mpc
  @endif mpc
  @if isl
         @cd $(HOST_SUBDIR); [ -d stage1-isl ] || \
           mkdir stage1-isl; \
-       mv stage1-isl isl 
+       mv stage1-isl isl
  @endif isl
-@if cloog
-       @cd $(HOST_SUBDIR); [ -d stage1-cloog ] || \
-         mkdir stage1-cloog; \
-       mv stage1-cloog cloog 
-@endif cloog
  @if libelf
         @cd $(HOST_SUBDIR); [ -d stage1-libelf ] || \
           mkdir stage1-libelf; \
-       mv stage1-libelf libelf 
+       mv stage1-libelf libelf
  @endif libelf
  @if gold
         @cd $(HOST_SUBDIR); [ -d stage1-gold ] || \
           mkdir stage1-gold; \
-       mv stage1-gold gold 
+       mv stage1-gold gold
  @endif gold
  @if intl
         @cd $(HOST_SUBDIR); [ -d stage1-intl ] || \
           mkdir stage1-intl; \
-       mv stage1-intl intl 
+       mv stage1-intl intl
  @endif intl
  @if ld
         @cd $(HOST_SUBDIR); [ -d stage1-ld ] || \
           mkdir stage1-ld; \
-       mv stage1-ld ld 
+       mv stage1-ld ld
  @endif ld
  @if libbacktrace
         @cd $(HOST_SUBDIR); [ -d stage1-libbacktrace ] || \
           mkdir stage1-libbacktrace; \
-       mv stage1-libbacktrace libbacktrace 
+       mv stage1-libbacktrace libbacktrace
  @endif libbacktrace
  @if libcpp
         @cd $(HOST_SUBDIR); [ -d stage1-libcpp ] || \
           mkdir stage1-libcpp; \
-       mv stage1-libcpp libcpp 
+       mv stage1-libcpp libcpp
  @endif libcpp
  @if libdecnumber
         @cd $(HOST_SUBDIR); [ -d stage1-libdecnumber ] || \
           mkdir stage1-libdecnumber; \
-       mv stage1-libdecnumber libdecnumber 
+       mv stage1-libdecnumber libdecnumber
  @endif libdecnumber
  @if libiberty
         @cd $(HOST_SUBDIR); [ -d stage1-libiberty ] || \
           mkdir stage1-libiberty; \
-       mv stage1-libiberty libiberty 
+       mv stage1-libiberty libiberty
  @endif libiberty
+@if libiberty-linker-plugin
+       @cd $(HOST_SUBDIR); [ -d stage1-libiberty-linker-plugin ] || \
+         mkdir stage1-libiberty-linker-plugin; \
+       mv stage1-libiberty-linker-plugin libiberty-linker-plugin
+@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; \
+       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; \
+       fi
+@endif libelf
+@if gold
+       @if test -d $(HOST_SUBDIR)/gold; then \
+         cd $(HOST_SUBDIR); mv gold stage1-gold; \
+       fi
+@endif gold
+@if intl
+       @if test -d $(HOST_SUBDIR)/intl; then \
+         cd $(HOST_SUBDIR); mv intl stage1-intl; \
+       fi
+@endif intl
+@if ld
+       @if test -d $(HOST_SUBDIR)/ld; then \
+         cd $(HOST_SUBDIR); mv ld stage1-ld; \
+       fi
+@endif ld
+@if libbacktrace
+       @if test -d $(HOST_SUBDIR)/libbacktrace; then \
+         cd $(HOST_SUBDIR); mv libbacktrace stage1-libbacktrace; \
+       fi
+@endif libbacktrace
+@if libcpp
+       @if test -d $(HOST_SUBDIR)/libcpp; then \
+         cd $(HOST_SUBDIR); mv libcpp stage1-libcpp; \
         fi
+@endif libcpp
+@if libdecnumber
+       @if test -d $(HOST_SUBDIR)/libdecnumber; then \
+         cd $(HOST_SUBDIR); mv libdecnumber stage1-libdecnumber; \
+       fi
+@endif libdecnumber
+@if libiberty
+       @if test -d $(HOST_SUBDIR)/libiberty; then \
+         cd $(HOST_SUBDIR); mv libiberty stage1-libiberty; \
+       fi
+@endif libiberty
+@if libiberty-linker-plugin
+       @if test -d $(HOST_SUBDIR)/libiberty-linker-plugin; then \
+         cd $(HOST_SUBDIR); mv libiberty-linker-plugin stage1-libiberty-linker-plugin; \
+       fi
+@endif libiberty-linker-plugin
+@if 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; \
+       fi
+@endif zlib
+@if lto-plugin
+       @if test -d $(HOST_SUBDIR)/lto-plugin; then \
+         cd $(HOST_SUBDIR); mv lto-plugin stage1-lto-plugin; \
+       fi
+@endif lto-plugin
+       @if test -d $(TARGET_SUBDIR); then \
+         mv $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR); \
+       fi
+       rm -f stage_current
+
+# Bubble a bug fix through all the stages up to stage 1.  They are
+# remade, but not reconfigured.  The next stage (if any) will not be
+# reconfigured either.
+.PHONY: stage1-bubble
+stage1-bubble:: 
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       if test -f stage1-lean ; then \
+         echo Skipping rebuild of stage1; \
+       else \
+         $(MAKE) stage1-start; \
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1; \
+       fi
+
+.PHONY: all-stage1 clean-stage1
+do-clean: clean-stage1
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+
+
+
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
+
+.PHONY: distclean-stage1
+distclean-stage1::
+       @: $(MAKE); $(stage)
+       @test "`cat stage_last`" != stage1 || rm -f stage_last
+       rm -rf stage1-* 
+
+
+@endif gcc-bootstrap
+
+
+.PHONY: stage2-start stage2-end
+
+stage2-start::
+       @: $(MAKE); $(stage); \
+       echo stage2 > stage_current; \
+       echo stage2 > stage_last; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
+@if bfd
+       @cd $(HOST_SUBDIR); [ -d stage2-bfd ] || \
+         mkdir stage2-bfd; \
+       mv stage2-bfd bfd; \
+       mv stage1-bfd prev-bfd || test -f stage1-lean 
+@endif bfd
+@if opcodes
+       @cd $(HOST_SUBDIR); [ -d stage2-opcodes ] || \
+         mkdir stage2-opcodes; \
+       mv stage2-opcodes opcodes; \
+       mv stage1-opcodes prev-opcodes || test -f stage1-lean 
+@endif opcodes
+@if binutils
+       @cd $(HOST_SUBDIR); [ -d stage2-binutils ] || \
+         mkdir stage2-binutils; \
+       mv stage2-binutils binutils; \
+       mv stage1-binutils prev-binutils || test -f stage1-lean 
+@endif binutils
+@if fixincludes
+       @cd $(HOST_SUBDIR); [ -d stage2-fixincludes ] || \
+         mkdir stage2-fixincludes; \
+       mv stage2-fixincludes fixincludes; \
+       mv stage1-fixincludes prev-fixincludes || test -f stage1-lean 
+@endif fixincludes
+@if gas
+       @cd $(HOST_SUBDIR); [ -d stage2-gas ] || \
+         mkdir stage2-gas; \
+       mv stage2-gas gas; \
+       mv stage1-gas prev-gas || test -f stage1-lean 
+@endif gas
+@if gcc
+       @cd $(HOST_SUBDIR); [ -d stage2-gcc ] || \
+         mkdir stage2-gcc; \
+       mv stage2-gcc gcc; \
+       mv stage1-gcc prev-gcc || test -f stage1-lean 
+@endif gcc
+@if gmp
+       @cd $(HOST_SUBDIR); [ -d stage2-gmp ] || \
+         mkdir stage2-gmp; \
+       mv stage2-gmp gmp; \
+       mv stage1-gmp prev-gmp || test -f stage1-lean 
+@endif gmp
+@if mpfr
+       @cd $(HOST_SUBDIR); [ -d stage2-mpfr ] || \
+         mkdir stage2-mpfr; \
+       mv stage2-mpfr mpfr; \
+       mv stage1-mpfr prev-mpfr || test -f stage1-lean 
+@endif mpfr
+@if mpc
+       @cd $(HOST_SUBDIR); [ -d stage2-mpc ] || \
+         mkdir stage2-mpc; \
+       mv stage2-mpc mpc; \
+       mv stage1-mpc prev-mpc || test -f stage1-lean 
+@endif mpc
+@if isl
+       @cd $(HOST_SUBDIR); [ -d stage2-isl ] || \
+         mkdir stage2-isl; \
+       mv stage2-isl isl; \
+       mv stage1-isl prev-isl || test -f stage1-lean 
  @endif isl
-@if cloog
-       @if test -d $(HOST_SUBDIR)/cloog ; then \
-         cd $(HOST_SUBDIR); mv cloog stage1-cloog  ; \
+@if libelf
+       @cd $(HOST_SUBDIR); [ -d stage2-libelf ] || \
+         mkdir stage2-libelf; \
+       mv stage2-libelf libelf; \
+       mv stage1-libelf prev-libelf || test -f stage1-lean 
+@endif libelf
+@if gold
+       @cd $(HOST_SUBDIR); [ -d stage2-gold ] || \
+         mkdir stage2-gold; \
+       mv stage2-gold gold; \
+       mv stage1-gold prev-gold || test -f stage1-lean 
+@endif gold
+@if intl
+       @cd $(HOST_SUBDIR); [ -d stage2-intl ] || \
+         mkdir stage2-intl; \
+       mv stage2-intl intl; \
+       mv stage1-intl prev-intl || test -f stage1-lean 
+@endif intl
+@if ld
+       @cd $(HOST_SUBDIR); [ -d stage2-ld ] || \
+         mkdir stage2-ld; \
+       mv stage2-ld ld; \
+       mv stage1-ld prev-ld || test -f stage1-lean 
+@endif ld
+@if libbacktrace
+       @cd $(HOST_SUBDIR); [ -d stage2-libbacktrace ] || \
+         mkdir stage2-libbacktrace; \
+       mv stage2-libbacktrace libbacktrace; \
+       mv stage1-libbacktrace prev-libbacktrace || test -f stage1-lean 
+@endif libbacktrace
+@if libcpp
+       @cd $(HOST_SUBDIR); [ -d stage2-libcpp ] || \
+         mkdir stage2-libcpp; \
+       mv stage2-libcpp libcpp; \
+       mv stage1-libcpp prev-libcpp || test -f stage1-lean 
+@endif libcpp
+@if libdecnumber
+       @cd $(HOST_SUBDIR); [ -d stage2-libdecnumber ] || \
+         mkdir stage2-libdecnumber; \
+       mv stage2-libdecnumber libdecnumber; \
+       mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean 
+@endif libdecnumber
+@if libiberty
+       @cd $(HOST_SUBDIR); [ -d stage2-libiberty ] || \
+         mkdir stage2-libiberty; \
+       mv stage2-libiberty libiberty; \
+       mv stage1-libiberty prev-libiberty || test -f stage1-lean 
+@endif libiberty
+@if libiberty-linker-plugin
+       @cd $(HOST_SUBDIR); [ -d stage2-libiberty-linker-plugin ] || \
+         mkdir stage2-libiberty-linker-plugin; \
+       mv stage2-libiberty-linker-plugin libiberty-linker-plugin; \
+       mv stage1-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage1-lean 
+@endif libiberty-linker-plugin
+@if libiconv
+       @cd $(HOST_SUBDIR); [ -d stage2-libiconv ] || \
+         mkdir stage2-libiconv; \
+       mv stage2-libiconv libiconv; \
+       mv stage1-libiconv prev-libiconv || test -f stage1-lean 
+@endif libiconv
+@if zlib
+       @cd $(HOST_SUBDIR); [ -d stage2-zlib ] || \
+         mkdir stage2-zlib; \
+       mv stage2-zlib zlib; \
+       mv stage1-zlib prev-zlib || test -f stage1-lean 
+@endif zlib
+@if lto-plugin
+       @cd $(HOST_SUBDIR); [ -d stage2-lto-plugin ] || \
+         mkdir stage2-lto-plugin; \
+       mv stage2-lto-plugin lto-plugin; \
+       mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean 
+@endif lto-plugin
+       @[ -d stage2-$(TARGET_SUBDIR) ] || \
+         mkdir stage2-$(TARGET_SUBDIR); \
+       mv stage2-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
+       mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean 
+
+stage2-end:: 
+@if bfd
+       @if test -d $(HOST_SUBDIR)/bfd; then \
+         cd $(HOST_SUBDIR); mv bfd stage2-bfd; \
+         mv prev-bfd stage1-bfd; : ; \
+       fi
+@endif bfd
+@if opcodes
+       @if test -d $(HOST_SUBDIR)/opcodes; then \
+         cd $(HOST_SUBDIR); mv opcodes stage2-opcodes; \
+         mv prev-opcodes stage1-opcodes; : ; \
+       fi
+@endif opcodes
+@if binutils
+       @if test -d $(HOST_SUBDIR)/binutils; then \
+         cd $(HOST_SUBDIR); mv binutils stage2-binutils; \
+         mv prev-binutils stage1-binutils; : ; \
+       fi
+@endif binutils
+@if fixincludes
+       @if test -d $(HOST_SUBDIR)/fixincludes; then \
+         cd $(HOST_SUBDIR); mv fixincludes stage2-fixincludes; \
+         mv prev-fixincludes stage1-fixincludes; : ; \
+       fi
+@endif fixincludes
+@if gas
+       @if test -d $(HOST_SUBDIR)/gas; then \
+         cd $(HOST_SUBDIR); mv gas stage2-gas; \
+         mv prev-gas stage1-gas; : ; \
         fi
-@endif cloog
+@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 stage1-libelf  ; \
+       @if test -d $(HOST_SUBDIR)/libelf; then \
+         cd $(HOST_SUBDIR); mv libelf stage2-libelf; \
+         mv prev-libelf stage1-libelf; : ; \
         fi
  @endif libelf
  @if gold
-       @if test -d $(HOST_SUBDIR)/gold ; then \
-         cd $(HOST_SUBDIR); mv gold stage1-gold  ; \
+       @if test -d $(HOST_SUBDIR)/gold; then \
+         cd $(HOST_SUBDIR); mv gold stage2-gold; \
+         mv prev-gold stage1-gold; : ; \
         fi
  @endif gold
  @if intl
-       @if test -d $(HOST_SUBDIR)/intl ; then \
-         cd $(HOST_SUBDIR); mv intl stage1-intl  ; \
+       @if test -d $(HOST_SUBDIR)/intl; then \
+         cd $(HOST_SUBDIR); mv intl stage2-intl; \
+         mv prev-intl stage1-intl; : ; \
         fi
  @endif intl
  @if ld
-       @if test -d $(HOST_SUBDIR)/ld ; then \
-         cd $(HOST_SUBDIR); mv ld stage1-ld  ; \
+       @if test -d $(HOST_SUBDIR)/ld; then \
+         cd $(HOST_SUBDIR); mv ld stage2-ld; \
+         mv prev-ld stage1-ld; : ; \
         fi
  @endif ld
  @if libbacktrace
-       @if test -d $(HOST_SUBDIR)/libbacktrace ; then \
-         cd $(HOST_SUBDIR); mv libbacktrace stage1-libbacktrace  ; \
+       @if test -d $(HOST_SUBDIR)/libbacktrace; then \
+         cd $(HOST_SUBDIR); mv libbacktrace stage2-libbacktrace; \
+         mv prev-libbacktrace stage1-libbacktrace; : ; \
         fi
  @endif libbacktrace
  @if libcpp
-       @if test -d $(HOST_SUBDIR)/libcpp ; then \
-         cd $(HOST_SUBDIR); mv libcpp stage1-libcpp  ; \
+       @if test -d $(HOST_SUBDIR)/libcpp; then \
+         cd $(HOST_SUBDIR); mv libcpp stage2-libcpp; \
+         mv prev-libcpp stage1-libcpp; : ; \
         fi
  @endif libcpp
  @if libdecnumber
-       @if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-         cd $(HOST_SUBDIR); mv libdecnumber stage1-libdecnumber  ; \
+       @if test -d $(HOST_SUBDIR)/libdecnumber; then \
+         cd $(HOST_SUBDIR); mv libdecnumber stage2-libdecnumber; \
+         mv prev-libdecnumber stage1-libdecnumber; : ; \
         fi
  @endif libdecnumber
  @if libiberty
-       @if test -d $(HOST_SUBDIR)/libiberty ; then \
-         cd $(HOST_SUBDIR); mv libiberty stage1-libiberty  ; \
+       @if test -d $(HOST_SUBDIR)/libiberty; then \
+         cd $(HOST_SUBDIR); mv libiberty stage2-libiberty; \
+         mv prev-libiberty stage1-libiberty; : ; \
         fi
  @endif libiberty
-@if zlib
-       @if test -d $(HOST_SUBDIR)/zlib ; then \
-         cd $(HOST_SUBDIR); mv zlib stage1-zlib  ; \
+@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 zlib
-@if lto-plugin
-       @if test -d $(HOST_SUBDIR)/lto-plugin ; then \
-         cd $(HOST_SUBDIR); mv lto-plugin stage1-lto-plugin  ; \
-       fi
-@endif lto-plugin
-       @if test -d $(TARGET_SUBDIR) ; then \
-         mv $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR)  ; \
-       fi
-       rm -f stage_current
-
-# Bubble a bug fix through all the stages up to stage 1.  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured either.
-.PHONY: stage1-bubble
-stage1-bubble:: 
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       if test -f stage1-lean  ; then \
-         echo Skipping rebuild of stage1 ; \
-       else \
-         $(MAKE) stage1-start; \
-         $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1; \
-       fi
-
-.PHONY: all-stage1 clean-stage1
-do-clean: clean-stage1
-
-# FIXME: Will not need to be conditional when toplevel bootstrap is the
-# only possibility, but now it conflicts with no-bootstrap rules
-@if gcc-bootstrap
-
-
-
-
-# Rules to wipe a stage and all the following ones, also used for cleanstrap
-
-.PHONY: distclean-stage1
-distclean-stage1::
-       @: $(MAKE); $(stage)
-       @test "`cat stage_last`" != stage1 || rm -f stage_last
-       rm -rf stage1-* 
-
-
-@endif gcc-bootstrap
-
-
-.PHONY: stage2-start stage2-end
-
-stage2-start::
-       @: $(MAKE); $(stage); \
-       echo stage2 > stage_current ; \
-       echo stage2 > stage_last; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
-@if bfd
-       @cd $(HOST_SUBDIR); [ -d stage2-bfd ] || \
-         mkdir stage2-bfd; \
-       mv stage2-bfd bfd  ; \
-       mv stage1-bfd prev-bfd || test -f stage1-lean 
-@endif bfd
-@if opcodes
-       @cd $(HOST_SUBDIR); [ -d stage2-opcodes ] || \
-         mkdir stage2-opcodes; \
-       mv stage2-opcodes opcodes  ; \
-       mv stage1-opcodes prev-opcodes || test -f stage1-lean 
-@endif opcodes
-@if binutils
-       @cd $(HOST_SUBDIR); [ -d stage2-binutils ] || \
-         mkdir stage2-binutils; \
-       mv stage2-binutils binutils  ; \
-       mv stage1-binutils prev-binutils || test -f stage1-lean 
-@endif binutils
-@if gas
-       @cd $(HOST_SUBDIR); [ -d stage2-gas ] || \
-         mkdir stage2-gas; \
-       mv stage2-gas gas  ; \
-       mv stage1-gas prev-gas || test -f stage1-lean 
-@endif gas
-@if gcc
-       @cd $(HOST_SUBDIR); [ -d stage2-gcc ] || \
-         mkdir stage2-gcc; \
-       mv stage2-gcc gcc  ; \
-       mv stage1-gcc prev-gcc || test -f stage1-lean 
-@endif gcc
-@if gmp
-       @cd $(HOST_SUBDIR); [ -d stage2-gmp ] || \
-         mkdir stage2-gmp; \
-       mv stage2-gmp gmp  ; \
-       mv stage1-gmp prev-gmp || test -f stage1-lean 
-@endif gmp
-@if mpfr
-       @cd $(HOST_SUBDIR); [ -d stage2-mpfr ] || \
-         mkdir stage2-mpfr; \
-       mv stage2-mpfr mpfr  ; \
-       mv stage1-mpfr prev-mpfr || test -f stage1-lean 
-@endif mpfr
-@if mpc
-       @cd $(HOST_SUBDIR); [ -d stage2-mpc ] || \
-         mkdir stage2-mpc; \
-       mv stage2-mpc mpc  ; \
-       mv stage1-mpc prev-mpc || test -f stage1-lean 
-@endif mpc
-@if isl
-       @cd $(HOST_SUBDIR); [ -d stage2-isl ] || \
-         mkdir stage2-isl; \
-       mv stage2-isl isl  ; \
-       mv stage1-isl prev-isl || test -f stage1-lean 
-@endif isl
-@if cloog
-       @cd $(HOST_SUBDIR); [ -d stage2-cloog ] || \
-         mkdir stage2-cloog; \
-       mv stage2-cloog cloog  ; \
-       mv stage1-cloog prev-cloog || test -f stage1-lean 
-@endif cloog
-@if libelf
-       @cd $(HOST_SUBDIR); [ -d stage2-libelf ] || \
-         mkdir stage2-libelf; \
-       mv stage2-libelf libelf  ; \
-       mv stage1-libelf prev-libelf || test -f stage1-lean 
-@endif libelf
-@if gold
-       @cd $(HOST_SUBDIR); [ -d stage2-gold ] || \
-         mkdir stage2-gold; \
-       mv stage2-gold gold  ; \
-       mv stage1-gold prev-gold || test -f stage1-lean 
-@endif gold
-@if intl
-       @cd $(HOST_SUBDIR); [ -d stage2-intl ] || \
-         mkdir stage2-intl; \
-       mv stage2-intl intl  ; \
-       mv stage1-intl prev-intl || test -f stage1-lean 
-@endif intl
-@if ld
-       @cd $(HOST_SUBDIR); [ -d stage2-ld ] || \
-         mkdir stage2-ld; \
-       mv stage2-ld ld  ; \
-       mv stage1-ld prev-ld || test -f stage1-lean 
-@endif ld
-@if libbacktrace
-       @cd $(HOST_SUBDIR); [ -d stage2-libbacktrace ] || \
-         mkdir stage2-libbacktrace; \
-       mv stage2-libbacktrace libbacktrace  ; \
-       mv stage1-libbacktrace prev-libbacktrace || test -f stage1-lean 
-@endif libbacktrace
-@if libcpp
-       @cd $(HOST_SUBDIR); [ -d stage2-libcpp ] || \
-         mkdir stage2-libcpp; \
-       mv stage2-libcpp libcpp  ; \
-       mv stage1-libcpp prev-libcpp || test -f stage1-lean 
-@endif libcpp
-@if libdecnumber
-       @cd $(HOST_SUBDIR); [ -d stage2-libdecnumber ] || \
-         mkdir stage2-libdecnumber; \
-       mv stage2-libdecnumber libdecnumber  ; \
-       mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean 
-@endif libdecnumber
-@if libiberty
-       @cd $(HOST_SUBDIR); [ -d stage2-libiberty ] || \
-         mkdir stage2-libiberty; \
-       mv stage2-libiberty libiberty  ; \
-       mv stage1-libiberty prev-libiberty || test -f stage1-lean 
-@endif libiberty
-@if zlib
-       @cd $(HOST_SUBDIR); [ -d stage2-zlib ] || \
-         mkdir stage2-zlib; \
-       mv stage2-zlib zlib  ; \
-       mv stage1-zlib prev-zlib || test -f stage1-lean 
-@endif zlib
-@if lto-plugin
-       @cd $(HOST_SUBDIR); [ -d stage2-lto-plugin ] || \
-         mkdir stage2-lto-plugin; \
-       mv stage2-lto-plugin lto-plugin  ; \
-       mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean 
-@endif lto-plugin
-       @[ -d stage2-$(TARGET_SUBDIR) ] || \
-         mkdir stage2-$(TARGET_SUBDIR); \
-       mv stage2-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
-       mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean 
-
-stage2-end:: 
-@if bfd
-       @if test -d $(HOST_SUBDIR)/bfd ; then \
-         cd $(HOST_SUBDIR); mv bfd stage2-bfd ; \
-         mv prev-bfd stage1-bfd ; :  ; \
-       fi
-@endif bfd
-@if opcodes
-       @if test -d $(HOST_SUBDIR)/opcodes ; then \
-         cd $(HOST_SUBDIR); mv opcodes stage2-opcodes ; \
-         mv prev-opcodes stage1-opcodes ; :  ; \
-       fi
-@endif opcodes
-@if binutils
-       @if test -d $(HOST_SUBDIR)/binutils ; then \
-         cd $(HOST_SUBDIR); mv binutils stage2-binutils ; \
-         mv prev-binutils stage1-binutils ; :  ; \
-       fi
-@endif binutils
-@if gas
-       @if test -d $(HOST_SUBDIR)/gas ; then \
-         cd $(HOST_SUBDIR); mv gas stage2-gas ; \
-         mv prev-gas stage1-gas ; :  ; \
-       fi
-@endif gas
-@if gcc
-       @if test -d $(HOST_SUBDIR)/gcc ; then \
-         cd $(HOST_SUBDIR); mv gcc stage2-gcc ; \
-         mv prev-gcc stage1-gcc ; :  ; \
-       fi
-@endif gcc
-@if gmp
-       @if test -d $(HOST_SUBDIR)/gmp ; then \
-         cd $(HOST_SUBDIR); mv gmp stage2-gmp ; \
-         mv prev-gmp stage1-gmp ; :  ; \
-       fi
-@endif gmp
-@if mpfr
-       @if test -d $(HOST_SUBDIR)/mpfr ; then \
-         cd $(HOST_SUBDIR); mv mpfr stage2-mpfr ; \
-         mv prev-mpfr stage1-mpfr ; :  ; \
-       fi
-@endif mpfr
-@if mpc
-       @if test -d $(HOST_SUBDIR)/mpc ; then \
-         cd $(HOST_SUBDIR); mv mpc stage2-mpc ; \
-         mv prev-mpc stage1-mpc ; :  ; \
-       fi
-@endif mpc
-@if isl
-       @if test -d $(HOST_SUBDIR)/isl ; then \
-         cd $(HOST_SUBDIR); mv isl stage2-isl ; \
-         mv prev-isl stage1-isl ; :  ; \
-       fi
-@endif isl
-@if cloog
-       @if test -d $(HOST_SUBDIR)/cloog ; then \
-         cd $(HOST_SUBDIR); mv cloog stage2-cloog ; \
-         mv prev-cloog stage1-cloog ; :  ; \
-       fi
-@endif cloog
-@if libelf
-       @if test -d $(HOST_SUBDIR)/libelf ; then \
-         cd $(HOST_SUBDIR); mv libelf stage2-libelf ; \
-         mv prev-libelf stage1-libelf ; :  ; \
-       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 ; :  ; \
+@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 libiberty
+@endif libiconv
  @if zlib
-       @if test -d $(HOST_SUBDIR)/zlib ; then \
-         cd $(HOST_SUBDIR); mv zlib stage2-zlib ; \
-         mv prev-zlib stage1-zlib ; :  ; \
+       @if test -d $(HOST_SUBDIR)/zlib; then \
+         cd $(HOST_SUBDIR); mv zlib stage2-zlib; \
+         mv prev-zlib stage1-zlib; : ; \
         fi
  @endif zlib
  @if lto-plugin
-       @if test -d $(HOST_SUBDIR)/lto-plugin ; then \
-         cd $(HOST_SUBDIR); mv lto-plugin stage2-lto-plugin ; \
-         mv prev-lto-plugin stage1-lto-plugin ; :  ; \
+       @if test -d $(HOST_SUBDIR)/lto-plugin; then \
+         cd $(HOST_SUBDIR); mv lto-plugin stage2-lto-plugin; \
+         mv prev-lto-plugin stage1-lto-plugin; : ; \
         fi
  @endif lto-plugin
-       @if test -d $(TARGET_SUBDIR) ; then \
-         mv $(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR)  ; \
-         mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; :  ; \
+       @if test -d $(TARGET_SUBDIR); then \
+         mv $(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR); \
+         mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR); : ; \
         fi
         rm -f stage_current
  
@@ -43141,8 +47621,8 @@ stage2-end::
  stage2-bubble:: stage1-bubble
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       if test -f stage2-lean || test -f stage1-lean  ; then \
-         echo Skipping rebuild of stage2 ; \
+       if test -f stage2-lean || test -f stage1-lean ; then \
+         echo Skipping rebuild of stage2; \
         else \
           $(MAKE) stage2-start; \
           $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage2; \
@@ -43197,258 +47677,282 @@ distclean-stage2::
  
  stage3-start::
         @: $(MAKE); $(stage); \
-       echo stage3 > stage_current ; \
+       echo stage3 > stage_current; \
         echo stage3 > stage_last; \
         $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
  @if bfd
         @cd $(HOST_SUBDIR); [ -d stage3-bfd ] || \
           mkdir stage3-bfd; \
-       mv stage3-bfd bfd  ; \
+       mv stage3-bfd bfd; \
         mv stage2-bfd prev-bfd || test -f stage2-lean 
  @endif bfd
  @if opcodes
         @cd $(HOST_SUBDIR); [ -d stage3-opcodes ] || \
           mkdir stage3-opcodes; \
-       mv stage3-opcodes opcodes  ; \
+       mv stage3-opcodes opcodes; \
         mv stage2-opcodes prev-opcodes || test -f stage2-lean 
  @endif opcodes
  @if binutils
         @cd $(HOST_SUBDIR); [ -d stage3-binutils ] || \
           mkdir stage3-binutils; \
-       mv stage3-binutils binutils  ; \
+       mv stage3-binutils binutils; \
         mv stage2-binutils prev-binutils || test -f stage2-lean 
  @endif binutils
+@if fixincludes
+       @cd $(HOST_SUBDIR); [ -d stage3-fixincludes ] || \
+         mkdir stage3-fixincludes; \
+       mv stage3-fixincludes fixincludes; \
+       mv stage2-fixincludes prev-fixincludes || test -f stage2-lean 
+@endif fixincludes
  @if gas
         @cd $(HOST_SUBDIR); [ -d stage3-gas ] || \
           mkdir stage3-gas; \
-       mv stage3-gas gas  ; \
+       mv stage3-gas gas; \
         mv stage2-gas prev-gas || test -f stage2-lean 
  @endif gas
  @if gcc
         @cd $(HOST_SUBDIR); [ -d stage3-gcc ] || \
           mkdir stage3-gcc; \
-       mv stage3-gcc gcc  ; \
+       mv stage3-gcc gcc; \
         mv stage2-gcc prev-gcc || test -f stage2-lean 
  @endif gcc
  @if gmp
         @cd $(HOST_SUBDIR); [ -d stage3-gmp ] || \
           mkdir stage3-gmp; \
-       mv stage3-gmp gmp  ; \
+       mv stage3-gmp gmp; \
         mv stage2-gmp prev-gmp || test -f stage2-lean 
  @endif gmp
  @if mpfr
         @cd $(HOST_SUBDIR); [ -d stage3-mpfr ] || \
           mkdir stage3-mpfr; \
-       mv stage3-mpfr mpfr  ; \
+       mv stage3-mpfr mpfr; \
         mv stage2-mpfr prev-mpfr || test -f stage2-lean 
  @endif mpfr
  @if mpc
         @cd $(HOST_SUBDIR); [ -d stage3-mpc ] || \
           mkdir stage3-mpc; \
-       mv stage3-mpc mpc  ; \
+       mv stage3-mpc mpc; \
         mv stage2-mpc prev-mpc || test -f stage2-lean 
  @endif mpc
  @if isl
         @cd $(HOST_SUBDIR); [ -d stage3-isl ] || \
           mkdir stage3-isl; \
-       mv stage3-isl isl  ; \
+       mv stage3-isl isl; \
         mv stage2-isl prev-isl || test -f stage2-lean 
  @endif isl
-@if cloog
-       @cd $(HOST_SUBDIR); [ -d stage3-cloog ] || \
-         mkdir stage3-cloog; \
-       mv stage3-cloog cloog  ; \
-       mv stage2-cloog prev-cloog || test -f stage2-lean 
-@endif cloog
  @if libelf
         @cd $(HOST_SUBDIR); [ -d stage3-libelf ] || \
           mkdir stage3-libelf; \
-       mv stage3-libelf libelf  ; \
+       mv stage3-libelf libelf; \
         mv stage2-libelf prev-libelf || test -f stage2-lean 
  @endif libelf
  @if gold
         @cd $(HOST_SUBDIR); [ -d stage3-gold ] || \
           mkdir stage3-gold; \
-       mv stage3-gold gold  ; \
+       mv stage3-gold gold; \
         mv stage2-gold prev-gold || test -f stage2-lean 
  @endif gold
  @if intl
         @cd $(HOST_SUBDIR); [ -d stage3-intl ] || \
           mkdir stage3-intl; \
-       mv stage3-intl intl  ; \
+       mv stage3-intl intl; \
         mv stage2-intl prev-intl || test -f stage2-lean 
  @endif intl
  @if ld
         @cd $(HOST_SUBDIR); [ -d stage3-ld ] || \
           mkdir stage3-ld; \
-       mv stage3-ld ld  ; \
+       mv stage3-ld ld; \
         mv stage2-ld prev-ld || test -f stage2-lean 
  @endif ld
  @if libbacktrace
         @cd $(HOST_SUBDIR); [ -d stage3-libbacktrace ] || \
           mkdir stage3-libbacktrace; \
-       mv stage3-libbacktrace libbacktrace  ; \
+       mv stage3-libbacktrace libbacktrace; \
         mv stage2-libbacktrace prev-libbacktrace || test -f stage2-lean 
  @endif libbacktrace
  @if libcpp
         @cd $(HOST_SUBDIR); [ -d stage3-libcpp ] || \
           mkdir stage3-libcpp; \
-       mv stage3-libcpp libcpp  ; \
+       mv stage3-libcpp libcpp; \
         mv stage2-libcpp prev-libcpp || test -f stage2-lean 
  @endif libcpp
  @if libdecnumber
         @cd $(HOST_SUBDIR); [ -d stage3-libdecnumber ] || \
           mkdir stage3-libdecnumber; \
-       mv stage3-libdecnumber libdecnumber  ; \
+       mv stage3-libdecnumber libdecnumber; \
         mv stage2-libdecnumber prev-libdecnumber || test -f stage2-lean 
  @endif libdecnumber
  @if libiberty
         @cd $(HOST_SUBDIR); [ -d stage3-libiberty ] || \
           mkdir stage3-libiberty; \
-       mv stage3-libiberty libiberty  ; \
+       mv stage3-libiberty libiberty; \
         mv stage2-libiberty prev-libiberty || test -f stage2-lean 
  @endif libiberty
+@if libiberty-linker-plugin
+       @cd $(HOST_SUBDIR); [ -d stage3-libiberty-linker-plugin ] || \
+         mkdir stage3-libiberty-linker-plugin; \
+       mv stage3-libiberty-linker-plugin libiberty-linker-plugin; \
+       mv stage2-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage2-lean 
+@endif libiberty-linker-plugin
+@if libiconv
+       @cd $(HOST_SUBDIR); [ -d stage3-libiconv ] || \
+         mkdir stage3-libiconv; \
+       mv stage3-libiconv libiconv; \
+       mv stage2-libiconv prev-libiconv || test -f stage2-lean 
+@endif libiconv
  @if zlib
         @cd $(HOST_SUBDIR); [ -d stage3-zlib ] || \
           mkdir stage3-zlib; \
-       mv stage3-zlib zlib  ; \
+       mv stage3-zlib zlib; \
         mv stage2-zlib prev-zlib || test -f stage2-lean 
  @endif zlib
  @if lto-plugin
         @cd $(HOST_SUBDIR); [ -d stage3-lto-plugin ] || \
           mkdir stage3-lto-plugin; \
-       mv stage3-lto-plugin lto-plugin  ; \
+       mv stage3-lto-plugin lto-plugin; \
         mv stage2-lto-plugin prev-lto-plugin || test -f stage2-lean 
  @endif lto-plugin
         @[ -d stage3-$(TARGET_SUBDIR) ] || \
           mkdir stage3-$(TARGET_SUBDIR); \
-       mv stage3-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
+       mv stage3-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
         mv stage2-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage2-lean 
  
  stage3-end:: 
  @if bfd
-       @if test -d $(HOST_SUBDIR)/bfd ; then \
-         cd $(HOST_SUBDIR); mv bfd stage3-bfd ; \
-         mv prev-bfd stage2-bfd ; :  ; \
+       @if test -d $(HOST_SUBDIR)/bfd; then \
+         cd $(HOST_SUBDIR); mv bfd stage3-bfd; \
+         mv prev-bfd stage2-bfd; : ; \
         fi
  @endif bfd
  @if opcodes
-       @if test -d $(HOST_SUBDIR)/opcodes ; then \
-         cd $(HOST_SUBDIR); mv opcodes stage3-opcodes ; \
-         mv prev-opcodes stage2-opcodes ; :  ; \
+       @if test -d $(HOST_SUBDIR)/opcodes; then \
+         cd $(HOST_SUBDIR); mv opcodes stage3-opcodes; \
+         mv prev-opcodes stage2-opcodes; : ; \
         fi
  @endif opcodes
  @if binutils
-       @if test -d $(HOST_SUBDIR)/binutils ; then \
-         cd $(HOST_SUBDIR); mv binutils stage3-binutils ; \
-         mv prev-binutils stage2-binutils ; :  ; \
+       @if test -d $(HOST_SUBDIR)/binutils; then \
+         cd $(HOST_SUBDIR); mv binutils stage3-binutils; \
+         mv prev-binutils stage2-binutils; : ; \
         fi
  @endif binutils
+@if fixincludes
+       @if test -d $(HOST_SUBDIR)/fixincludes; then \
+         cd $(HOST_SUBDIR); mv fixincludes stage3-fixincludes; \
+         mv prev-fixincludes stage2-fixincludes; : ; \
+       fi
+@endif fixincludes
  @if gas
-       @if test -d $(HOST_SUBDIR)/gas ; then \
-         cd $(HOST_SUBDIR); mv gas stage3-gas ; \
-         mv prev-gas stage2-gas ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gas; then \
+         cd $(HOST_SUBDIR); mv gas stage3-gas; \
+         mv prev-gas stage2-gas; : ; \
         fi
  @endif gas
  @if gcc
-       @if test -d $(HOST_SUBDIR)/gcc ; then \
-         cd $(HOST_SUBDIR); mv gcc stage3-gcc ; \
-         mv prev-gcc stage2-gcc ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gcc; then \
+         cd $(HOST_SUBDIR); mv gcc stage3-gcc; \
+         mv prev-gcc stage2-gcc; : ; \
         fi
  @endif gcc
  @if gmp
-       @if test -d $(HOST_SUBDIR)/gmp ; then \
-         cd $(HOST_SUBDIR); mv gmp stage3-gmp ; \
-         mv prev-gmp stage2-gmp ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gmp; then \
+         cd $(HOST_SUBDIR); mv gmp stage3-gmp; \
+         mv prev-gmp stage2-gmp; : ; \
         fi
  @endif gmp
  @if mpfr
-       @if test -d $(HOST_SUBDIR)/mpfr ; then \
-         cd $(HOST_SUBDIR); mv mpfr stage3-mpfr ; \
-         mv prev-mpfr stage2-mpfr ; :  ; \
+       @if test -d $(HOST_SUBDIR)/mpfr; then \
+         cd $(HOST_SUBDIR); mv mpfr stage3-mpfr; \
+         mv prev-mpfr stage2-mpfr; : ; \
         fi
  @endif mpfr
  @if mpc
-       @if test -d $(HOST_SUBDIR)/mpc ; then \
-         cd $(HOST_SUBDIR); mv mpc stage3-mpc ; \
-         mv prev-mpc stage2-mpc ; :  ; \
+       @if test -d $(HOST_SUBDIR)/mpc; then \
+         cd $(HOST_SUBDIR); mv mpc stage3-mpc; \
+         mv prev-mpc stage2-mpc; : ; \
         fi
  @endif mpc
  @if isl
-       @if test -d $(HOST_SUBDIR)/isl ; then \
-         cd $(HOST_SUBDIR); mv isl stage3-isl ; \
-         mv prev-isl stage2-isl ; :  ; \
+       @if test -d $(HOST_SUBDIR)/isl; then \
+         cd $(HOST_SUBDIR); mv isl stage3-isl; \
+         mv prev-isl stage2-isl; : ; \
         fi
  @endif isl
-@if cloog
-       @if test -d $(HOST_SUBDIR)/cloog ; then \
-         cd $(HOST_SUBDIR); mv cloog stage3-cloog ; \
-         mv prev-cloog stage2-cloog ; :  ; \
-       fi
-@endif cloog
  @if libelf
-       @if test -d $(HOST_SUBDIR)/libelf ; then \
-         cd $(HOST_SUBDIR); mv libelf stage3-libelf ; \
-         mv prev-libelf stage2-libelf ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libelf; then \
+         cd $(HOST_SUBDIR); mv libelf stage3-libelf; \
+         mv prev-libelf stage2-libelf; : ; \
         fi
  @endif libelf
  @if gold
-       @if test -d $(HOST_SUBDIR)/gold ; then \
-         cd $(HOST_SUBDIR); mv gold stage3-gold ; \
-         mv prev-gold stage2-gold ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gold; then \
+         cd $(HOST_SUBDIR); mv gold stage3-gold; \
+         mv prev-gold stage2-gold; : ; \
         fi
  @endif gold
  @if intl
-       @if test -d $(HOST_SUBDIR)/intl ; then \
-         cd $(HOST_SUBDIR); mv intl stage3-intl ; \
-         mv prev-intl stage2-intl ; :  ; \
+       @if test -d $(HOST_SUBDIR)/intl; then \
+         cd $(HOST_SUBDIR); mv intl stage3-intl; \
+         mv prev-intl stage2-intl; : ; \
         fi
  @endif intl
  @if ld
-       @if test -d $(HOST_SUBDIR)/ld ; then \
-         cd $(HOST_SUBDIR); mv ld stage3-ld ; \
-         mv prev-ld stage2-ld ; :  ; \
+       @if test -d $(HOST_SUBDIR)/ld; then \
+         cd $(HOST_SUBDIR); mv ld stage3-ld; \
+         mv prev-ld stage2-ld; : ; \
         fi
  @endif ld
  @if libbacktrace
-       @if test -d $(HOST_SUBDIR)/libbacktrace ; then \
-         cd $(HOST_SUBDIR); mv libbacktrace stage3-libbacktrace ; \
-         mv prev-libbacktrace stage2-libbacktrace ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libbacktrace; then \
+         cd $(HOST_SUBDIR); mv libbacktrace stage3-libbacktrace; \
+         mv prev-libbacktrace stage2-libbacktrace; : ; \
         fi
  @endif libbacktrace
  @if libcpp
-       @if test -d $(HOST_SUBDIR)/libcpp ; then \
-         cd $(HOST_SUBDIR); mv libcpp stage3-libcpp ; \
-         mv prev-libcpp stage2-libcpp ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libcpp; then \
+         cd $(HOST_SUBDIR); mv libcpp stage3-libcpp; \
+         mv prev-libcpp stage2-libcpp; : ; \
         fi
  @endif libcpp
  @if libdecnumber
-       @if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-         cd $(HOST_SUBDIR); mv libdecnumber stage3-libdecnumber ; \
-         mv prev-libdecnumber stage2-libdecnumber ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libdecnumber; then \
+         cd $(HOST_SUBDIR); mv libdecnumber stage3-libdecnumber; \
+         mv prev-libdecnumber stage2-libdecnumber; : ; \
         fi
  @endif libdecnumber
  @if libiberty
-       @if test -d $(HOST_SUBDIR)/libiberty ; then \
-         cd $(HOST_SUBDIR); mv libiberty stage3-libiberty ; \
-         mv prev-libiberty stage2-libiberty ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libiberty; then \
+         cd $(HOST_SUBDIR); mv libiberty stage3-libiberty; \
+         mv prev-libiberty stage2-libiberty; : ; \
         fi
  @endif libiberty
+@if libiberty-linker-plugin
+       @if test -d $(HOST_SUBDIR)/libiberty-linker-plugin; then \
+         cd $(HOST_SUBDIR); mv libiberty-linker-plugin stage3-libiberty-linker-plugin; \
+         mv prev-libiberty-linker-plugin stage2-libiberty-linker-plugin; : ; \
+       fi
+@endif libiberty-linker-plugin
+@if libiconv
+       @if test -d $(HOST_SUBDIR)/libiconv; then \
+         cd $(HOST_SUBDIR); mv libiconv stage3-libiconv; \
+         mv prev-libiconv stage2-libiconv; : ; \
+       fi
+@endif libiconv
  @if zlib
-       @if test -d $(HOST_SUBDIR)/zlib ; then \
-         cd $(HOST_SUBDIR); mv zlib stage3-zlib ; \
-         mv prev-zlib stage2-zlib ; :  ; \
+       @if test -d $(HOST_SUBDIR)/zlib; then \
+         cd $(HOST_SUBDIR); mv zlib stage3-zlib; \
+         mv prev-zlib stage2-zlib; : ; \
         fi
  @endif zlib
  @if lto-plugin
-       @if test -d $(HOST_SUBDIR)/lto-plugin ; then \
-         cd $(HOST_SUBDIR); mv lto-plugin stage3-lto-plugin ; \
-         mv prev-lto-plugin stage2-lto-plugin ; :  ; \
+       @if test -d $(HOST_SUBDIR)/lto-plugin; then \
+         cd $(HOST_SUBDIR); mv lto-plugin stage3-lto-plugin; \
+         mv prev-lto-plugin stage2-lto-plugin; : ; \
         fi
  @endif lto-plugin
-       @if 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
  
@@ -43459,13 +47963,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
@@ -43482,16 +47986,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; \
@@ -43501,16 +48005,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-*; \
@@ -43571,258 +48075,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 stage3-fixincludes prev-fixincludes || test -f stage3-lean 
+@endif fixincludes
  @if gas
         @cd $(HOST_SUBDIR); [ -d stage4-gas ] || \
           mkdir stage4-gas; \
-       mv stage4-gas gas  ; \
+       mv stage4-gas gas; \
         mv stage3-gas prev-gas || test -f stage3-lean 
  @endif gas
  @if gcc
         @cd $(HOST_SUBDIR); [ -d stage4-gcc ] || \
           mkdir stage4-gcc; \
-       mv stage4-gcc gcc  ; \
+       mv stage4-gcc gcc; \
         mv stage3-gcc prev-gcc || test -f stage3-lean 
  @endif gcc
  @if gmp
         @cd $(HOST_SUBDIR); [ -d stage4-gmp ] || \
           mkdir stage4-gmp; \
-       mv stage4-gmp gmp  ; \
+       mv stage4-gmp gmp; \
         mv stage3-gmp prev-gmp || test -f stage3-lean 
  @endif gmp
  @if mpfr
         @cd $(HOST_SUBDIR); [ -d stage4-mpfr ] || \
           mkdir stage4-mpfr; \
-       mv stage4-mpfr mpfr  ; \
+       mv stage4-mpfr mpfr; \
         mv stage3-mpfr prev-mpfr || test -f stage3-lean 
  @endif mpfr
  @if mpc
         @cd $(HOST_SUBDIR); [ -d stage4-mpc ] || \
           mkdir stage4-mpc; \
-       mv stage4-mpc mpc  ; \
+       mv stage4-mpc mpc; \
         mv stage3-mpc prev-mpc || test -f stage3-lean 
  @endif mpc
  @if isl
         @cd $(HOST_SUBDIR); [ -d stage4-isl ] || \
           mkdir stage4-isl; \
-       mv stage4-isl isl  ; \
+       mv stage4-isl isl; \
         mv stage3-isl prev-isl || test -f stage3-lean 
  @endif isl
-@if cloog
-       @cd $(HOST_SUBDIR); [ -d stage4-cloog ] || \
-         mkdir stage4-cloog; \
-       mv stage4-cloog cloog  ; \
-       mv stage3-cloog prev-cloog || test -f stage3-lean 
-@endif cloog
  @if libelf
         @cd $(HOST_SUBDIR); [ -d stage4-libelf ] || \
           mkdir stage4-libelf; \
-       mv stage4-libelf libelf  ; \
+       mv stage4-libelf libelf; \
         mv stage3-libelf prev-libelf || test -f stage3-lean 
  @endif libelf
  @if gold
         @cd $(HOST_SUBDIR); [ -d stage4-gold ] || \
           mkdir stage4-gold; \
-       mv stage4-gold gold  ; \
+       mv stage4-gold gold; \
         mv stage3-gold prev-gold || test -f stage3-lean 
  @endif gold
  @if intl
         @cd $(HOST_SUBDIR); [ -d stage4-intl ] || \
           mkdir stage4-intl; \
-       mv stage4-intl intl  ; \
+       mv stage4-intl intl; \
         mv stage3-intl prev-intl || test -f stage3-lean 
  @endif intl
  @if ld
         @cd $(HOST_SUBDIR); [ -d stage4-ld ] || \
           mkdir stage4-ld; \
-       mv stage4-ld ld  ; \
+       mv stage4-ld ld; \
         mv stage3-ld prev-ld || test -f stage3-lean 
  @endif ld
  @if libbacktrace
         @cd $(HOST_SUBDIR); [ -d stage4-libbacktrace ] || \
           mkdir stage4-libbacktrace; \
-       mv stage4-libbacktrace libbacktrace  ; \
+       mv stage4-libbacktrace libbacktrace; \
         mv stage3-libbacktrace prev-libbacktrace || test -f stage3-lean 
  @endif libbacktrace
  @if libcpp
         @cd $(HOST_SUBDIR); [ -d stage4-libcpp ] || \
           mkdir stage4-libcpp; \
-       mv stage4-libcpp libcpp  ; \
+       mv stage4-libcpp libcpp; \
         mv stage3-libcpp prev-libcpp || test -f stage3-lean 
  @endif libcpp
  @if libdecnumber
         @cd $(HOST_SUBDIR); [ -d stage4-libdecnumber ] || \
           mkdir stage4-libdecnumber; \
-       mv stage4-libdecnumber libdecnumber  ; \
+       mv stage4-libdecnumber libdecnumber; \
         mv stage3-libdecnumber prev-libdecnumber || test -f stage3-lean 
  @endif libdecnumber
  @if libiberty
         @cd $(HOST_SUBDIR); [ -d stage4-libiberty ] || \
           mkdir stage4-libiberty; \
-       mv stage4-libiberty libiberty  ; \
+       mv stage4-libiberty libiberty; \
         mv stage3-libiberty prev-libiberty || test -f stage3-lean 
  @endif libiberty
+@if libiberty-linker-plugin
+       @cd $(HOST_SUBDIR); [ -d stage4-libiberty-linker-plugin ] || \
+         mkdir stage4-libiberty-linker-plugin; \
+       mv stage4-libiberty-linker-plugin libiberty-linker-plugin; \
+       mv 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; : ; \
+       fi
+@endif fixincludes
  @if gas
-       @if test -d $(HOST_SUBDIR)/gas ; then \
-         cd $(HOST_SUBDIR); mv gas stage4-gas ; \
-         mv prev-gas stage3-gas ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gas; then \
+         cd $(HOST_SUBDIR); mv gas stage4-gas; \
+         mv prev-gas stage3-gas; : ; \
         fi
  @endif gas
  @if gcc
-       @if test -d $(HOST_SUBDIR)/gcc ; then \
-         cd $(HOST_SUBDIR); mv gcc stage4-gcc ; \
-         mv prev-gcc stage3-gcc ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gcc; then \
+         cd $(HOST_SUBDIR); mv gcc stage4-gcc; \
+         mv prev-gcc stage3-gcc; : ; \
         fi
  @endif gcc
  @if gmp
-       @if test -d $(HOST_SUBDIR)/gmp ; then \
-         cd $(HOST_SUBDIR); mv gmp stage4-gmp ; \
-         mv prev-gmp stage3-gmp ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gmp; then \
+         cd $(HOST_SUBDIR); mv gmp stage4-gmp; \
+         mv prev-gmp stage3-gmp; : ; \
         fi
  @endif gmp
  @if mpfr
-       @if test -d $(HOST_SUBDIR)/mpfr ; then \
-         cd $(HOST_SUBDIR); mv mpfr stage4-mpfr ; \
-         mv prev-mpfr stage3-mpfr ; :  ; \
+       @if test -d $(HOST_SUBDIR)/mpfr; then \
+         cd $(HOST_SUBDIR); mv mpfr stage4-mpfr; \
+         mv prev-mpfr stage3-mpfr; : ; \
         fi
  @endif mpfr
  @if mpc
-       @if test -d $(HOST_SUBDIR)/mpc ; then \
-         cd $(HOST_SUBDIR); mv mpc stage4-mpc ; \
-         mv prev-mpc stage3-mpc ; :  ; \
+       @if test -d $(HOST_SUBDIR)/mpc; then \
+         cd $(HOST_SUBDIR); mv mpc stage4-mpc; \
+         mv prev-mpc stage3-mpc; : ; \
         fi
  @endif mpc
  @if isl
-       @if test -d $(HOST_SUBDIR)/isl ; then \
-         cd $(HOST_SUBDIR); mv isl stage4-isl ; \
-         mv prev-isl stage3-isl ; :  ; \
+       @if test -d $(HOST_SUBDIR)/isl; then \
+         cd $(HOST_SUBDIR); mv isl stage4-isl; \
+         mv prev-isl stage3-isl; : ; \
         fi
  @endif isl
-@if cloog
-       @if test -d $(HOST_SUBDIR)/cloog ; then \
-         cd $(HOST_SUBDIR); mv cloog stage4-cloog ; \
-         mv prev-cloog stage3-cloog ; :  ; \
-       fi
-@endif cloog
  @if libelf
-       @if test -d $(HOST_SUBDIR)/libelf ; then \
-         cd $(HOST_SUBDIR); mv libelf stage4-libelf ; \
-         mv prev-libelf stage3-libelf ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libelf; then \
+         cd $(HOST_SUBDIR); mv libelf stage4-libelf; \
+         mv prev-libelf stage3-libelf; : ; \
         fi
  @endif libelf
  @if gold
-       @if test -d $(HOST_SUBDIR)/gold ; then \
-         cd $(HOST_SUBDIR); mv gold stage4-gold ; \
-         mv prev-gold stage3-gold ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gold; then \
+         cd $(HOST_SUBDIR); mv gold stage4-gold; \
+         mv prev-gold stage3-gold; : ; \
         fi
  @endif gold
  @if intl
-       @if test -d $(HOST_SUBDIR)/intl ; then \
-         cd $(HOST_SUBDIR); mv intl stage4-intl ; \
-         mv prev-intl stage3-intl ; :  ; \
+       @if test -d $(HOST_SUBDIR)/intl; then \
+         cd $(HOST_SUBDIR); mv intl stage4-intl; \
+         mv prev-intl stage3-intl; : ; \
         fi
  @endif intl
  @if ld
-       @if test -d $(HOST_SUBDIR)/ld ; then \
-         cd $(HOST_SUBDIR); mv ld stage4-ld ; \
-         mv prev-ld stage3-ld ; :  ; \
+       @if test -d $(HOST_SUBDIR)/ld; then \
+         cd $(HOST_SUBDIR); mv ld stage4-ld; \
+         mv prev-ld stage3-ld; : ; \
         fi
  @endif ld
  @if libbacktrace
-       @if test -d $(HOST_SUBDIR)/libbacktrace ; then \
-         cd $(HOST_SUBDIR); mv libbacktrace stage4-libbacktrace ; \
-         mv prev-libbacktrace stage3-libbacktrace ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libbacktrace; then \
+         cd $(HOST_SUBDIR); mv libbacktrace stage4-libbacktrace; \
+         mv prev-libbacktrace stage3-libbacktrace; : ; \
         fi
  @endif libbacktrace
  @if libcpp
-       @if test -d $(HOST_SUBDIR)/libcpp ; then \
-         cd $(HOST_SUBDIR); mv libcpp stage4-libcpp ; \
-         mv prev-libcpp stage3-libcpp ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libcpp; then \
+         cd $(HOST_SUBDIR); mv libcpp stage4-libcpp; \
+         mv prev-libcpp stage3-libcpp; : ; \
         fi
  @endif libcpp
  @if libdecnumber
-       @if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-         cd $(HOST_SUBDIR); mv libdecnumber stage4-libdecnumber ; \
-         mv prev-libdecnumber stage3-libdecnumber ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libdecnumber; then \
+         cd $(HOST_SUBDIR); mv libdecnumber stage4-libdecnumber; \
+         mv prev-libdecnumber stage3-libdecnumber; : ; \
         fi
  @endif libdecnumber
  @if libiberty
-       @if test -d $(HOST_SUBDIR)/libiberty ; then \
-         cd $(HOST_SUBDIR); mv libiberty stage4-libiberty ; \
-         mv prev-libiberty stage3-libiberty ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libiberty; then \
+         cd $(HOST_SUBDIR); mv libiberty stage4-libiberty; \
+         mv prev-libiberty stage3-libiberty; : ; \
         fi
  @endif libiberty
+@if libiberty-linker-plugin
+       @if test -d $(HOST_SUBDIR)/libiberty-linker-plugin; then \
+         cd $(HOST_SUBDIR); mv libiberty-linker-plugin stage4-libiberty-linker-plugin; \
+         mv prev-libiberty-linker-plugin stage3-libiberty-linker-plugin; : ; \
+       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
  
@@ -43833,13 +48361,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
@@ -43856,16 +48384,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; \
@@ -43875,16 +48403,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-*; \
@@ -43933,258 +48461,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 stage1-fixincludes prev-fixincludes || test -f stage1-lean 
+@endif fixincludes
  @if gas
         @cd $(HOST_SUBDIR); [ -d stageprofile-gas ] || \
           mkdir stageprofile-gas; \
-       mv stageprofile-gas gas  ; \
+       mv stageprofile-gas gas; \
         mv stage1-gas prev-gas || test -f stage1-lean 
  @endif gas
  @if gcc
         @cd $(HOST_SUBDIR); [ -d stageprofile-gcc ] || \
           mkdir stageprofile-gcc; \
-       mv stageprofile-gcc gcc  ; \
+       mv stageprofile-gcc gcc; \
         mv stage1-gcc prev-gcc || test -f stage1-lean 
  @endif gcc
  @if gmp
         @cd $(HOST_SUBDIR); [ -d stageprofile-gmp ] || \
           mkdir stageprofile-gmp; \
-       mv stageprofile-gmp gmp  ; \
+       mv stageprofile-gmp gmp; \
         mv stage1-gmp prev-gmp || test -f stage1-lean 
  @endif gmp
  @if mpfr
         @cd $(HOST_SUBDIR); [ -d stageprofile-mpfr ] || \
           mkdir stageprofile-mpfr; \
-       mv stageprofile-mpfr mpfr  ; \
+       mv stageprofile-mpfr mpfr; \
         mv stage1-mpfr prev-mpfr || test -f stage1-lean 
  @endif mpfr
  @if mpc
         @cd $(HOST_SUBDIR); [ -d stageprofile-mpc ] || \
           mkdir stageprofile-mpc; \
-       mv stageprofile-mpc mpc  ; \
+       mv stageprofile-mpc mpc; \
         mv stage1-mpc prev-mpc || test -f stage1-lean 
  @endif mpc
  @if isl
         @cd $(HOST_SUBDIR); [ -d stageprofile-isl ] || \
           mkdir stageprofile-isl; \
-       mv stageprofile-isl isl  ; \
+       mv stageprofile-isl isl; \
         mv stage1-isl prev-isl || test -f stage1-lean 
  @endif isl
-@if cloog
-       @cd $(HOST_SUBDIR); [ -d stageprofile-cloog ] || \
-         mkdir stageprofile-cloog; \
-       mv stageprofile-cloog cloog  ; \
-       mv stage1-cloog prev-cloog || test -f stage1-lean 
-@endif cloog
  @if libelf
         @cd $(HOST_SUBDIR); [ -d stageprofile-libelf ] || \
           mkdir stageprofile-libelf; \
-       mv stageprofile-libelf libelf  ; \
+       mv stageprofile-libelf libelf; \
         mv stage1-libelf prev-libelf || test -f stage1-lean 
  @endif libelf
  @if gold
         @cd $(HOST_SUBDIR); [ -d stageprofile-gold ] || \
           mkdir stageprofile-gold; \
-       mv stageprofile-gold gold  ; \
+       mv stageprofile-gold gold; \
         mv stage1-gold prev-gold || test -f stage1-lean 
  @endif gold
  @if intl
         @cd $(HOST_SUBDIR); [ -d stageprofile-intl ] || \
           mkdir stageprofile-intl; \
-       mv stageprofile-intl intl  ; \
+       mv stageprofile-intl intl; \
         mv stage1-intl prev-intl || test -f stage1-lean 
  @endif intl
  @if ld
         @cd $(HOST_SUBDIR); [ -d stageprofile-ld ] || \
           mkdir stageprofile-ld; \
-       mv stageprofile-ld ld  ; \
+       mv stageprofile-ld ld; \
         mv stage1-ld prev-ld || test -f stage1-lean 
  @endif ld
  @if libbacktrace
         @cd $(HOST_SUBDIR); [ -d stageprofile-libbacktrace ] || \
           mkdir stageprofile-libbacktrace; \
-       mv stageprofile-libbacktrace libbacktrace  ; \
+       mv stageprofile-libbacktrace libbacktrace; \
         mv stage1-libbacktrace prev-libbacktrace || test -f stage1-lean 
  @endif libbacktrace
  @if libcpp
         @cd $(HOST_SUBDIR); [ -d stageprofile-libcpp ] || \
           mkdir stageprofile-libcpp; \
-       mv stageprofile-libcpp libcpp  ; \
+       mv stageprofile-libcpp libcpp; \
         mv stage1-libcpp prev-libcpp || test -f stage1-lean 
  @endif libcpp
  @if libdecnumber
         @cd $(HOST_SUBDIR); [ -d stageprofile-libdecnumber ] || \
           mkdir stageprofile-libdecnumber; \
-       mv stageprofile-libdecnumber libdecnumber  ; \
+       mv stageprofile-libdecnumber libdecnumber; \
         mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean 
  @endif libdecnumber
  @if libiberty
         @cd $(HOST_SUBDIR); [ -d stageprofile-libiberty ] || \
           mkdir stageprofile-libiberty; \
-       mv stageprofile-libiberty libiberty  ; \
+       mv stageprofile-libiberty libiberty; \
         mv stage1-libiberty prev-libiberty || test -f stage1-lean 
  @endif libiberty
+@if libiberty-linker-plugin
+       @cd $(HOST_SUBDIR); [ -d stageprofile-libiberty-linker-plugin ] || \
+         mkdir stageprofile-libiberty-linker-plugin; \
+       mv stageprofile-libiberty-linker-plugin libiberty-linker-plugin; \
+       mv 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; : ; \
+       fi
+@endif fixincludes
  @if gas
-       @if test -d $(HOST_SUBDIR)/gas ; then \
-         cd $(HOST_SUBDIR); mv gas stageprofile-gas ; \
-         mv prev-gas stage1-gas ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gas; then \
+         cd $(HOST_SUBDIR); mv gas stageprofile-gas; \
+         mv prev-gas stage1-gas; : ; \
         fi
  @endif gas
  @if gcc
-       @if test -d $(HOST_SUBDIR)/gcc ; then \
-         cd $(HOST_SUBDIR); mv gcc stageprofile-gcc ; \
-         mv prev-gcc stage1-gcc ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gcc; then \
+         cd $(HOST_SUBDIR); mv gcc stageprofile-gcc; \
+         mv prev-gcc stage1-gcc; : ; \
         fi
  @endif gcc
  @if gmp
-       @if test -d $(HOST_SUBDIR)/gmp ; then \
-         cd $(HOST_SUBDIR); mv gmp stageprofile-gmp ; \
-         mv prev-gmp stage1-gmp ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gmp; then \
+         cd $(HOST_SUBDIR); mv gmp stageprofile-gmp; \
+         mv prev-gmp stage1-gmp; : ; \
         fi
  @endif gmp
  @if mpfr
-       @if test -d $(HOST_SUBDIR)/mpfr ; then \
-         cd $(HOST_SUBDIR); mv mpfr stageprofile-mpfr ; \
-         mv prev-mpfr stage1-mpfr ; :  ; \
+       @if test -d $(HOST_SUBDIR)/mpfr; then \
+         cd $(HOST_SUBDIR); mv mpfr stageprofile-mpfr; \
+         mv prev-mpfr stage1-mpfr; : ; \
         fi
  @endif mpfr
  @if mpc
-       @if test -d $(HOST_SUBDIR)/mpc ; then \
-         cd $(HOST_SUBDIR); mv mpc stageprofile-mpc ; \
-         mv prev-mpc stage1-mpc ; :  ; \
+       @if test -d $(HOST_SUBDIR)/mpc; then \
+         cd $(HOST_SUBDIR); mv mpc stageprofile-mpc; \
+         mv prev-mpc stage1-mpc; : ; \
         fi
  @endif mpc
  @if isl
-       @if test -d $(HOST_SUBDIR)/isl ; then \
-         cd $(HOST_SUBDIR); mv isl stageprofile-isl ; \
-         mv prev-isl stage1-isl ; :  ; \
+       @if test -d $(HOST_SUBDIR)/isl; then \
+         cd $(HOST_SUBDIR); mv isl stageprofile-isl; \
+         mv prev-isl stage1-isl; : ; \
         fi
  @endif isl
-@if cloog
-       @if test -d $(HOST_SUBDIR)/cloog ; then \
-         cd $(HOST_SUBDIR); mv cloog stageprofile-cloog ; \
-         mv prev-cloog stage1-cloog ; :  ; \
-       fi
-@endif cloog
  @if libelf
-       @if test -d $(HOST_SUBDIR)/libelf ; then \
-         cd $(HOST_SUBDIR); mv libelf stageprofile-libelf ; \
-         mv prev-libelf stage1-libelf ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libelf; then \
+         cd $(HOST_SUBDIR); mv libelf stageprofile-libelf; \
+         mv prev-libelf stage1-libelf; : ; \
         fi
  @endif libelf
  @if gold
-       @if test -d $(HOST_SUBDIR)/gold ; then \
-         cd $(HOST_SUBDIR); mv gold stageprofile-gold ; \
-         mv prev-gold stage1-gold ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gold; then \
+         cd $(HOST_SUBDIR); mv gold stageprofile-gold; \
+         mv prev-gold stage1-gold; : ; \
         fi
  @endif gold
  @if intl
-       @if test -d $(HOST_SUBDIR)/intl ; then \
-         cd $(HOST_SUBDIR); mv intl stageprofile-intl ; \
-         mv prev-intl stage1-intl ; :  ; \
+       @if test -d $(HOST_SUBDIR)/intl; then \
+         cd $(HOST_SUBDIR); mv intl stageprofile-intl; \
+         mv prev-intl stage1-intl; : ; \
         fi
  @endif intl
  @if ld
-       @if test -d $(HOST_SUBDIR)/ld ; then \
-         cd $(HOST_SUBDIR); mv ld stageprofile-ld ; \
-         mv prev-ld stage1-ld ; :  ; \
+       @if test -d $(HOST_SUBDIR)/ld; then \
+         cd $(HOST_SUBDIR); mv ld stageprofile-ld; \
+         mv prev-ld stage1-ld; : ; \
         fi
  @endif ld
  @if libbacktrace
-       @if test -d $(HOST_SUBDIR)/libbacktrace ; then \
-         cd $(HOST_SUBDIR); mv libbacktrace stageprofile-libbacktrace ; \
-         mv prev-libbacktrace stage1-libbacktrace ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libbacktrace; then \
+         cd $(HOST_SUBDIR); mv libbacktrace stageprofile-libbacktrace; \
+         mv prev-libbacktrace stage1-libbacktrace; : ; \
         fi
  @endif libbacktrace
  @if libcpp
-       @if test -d $(HOST_SUBDIR)/libcpp ; then \
-         cd $(HOST_SUBDIR); mv libcpp stageprofile-libcpp ; \
-         mv prev-libcpp stage1-libcpp ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libcpp; then \
+         cd $(HOST_SUBDIR); mv libcpp stageprofile-libcpp; \
+         mv prev-libcpp stage1-libcpp; : ; \
         fi
  @endif libcpp
  @if libdecnumber
-       @if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-         cd $(HOST_SUBDIR); mv libdecnumber stageprofile-libdecnumber ; \
-         mv prev-libdecnumber stage1-libdecnumber ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libdecnumber; then \
+         cd $(HOST_SUBDIR); mv libdecnumber stageprofile-libdecnumber; \
+         mv prev-libdecnumber stage1-libdecnumber; : ; \
         fi
  @endif libdecnumber
  @if libiberty
-       @if test -d $(HOST_SUBDIR)/libiberty ; then \
-         cd $(HOST_SUBDIR); mv libiberty stageprofile-libiberty ; \
-         mv prev-libiberty stage1-libiberty ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libiberty; then \
+         cd $(HOST_SUBDIR); mv libiberty stageprofile-libiberty; \
+         mv prev-libiberty stage1-libiberty; : ; \
         fi
  @endif libiberty
+@if libiberty-linker-plugin
+       @if test -d $(HOST_SUBDIR)/libiberty-linker-plugin; then \
+         cd $(HOST_SUBDIR); mv libiberty-linker-plugin stageprofile-libiberty-linker-plugin; \
+         mv prev-libiberty-linker-plugin stage1-libiberty-linker-plugin; : ; \
+       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
  
@@ -44195,8 +48747,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; \
@@ -44228,258 +48780,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 stageprofile-fixincludes prev-fixincludes || test -f stageprofile-lean 
+@endif fixincludes
  @if gas
         @cd $(HOST_SUBDIR); [ -d stagefeedback-gas ] || \
           mkdir stagefeedback-gas; \
-       mv stagefeedback-gas gas  ; \
+       mv stagefeedback-gas gas; \
         mv stageprofile-gas prev-gas || test -f stageprofile-lean 
  @endif gas
  @if gcc
         @cd $(HOST_SUBDIR); [ -d stagefeedback-gcc ] || \
           mkdir stagefeedback-gcc; \
-       mv stagefeedback-gcc gcc  ; \
+       mv stagefeedback-gcc gcc; \
         mv stageprofile-gcc prev-gcc || test -f stageprofile-lean 
  @endif gcc
  @if gmp
         @cd $(HOST_SUBDIR); [ -d stagefeedback-gmp ] || \
           mkdir stagefeedback-gmp; \
-       mv stagefeedback-gmp gmp  ; \
+       mv stagefeedback-gmp gmp; \
         mv stageprofile-gmp prev-gmp || test -f stageprofile-lean 
  @endif gmp
  @if mpfr
         @cd $(HOST_SUBDIR); [ -d stagefeedback-mpfr ] || \
           mkdir stagefeedback-mpfr; \
-       mv stagefeedback-mpfr mpfr  ; \
+       mv stagefeedback-mpfr mpfr; \
         mv stageprofile-mpfr prev-mpfr || test -f stageprofile-lean 
  @endif mpfr
  @if mpc
         @cd $(HOST_SUBDIR); [ -d stagefeedback-mpc ] || \
           mkdir stagefeedback-mpc; \
-       mv stagefeedback-mpc mpc  ; \
+       mv stagefeedback-mpc mpc; \
         mv stageprofile-mpc prev-mpc || test -f stageprofile-lean 
  @endif mpc
  @if isl
         @cd $(HOST_SUBDIR); [ -d stagefeedback-isl ] || \
           mkdir stagefeedback-isl; \
-       mv stagefeedback-isl isl  ; \
+       mv stagefeedback-isl isl; \
         mv stageprofile-isl prev-isl || test -f stageprofile-lean 
  @endif isl
-@if cloog
-       @cd $(HOST_SUBDIR); [ -d stagefeedback-cloog ] || \
-         mkdir stagefeedback-cloog; \
-       mv stagefeedback-cloog cloog  ; \
-       mv stageprofile-cloog prev-cloog || test -f stageprofile-lean 
-@endif cloog
  @if libelf
         @cd $(HOST_SUBDIR); [ -d stagefeedback-libelf ] || \
           mkdir stagefeedback-libelf; \
-       mv stagefeedback-libelf libelf  ; \
+       mv stagefeedback-libelf libelf; \
         mv stageprofile-libelf prev-libelf || test -f stageprofile-lean 
  @endif libelf
  @if gold
         @cd $(HOST_SUBDIR); [ -d stagefeedback-gold ] || \
           mkdir stagefeedback-gold; \
-       mv stagefeedback-gold gold  ; \
+       mv stagefeedback-gold gold; \
         mv stageprofile-gold prev-gold || test -f stageprofile-lean 
  @endif gold
  @if intl
         @cd $(HOST_SUBDIR); [ -d stagefeedback-intl ] || \
           mkdir stagefeedback-intl; \
-       mv stagefeedback-intl intl  ; \
+       mv stagefeedback-intl intl; \
         mv stageprofile-intl prev-intl || test -f stageprofile-lean 
  @endif intl
  @if ld
         @cd $(HOST_SUBDIR); [ -d stagefeedback-ld ] || \
           mkdir stagefeedback-ld; \
-       mv stagefeedback-ld ld  ; \
+       mv stagefeedback-ld ld; \
         mv stageprofile-ld prev-ld || test -f stageprofile-lean 
  @endif ld
  @if libbacktrace
         @cd $(HOST_SUBDIR); [ -d stagefeedback-libbacktrace ] || \
           mkdir stagefeedback-libbacktrace; \
-       mv stagefeedback-libbacktrace libbacktrace  ; \
+       mv stagefeedback-libbacktrace libbacktrace; \
         mv stageprofile-libbacktrace prev-libbacktrace || test -f stageprofile-lean 
  @endif libbacktrace
  @if libcpp
         @cd $(HOST_SUBDIR); [ -d stagefeedback-libcpp ] || \
           mkdir stagefeedback-libcpp; \
-       mv stagefeedback-libcpp libcpp  ; \
+       mv stagefeedback-libcpp libcpp; \
         mv stageprofile-libcpp prev-libcpp || test -f stageprofile-lean 
  @endif libcpp
  @if libdecnumber
         @cd $(HOST_SUBDIR); [ -d stagefeedback-libdecnumber ] || \
           mkdir stagefeedback-libdecnumber; \
-       mv stagefeedback-libdecnumber libdecnumber  ; \
+       mv stagefeedback-libdecnumber libdecnumber; \
         mv stageprofile-libdecnumber prev-libdecnumber || test -f stageprofile-lean 
  @endif libdecnumber
  @if libiberty
         @cd $(HOST_SUBDIR); [ -d stagefeedback-libiberty ] || \
           mkdir stagefeedback-libiberty; \
-       mv stagefeedback-libiberty libiberty  ; \
+       mv stagefeedback-libiberty libiberty; \
         mv stageprofile-libiberty prev-libiberty || test -f stageprofile-lean 
  @endif libiberty
+@if libiberty-linker-plugin
+       @cd $(HOST_SUBDIR); [ -d stagefeedback-libiberty-linker-plugin ] || \
+         mkdir stagefeedback-libiberty-linker-plugin; \
+       mv stagefeedback-libiberty-linker-plugin libiberty-linker-plugin; \
+       mv 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; : ; \
+       fi
+@endif fixincludes
  @if gas
-       @if test -d $(HOST_SUBDIR)/gas ; then \
-         cd $(HOST_SUBDIR); mv gas stagefeedback-gas ; \
-         mv prev-gas stageprofile-gas ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gas; then \
+         cd $(HOST_SUBDIR); mv gas stagefeedback-gas; \
+         mv prev-gas stageprofile-gas; : ; \
         fi
  @endif gas
  @if gcc
-       @if test -d $(HOST_SUBDIR)/gcc ; then \
-         cd $(HOST_SUBDIR); mv gcc stagefeedback-gcc ; \
-         mv prev-gcc stageprofile-gcc ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gcc; then \
+         cd $(HOST_SUBDIR); mv gcc stagefeedback-gcc; \
+         mv prev-gcc stageprofile-gcc; : ; \
         fi
  @endif gcc
  @if gmp
-       @if test -d $(HOST_SUBDIR)/gmp ; then \
-         cd $(HOST_SUBDIR); mv gmp stagefeedback-gmp ; \
-         mv prev-gmp stageprofile-gmp ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gmp; then \
+         cd $(HOST_SUBDIR); mv gmp stagefeedback-gmp; \
+         mv prev-gmp stageprofile-gmp; : ; \
         fi
  @endif gmp
  @if mpfr
-       @if test -d $(HOST_SUBDIR)/mpfr ; then \
-         cd $(HOST_SUBDIR); mv mpfr stagefeedback-mpfr ; \
-         mv prev-mpfr stageprofile-mpfr ; :  ; \
+       @if test -d $(HOST_SUBDIR)/mpfr; then \
+         cd $(HOST_SUBDIR); mv mpfr stagefeedback-mpfr; \
+         mv prev-mpfr stageprofile-mpfr; : ; \
         fi
  @endif mpfr
  @if mpc
-       @if test -d $(HOST_SUBDIR)/mpc ; then \
-         cd $(HOST_SUBDIR); mv mpc stagefeedback-mpc ; \
-         mv prev-mpc stageprofile-mpc ; :  ; \
+       @if test -d $(HOST_SUBDIR)/mpc; then \
+         cd $(HOST_SUBDIR); mv mpc stagefeedback-mpc; \
+         mv prev-mpc stageprofile-mpc; : ; \
         fi
  @endif mpc
  @if isl
-       @if test -d $(HOST_SUBDIR)/isl ; then \
-         cd $(HOST_SUBDIR); mv isl stagefeedback-isl ; \
-         mv prev-isl stageprofile-isl ; :  ; \
+       @if test -d $(HOST_SUBDIR)/isl; then \
+         cd $(HOST_SUBDIR); mv isl stagefeedback-isl; \
+         mv prev-isl stageprofile-isl; : ; \
         fi
  @endif isl
-@if cloog
-       @if test -d $(HOST_SUBDIR)/cloog ; then \
-         cd $(HOST_SUBDIR); mv cloog stagefeedback-cloog ; \
-         mv prev-cloog stageprofile-cloog ; :  ; \
-       fi
-@endif cloog
  @if libelf
-       @if test -d $(HOST_SUBDIR)/libelf ; then \
-         cd $(HOST_SUBDIR); mv libelf stagefeedback-libelf ; \
-         mv prev-libelf stageprofile-libelf ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libelf; then \
+         cd $(HOST_SUBDIR); mv libelf stagefeedback-libelf; \
+         mv prev-libelf stageprofile-libelf; : ; \
         fi
  @endif libelf
  @if gold
-       @if test -d $(HOST_SUBDIR)/gold ; then \
-         cd $(HOST_SUBDIR); mv gold stagefeedback-gold ; \
-         mv prev-gold stageprofile-gold ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gold; then \
+         cd $(HOST_SUBDIR); mv gold stagefeedback-gold; \
+         mv prev-gold stageprofile-gold; : ; \
         fi
  @endif gold
  @if intl
-       @if test -d $(HOST_SUBDIR)/intl ; then \
-         cd $(HOST_SUBDIR); mv intl stagefeedback-intl ; \
-         mv prev-intl stageprofile-intl ; :  ; \
+       @if test -d $(HOST_SUBDIR)/intl; then \
+         cd $(HOST_SUBDIR); mv intl stagefeedback-intl; \
+         mv prev-intl stageprofile-intl; : ; \
         fi
  @endif intl
  @if ld
-       @if test -d $(HOST_SUBDIR)/ld ; then \
-         cd $(HOST_SUBDIR); mv ld stagefeedback-ld ; \
-         mv prev-ld stageprofile-ld ; :  ; \
+       @if test -d $(HOST_SUBDIR)/ld; then \
+         cd $(HOST_SUBDIR); mv ld stagefeedback-ld; \
+         mv prev-ld stageprofile-ld; : ; \
         fi
  @endif ld
  @if libbacktrace
-       @if test -d $(HOST_SUBDIR)/libbacktrace ; then \
-         cd $(HOST_SUBDIR); mv libbacktrace stagefeedback-libbacktrace ; \
-         mv prev-libbacktrace stageprofile-libbacktrace ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libbacktrace; then \
+         cd $(HOST_SUBDIR); mv libbacktrace stagefeedback-libbacktrace; \
+         mv prev-libbacktrace stageprofile-libbacktrace; : ; \
         fi
  @endif libbacktrace
  @if libcpp
-       @if test -d $(HOST_SUBDIR)/libcpp ; then \
-         cd $(HOST_SUBDIR); mv libcpp stagefeedback-libcpp ; \
-         mv prev-libcpp stageprofile-libcpp ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libcpp; then \
+         cd $(HOST_SUBDIR); mv libcpp stagefeedback-libcpp; \
+         mv prev-libcpp stageprofile-libcpp; : ; \
         fi
  @endif libcpp
  @if libdecnumber
-       @if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-         cd $(HOST_SUBDIR); mv libdecnumber stagefeedback-libdecnumber ; \
-         mv prev-libdecnumber stageprofile-libdecnumber ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libdecnumber; then \
+         cd $(HOST_SUBDIR); mv libdecnumber stagefeedback-libdecnumber; \
+         mv prev-libdecnumber stageprofile-libdecnumber; : ; \
         fi
  @endif libdecnumber
  @if libiberty
-       @if test -d $(HOST_SUBDIR)/libiberty ; then \
-         cd $(HOST_SUBDIR); mv libiberty stagefeedback-libiberty ; \
-         mv prev-libiberty stageprofile-libiberty ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libiberty; then \
+         cd $(HOST_SUBDIR); mv libiberty stagefeedback-libiberty; \
+         mv prev-libiberty stageprofile-libiberty; : ; \
         fi
  @endif libiberty
+@if libiberty-linker-plugin
+       @if test -d $(HOST_SUBDIR)/libiberty-linker-plugin; then \
+         cd $(HOST_SUBDIR); mv libiberty-linker-plugin stagefeedback-libiberty-linker-plugin; \
+         mv prev-libiberty-linker-plugin stageprofile-libiberty-linker-plugin; : ; \
+       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
  
@@ -44490,8 +49066,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; \
@@ -44550,10 +49126,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
@@ -44590,7 +49166,26 @@ configure-stage3-target-libstdc++-v3: maybe-all-stage3-gcc
  configure-stage4-target-libstdc++-v3: maybe-all-stage4-gcc
  configure-stageprofile-target-libstdc++-v3: maybe-all-stageprofile-gcc
  configure-stagefeedback-target-libstdc++-v3: maybe-all-stagefeedback-gcc
-configure-target-libmudflap: stage_last
+configure-stage1-target-libsanitizer: maybe-all-stage1-gcc
+configure-stage2-target-libsanitizer: maybe-all-stage2-gcc
+configure-stage3-target-libsanitizer: maybe-all-stage3-gcc
+configure-stage4-target-libsanitizer: maybe-all-stage4-gcc
+configure-stageprofile-target-libsanitizer: maybe-all-stageprofile-gcc
+configure-stagefeedback-target-libsanitizer: maybe-all-stagefeedback-gcc
+configure-stage1-target-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
+configure-stage4-target-libvtv: maybe-all-stage4-gcc
+configure-stageprofile-target-libvtv: maybe-all-stageprofile-gcc
+configure-stagefeedback-target-libvtv: maybe-all-stagefeedback-gcc
+configure-target-libcilkrts: stage_last
+configure-target-liboffloadmic: stage_last
  configure-target-libssp: stage_last
  configure-target-newlib: stage_last
  configure-stage1-target-libgcc: maybe-all-stage1-gcc
@@ -44608,9 +49203,7 @@ configure-target-libtermcap: stage_last
  configure-target-winsup: stage_last
  configure-target-libgloss: stage_last
  configure-target-libffi: stage_last
-configure-target-libjava: stage_last
  configure-target-zlib: stage_last
-configure-target-boehm-gc: stage_last
  configure-target-rda: stage_last
  configure-target-libada: stage_last
  configure-stage1-target-libgomp: maybe-all-stage1-gcc
@@ -44625,7 +49218,11 @@ configure-target-libatomic: stage_last
  
  @if gcc-no-bootstrap
  configure-target-libstdc++-v3: maybe-all-gcc
-configure-target-libmudflap: maybe-all-gcc
+configure-target-libsanitizer: maybe-all-gcc
+configure-target-libmpx: maybe-all-gcc
+configure-target-libvtv: maybe-all-gcc
+configure-target-libcilkrts: maybe-all-gcc
+configure-target-liboffloadmic: maybe-all-gcc
  configure-target-libssp: maybe-all-gcc
  configure-target-newlib: maybe-all-gcc
  configure-target-libgcc: maybe-all-gcc
@@ -44638,9 +49235,7 @@ configure-target-libtermcap: maybe-all-gcc
  configure-target-winsup: maybe-all-gcc
  configure-target-libgloss: maybe-all-gcc
  configure-target-libffi: maybe-all-gcc
-configure-target-libjava: maybe-all-gcc
  configure-target-zlib: maybe-all-gcc
-configure-target-boehm-gc: maybe-all-gcc
  configure-target-rda: maybe-all-gcc
  configure-target-libada: maybe-all-gcc
  configure-target-libgomp: maybe-all-gcc
@@ -44673,6 +49268,7 @@ all-build-flex: maybe-all-build-m4
  all-build-libiberty: maybe-all-build-texinfo
  all-build-m4: maybe-all-build-texinfo
  all-build-fixincludes: maybe-all-build-libiberty
+all-build-libcpp: maybe-all-build-libiberty
  configure-gcc: maybe-configure-intl
  
  configure-stage1-gcc: maybe-configure-stage1-intl
@@ -44681,6 +49277,38 @@ configure-stage3-gcc: maybe-configure-stage3-intl
  configure-stage4-gcc: maybe-configure-stage4-intl
  configure-stageprofile-gcc: maybe-configure-stageprofile-intl
  configure-stagefeedback-gcc: maybe-configure-stagefeedback-intl
+configure-gcc: maybe-all-gmp
+
+configure-stage1-gcc: maybe-all-stage1-gmp
+configure-stage2-gcc: maybe-all-stage2-gmp
+configure-stage3-gcc: maybe-all-stage3-gmp
+configure-stage4-gcc: maybe-all-stage4-gmp
+configure-stageprofile-gcc: maybe-all-stageprofile-gmp
+configure-stagefeedback-gcc: maybe-all-stagefeedback-gmp
+configure-gcc: maybe-all-mpfr
+
+configure-stage1-gcc: maybe-all-stage1-mpfr
+configure-stage2-gcc: maybe-all-stage2-mpfr
+configure-stage3-gcc: maybe-all-stage3-mpfr
+configure-stage4-gcc: maybe-all-stage4-mpfr
+configure-stageprofile-gcc: maybe-all-stageprofile-mpfr
+configure-stagefeedback-gcc: maybe-all-stagefeedback-mpfr
+configure-gcc: maybe-all-mpc
+
+configure-stage1-gcc: maybe-all-stage1-mpc
+configure-stage2-gcc: maybe-all-stage2-mpc
+configure-stage3-gcc: maybe-all-stage3-mpc
+configure-stage4-gcc: maybe-all-stage4-mpc
+configure-stageprofile-gcc: maybe-all-stageprofile-mpc
+configure-stagefeedback-gcc: maybe-all-stagefeedback-mpc
+configure-gcc: maybe-all-isl
+
+configure-stage1-gcc: maybe-all-stage1-isl
+configure-stage2-gcc: maybe-all-stage2-isl
+configure-stage3-gcc: maybe-all-stage3-isl
+configure-stage4-gcc: maybe-all-stage4-isl
+configure-stageprofile-gcc: maybe-all-stageprofile-isl
+configure-stagefeedback-gcc: maybe-all-stagefeedback-isl
  configure-gcc: maybe-all-lto-plugin
  
  configure-stage1-gcc: maybe-all-stage1-lto-plugin
@@ -44729,6 +49357,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
@@ -44737,14 +49373,6 @@ all-stage3-gcc: all-stage3-libiberty
  all-stage4-gcc: all-stage4-libiberty
  all-stageprofile-gcc: all-stageprofile-libiberty
  all-stagefeedback-gcc: all-stagefeedback-libiberty
-all-gcc: maybe-all-gmp
-
-all-stage1-gcc: maybe-all-stage1-gmp
-all-stage2-gcc: maybe-all-stage2-gmp
-all-stage3-gcc: maybe-all-stage3-gmp
-all-stage4-gcc: maybe-all-stage4-gmp
-all-stageprofile-gcc: maybe-all-stageprofile-gmp
-all-stagefeedback-gcc: maybe-all-stagefeedback-gmp
  all-gcc: maybe-all-intl
  
  all-stage1-gcc: maybe-all-stage1-intl
@@ -44769,14 +49397,14 @@ all-stage3-gcc: maybe-all-stage3-mpc
  all-stage4-gcc: maybe-all-stage4-mpc
  all-stageprofile-gcc: maybe-all-stageprofile-mpc
  all-stagefeedback-gcc: maybe-all-stagefeedback-mpc
-all-gcc: maybe-all-cloog
-
-all-stage1-gcc: maybe-all-stage1-cloog
-all-stage2-gcc: maybe-all-stage2-cloog
-all-stage3-gcc: maybe-all-stage3-cloog
-all-stage4-gcc: maybe-all-stage4-cloog
-all-stageprofile-gcc: maybe-all-stageprofile-cloog
-all-stagefeedback-gcc: maybe-all-stagefeedback-cloog
+all-gcc: maybe-all-isl
+
+all-stage1-gcc: maybe-all-stage1-isl
+all-stage2-gcc: maybe-all-stage2-isl
+all-stage3-gcc: maybe-all-stage3-isl
+all-stage4-gcc: maybe-all-stage4-isl
+all-stageprofile-gcc: maybe-all-stageprofile-isl
+all-stagefeedback-gcc: maybe-all-stagefeedback-isl
  all-gcc: maybe-all-build-texinfo
  
  all-stage1-gcc: maybe-all-build-texinfo
@@ -44817,6 +49445,14 @@ all-stage3-gcc: maybe-all-build-fixincludes
  all-stage4-gcc: maybe-all-build-fixincludes
  all-stageprofile-gcc: maybe-all-build-fixincludes
  all-stagefeedback-gcc: maybe-all-build-fixincludes
+all-gcc: maybe-all-build-libcpp
+
+all-stage1-gcc: maybe-all-build-libcpp
+all-stage2-gcc: maybe-all-build-libcpp
+all-stage3-gcc: maybe-all-build-libcpp
+all-stage4-gcc: maybe-all-build-libcpp
+all-stageprofile-gcc: maybe-all-build-libcpp
+all-stagefeedback-gcc: maybe-all-build-libcpp
  all-gcc: maybe-all-zlib
  
  all-stage1-gcc: maybe-all-stage1-zlib
@@ -44858,6 +49494,13 @@ all-stage4-gcc: maybe-all-stage4-libiberty
  all-stageprofile-gcc: maybe-all-stageprofile-libiberty
  all-stagefeedback-gcc: maybe-all-stagefeedback-libiberty
  all-gcc: maybe-all-fixincludes
+
+all-stage1-gcc: maybe-all-stage1-fixincludes
+all-stage2-gcc: maybe-all-stage2-fixincludes
+all-stage3-gcc: maybe-all-stage3-fixincludes
+all-stage4-gcc: maybe-all-stage4-fixincludes
+all-stageprofile-gcc: maybe-all-stageprofile-fixincludes
+all-stagefeedback-gcc: maybe-all-stagefeedback-fixincludes
  all-gcc: maybe-all-lto-plugin
  
  all-stage1-gcc: maybe-all-stage1-lto-plugin
@@ -44866,6 +49509,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
@@ -44918,6 +49569,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
@@ -44934,8 +49593,24 @@ 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
+all-stage2-fixincludes: maybe-all-stage2-libiberty
+all-stage3-fixincludes: maybe-all-stage3-libiberty
+all-stage4-fixincludes: maybe-all-stage4-libiberty
+all-stageprofile-fixincludes: maybe-all-stageprofile-libiberty
+all-stagefeedback-fixincludes: maybe-all-stagefeedback-libiberty
  all-gnattools: maybe-all-target-libada
+all-gnattools: maybe-all-target-libstdc++-v3
  all-lto-plugin: maybe-all-libiberty
  
  all-stage1-lto-plugin: maybe-all-stage1-libiberty
@@ -44944,7 +49619,26 @@ all-stage3-lto-plugin: maybe-all-stage3-libiberty
  all-stage4-lto-plugin: maybe-all-stage4-libiberty
  all-stageprofile-lto-plugin: maybe-all-stageprofile-libiberty
  all-stagefeedback-lto-plugin: maybe-all-stagefeedback-libiberty
+all-lto-plugin: maybe-all-libiberty-linker-plugin
+
+all-stage1-lto-plugin: maybe-all-stage1-libiberty-linker-plugin
+all-stage2-lto-plugin: maybe-all-stage2-libiberty-linker-plugin
+all-stage3-lto-plugin: maybe-all-stage3-libiberty-linker-plugin
+all-stage4-lto-plugin: maybe-all-stage4-libiberty-linker-plugin
+all-stageprofile-lto-plugin: maybe-all-stageprofile-libiberty-linker-plugin
+all-stagefeedback-lto-plugin: maybe-all-stagefeedback-libiberty-linker-plugin
+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
@@ -44969,22 +49663,14 @@ configure-stage3-isl: maybe-all-stage3-gmp
  configure-stage4-isl: maybe-all-stage4-gmp
  configure-stageprofile-isl: maybe-all-stageprofile-gmp
  configure-stagefeedback-isl: maybe-all-stagefeedback-gmp
-configure-cloog: maybe-all-isl
-
-configure-stage1-cloog: maybe-all-stage1-isl
-configure-stage2-cloog: maybe-all-stage2-isl
-configure-stage3-cloog: maybe-all-stage3-isl
-configure-stage4-cloog: maybe-all-stage4-isl
-configure-stageprofile-cloog: maybe-all-stageprofile-isl
-configure-stagefeedback-cloog: maybe-all-stagefeedback-isl
-configure-cloog: maybe-all-gmp
-
-configure-stage1-cloog: maybe-all-stage1-gmp
-configure-stage2-cloog: maybe-all-stage2-gmp
-configure-stage3-cloog: maybe-all-stage3-gmp
-configure-stage4-cloog: maybe-all-stage4-gmp
-configure-stageprofile-cloog: maybe-all-stageprofile-gmp
-configure-stagefeedback-cloog: maybe-all-stagefeedback-gmp
+all-intl: maybe-all-libiconv
+
+all-stage1-intl: maybe-all-stage1-libiconv
+all-stage2-intl: maybe-all-stage2-libiconv
+all-stage3-intl: maybe-all-stage3-libiconv
+all-stage4-intl: maybe-all-stage4-libiconv
+all-stageprofile-intl: maybe-all-stageprofile-libiconv
+all-stagefeedback-intl: maybe-all-stagefeedback-libiconv
  configure-gdb: maybe-all-intl
  configure-gdb: maybe-configure-sim
  configure-gdb: maybe-all-bfd
@@ -45034,6 +49720,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
@@ -45106,6 +49800,14 @@ all-stage3-binutils: maybe-all-stage3-intl
  all-stage4-binutils: maybe-all-stage4-intl
  all-stageprofile-binutils: maybe-all-stageprofile-intl
  all-stagefeedback-binutils: maybe-all-stagefeedback-intl
+all-binutils: maybe-all-gas
+
+all-stage1-binutils: maybe-all-stage1-gas
+all-stage2-binutils: maybe-all-stage2-gas
+all-stage3-binutils: maybe-all-stage3-gas
+all-stage4-binutils: maybe-all-stage4-gas
+all-stageprofile-binutils: maybe-all-stageprofile-gas
+all-stagefeedback-binutils: maybe-all-stagefeedback-gas
  install-binutils: maybe-install-opcodes
  install-strip-binutils: maybe-install-strip-opcodes
  install-opcodes: maybe-install-bfd
@@ -45155,6 +49857,7 @@ all-gprof: maybe-all-libiberty
  all-gprof: maybe-all-bfd
  all-gprof: maybe-all-opcodes
  all-gprof: maybe-all-intl
+all-gprof: maybe-all-gas
  configure-ld: maybe-configure-intl
  
  configure-stage1-ld: maybe-configure-stage1-intl
@@ -45211,6 +49914,22 @@ all-stage3-ld: maybe-all-stage3-intl
  all-stage4-ld: maybe-all-stage4-intl
  all-stageprofile-ld: maybe-all-stageprofile-intl
  all-stagefeedback-ld: maybe-all-stagefeedback-intl
+all-ld: maybe-all-gas
+
+all-stage1-ld: maybe-all-stage1-gas
+all-stage2-ld: maybe-all-stage2-gas
+all-stage3-ld: maybe-all-stage3-gas
+all-stage4-ld: maybe-all-stage4-gas
+all-stageprofile-ld: maybe-all-stageprofile-gas
+all-stagefeedback-ld: maybe-all-stagefeedback-gas
+all-ld: maybe-all-binutils
+
+all-stage1-ld: maybe-all-stage1-binutils
+all-stage2-ld: maybe-all-stage2-binutils
+all-stage3-ld: maybe-all-stage3-binutils
+all-stage4-ld: maybe-all-stage4-binutils
+all-stageprofile-ld: maybe-all-stageprofile-binutils
+all-stagefeedback-ld: maybe-all-stagefeedback-binutils
  install-ld: maybe-install-gold
  install-strip-ld: maybe-install-strip-gold
  configure-gold: maybe-configure-intl
@@ -45253,6 +49972,14 @@ all-stage3-gold: maybe-all-build-bison
  all-stage4-gold: maybe-all-build-bison
  all-stageprofile-gold: maybe-all-build-bison
  all-stagefeedback-gold: maybe-all-build-bison
+all-gold: maybe-all-gas
+
+all-stage1-gold: maybe-all-stage1-gas
+all-stage2-gold: maybe-all-stage2-gas
+all-stage3-gold: maybe-all-stage3-gas
+all-stage4-gold: maybe-all-stage4-gas
+all-stageprofile-gold: maybe-all-stageprofile-gas
+all-stagefeedback-gold: maybe-all-stagefeedback-gas
  check-gold: maybe-all-binutils
  
  check-stage1-gold: maybe-all-stage1-binutils
@@ -45343,22 +50070,13 @@ all-flex: maybe-all-m4
  all-flex: maybe-all-build-texinfo
  all-m4: maybe-all-intl
  all-m4: maybe-all-build-texinfo
-configure-target-boehm-gc: maybe-all-target-libstdc++-v3
  configure-target-fastjar: maybe-configure-target-zlib
  all-target-fastjar: maybe-all-target-zlib
  configure-target-libgo: maybe-configure-target-libffi
  configure-target-libgo: maybe-all-target-libstdc++-v3
  all-target-libgo: maybe-all-target-libbacktrace
  all-target-libgo: maybe-all-target-libffi
-configure-target-libjava: maybe-configure-target-zlib
-configure-target-libjava: maybe-configure-target-boehm-gc
-configure-target-libjava: maybe-configure-target-libffi
-all-target-libjava: maybe-all-fastjar
-all-target-libjava: maybe-all-target-zlib
-all-target-libjava: maybe-all-target-boehm-gc
-all-target-libjava: maybe-all-target-libffi
-configure-target-libobjc: maybe-configure-target-boehm-gc
-all-target-libobjc: maybe-all-target-boehm-gc
+all-target-libgo: maybe-all-target-libatomic
  configure-target-libstdc++-v3: maybe-configure-target-libgomp
  
  configure-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp
@@ -45367,6 +50085,23 @@ configure-stage3-target-libstdc++-v3: maybe-configure-stage3-target-libgomp
  configure-stage4-target-libstdc++-v3: maybe-configure-stage4-target-libgomp
  configure-stageprofile-target-libstdc++-v3: maybe-configure-stageprofile-target-libgomp
  configure-stagefeedback-target-libstdc++-v3: maybe-configure-stagefeedback-target-libgomp
+configure-target-liboffloadmic: maybe-configure-target-libgomp
+configure-target-libsanitizer: maybe-all-target-libstdc++-v3
+
+configure-stage1-target-libsanitizer: maybe-all-stage1-target-libstdc++-v3
+configure-stage2-target-libsanitizer: maybe-all-stage2-target-libstdc++-v3
+configure-stage3-target-libsanitizer: maybe-all-stage3-target-libstdc++-v3
+configure-stage4-target-libsanitizer: maybe-all-stage4-target-libstdc++-v3
+configure-stageprofile-target-libsanitizer: maybe-all-stageprofile-target-libstdc++-v3
+configure-stagefeedback-target-libsanitizer: maybe-all-stagefeedback-target-libstdc++-v3
+configure-target-libvtv: maybe-all-target-libstdc++-v3
+
+configure-stage1-target-libvtv: maybe-all-stage1-target-libstdc++-v3
+configure-stage2-target-libvtv: maybe-all-stage2-target-libstdc++-v3
+configure-stage3-target-libvtv: maybe-all-stage3-target-libstdc++-v3
+configure-stage4-target-libvtv: maybe-all-stage4-target-libstdc++-v3
+configure-stageprofile-target-libvtv: maybe-all-stageprofile-target-libstdc++-v3
+configure-stagefeedback-target-libvtv: maybe-all-stagefeedback-target-libstdc++-v3
  all-target-libstdc++-v3: maybe-configure-target-libgomp
  
  all-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp
@@ -45375,11 +50110,27 @@ all-stage3-target-libstdc++-v3: maybe-configure-stage3-target-libgomp
  all-stage4-target-libstdc++-v3: maybe-configure-stage4-target-libgomp
  all-stageprofile-target-libstdc++-v3: maybe-configure-stageprofile-target-libgomp
  all-stagefeedback-target-libstdc++-v3: maybe-configure-stagefeedback-target-libgomp
+all-target-liboffloadmic: maybe-all-target-libgomp
+install-target-libgo: maybe-install-target-libatomic
+install-target-libgfortran: maybe-install-target-libquadmath
+install-target-libgfortran: maybe-install-target-libgcc
+install-target-libsanitizer: maybe-install-target-libstdc++-v3
+install-target-libsanitizer: maybe-install-target-libgcc
+install-target-libvtv: maybe-install-target-libstdc++-v3
+install-target-libvtv: maybe-install-target-libgcc
+install-target-libcilkrts: maybe-install-target-libstdc++-v3
+install-target-libcilkrts: maybe-install-target-libgcc
+install-target-liboffloadmic: maybe-install-target-libstdc++-v3
+install-target-liboffloadmic: maybe-install-target-libgcc
+install-target-libitm: maybe-install-target-libgcc
+install-target-libobjc: maybe-install-target-libgcc
+install-target-libstdc++-v3: maybe-install-target-libgcc
  all-target-libgloss: maybe-all-target-newlib
  all-target-winsup: maybe-all-target-libtermcap
  configure-target-newlib: maybe-all-binutils
  configure-target-newlib: maybe-all-ld
  configure-target-libgfortran: maybe-all-target-libquadmath
+configure-target-libgfortran: maybe-all-target-libbacktrace
  
  
  # Dependencies for target modules on other target modules are
@@ -45394,6 +50145,24 @@ configure-stage3-target-libstdc++-v3: maybe-all-stage3-target-libgcc
  configure-stage4-target-libstdc++-v3: maybe-all-stage4-target-libgcc
  configure-stageprofile-target-libstdc++-v3: maybe-all-stageprofile-target-libgcc
  configure-stagefeedback-target-libstdc++-v3: maybe-all-stagefeedback-target-libgcc
+configure-stage1-target-libsanitizer: maybe-all-stage1-target-libgcc
+configure-stage2-target-libsanitizer: maybe-all-stage2-target-libgcc
+configure-stage3-target-libsanitizer: maybe-all-stage3-target-libgcc
+configure-stage4-target-libsanitizer: maybe-all-stage4-target-libgcc
+configure-stageprofile-target-libsanitizer: maybe-all-stageprofile-target-libgcc
+configure-stagefeedback-target-libsanitizer: maybe-all-stagefeedback-target-libgcc
+configure-stage1-target-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
+configure-stage4-target-libvtv: maybe-all-stage4-target-libgcc
+configure-stageprofile-target-libvtv: maybe-all-stageprofile-target-libgcc
+configure-stagefeedback-target-libvtv: maybe-all-stagefeedback-target-libgcc
  configure-stage1-target-libgomp: maybe-all-stage1-target-libgcc
  configure-stage2-target-libgomp: maybe-all-stage2-target-libgcc
  configure-stage3-target-libgomp: maybe-all-stage3-target-libgcc
@@ -45404,7 +50173,11 @@ configure-stagefeedback-target-libgomp: maybe-all-stagefeedback-target-libgcc
  
  @if gcc-no-bootstrap
  configure-target-libstdc++-v3: maybe-all-target-libgcc
-configure-target-libmudflap: maybe-all-target-libgcc
+configure-target-libsanitizer: maybe-all-target-libgcc
+configure-target-libmpx: maybe-all-target-libgcc
+configure-target-libvtv: maybe-all-target-libgcc
+configure-target-libcilkrts: maybe-all-target-libgcc
+configure-target-liboffloadmic: maybe-all-target-libgcc
  configure-target-libssp: maybe-all-target-libgcc
  configure-target-newlib: maybe-all-target-libgcc
  configure-target-libbacktrace: maybe-all-target-libgcc
@@ -45416,9 +50189,7 @@ configure-target-libtermcap: maybe-all-target-libgcc
  configure-target-winsup: maybe-all-target-libgcc
  configure-target-libgloss: maybe-all-target-libgcc
  configure-target-libffi: maybe-all-target-libgcc
-configure-target-libjava: maybe-all-target-libgcc
  configure-target-zlib: maybe-all-target-libgcc
-configure-target-boehm-gc: maybe-all-target-libgcc
  configure-target-rda: maybe-all-target-libgcc
  configure-target-libada: maybe-all-target-libgcc
  configure-target-libgomp: maybe-all-target-libgcc
@@ -45429,7 +50200,17 @@ configure-target-libatomic: maybe-all-target-libgcc
  
  configure-target-libstdc++-v3: maybe-all-target-newlib maybe-all-target-libgloss
  
-configure-target-libmudflap: maybe-all-target-newlib maybe-all-target-libgloss
+configure-target-libsanitizer: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libmpx: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libvtv: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libcilkrts: maybe-all-target-newlib maybe-all-target-libgloss
+configure-target-libcilkrts: maybe-all-target-libstdc++-v3
+
+configure-target-liboffloadmic: maybe-all-target-newlib maybe-all-target-libgloss
+configure-target-liboffloadmic: maybe-all-target-libstdc++-v3
  
  configure-target-libssp: maybe-all-target-newlib maybe-all-target-libgloss
  
@@ -45451,14 +50232,10 @@ configure-target-winsup: maybe-all-target-newlib maybe-all-target-libgloss
  
  
  configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss
-
-configure-target-libjava: maybe-all-target-newlib maybe-all-target-libgloss
-configure-target-libjava: maybe-all-target-libstdc++-v3
+configure-target-libffi: maybe-all-target-libstdc++-v3
  
  configure-target-zlib: maybe-all-target-newlib maybe-all-target-libgloss
  
-configure-target-boehm-gc: maybe-all-target-newlib maybe-all-target-libgloss
-
  configure-target-rda: maybe-all-target-newlib maybe-all-target-libgloss
  
  configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
@@ -45502,7 +50279,10 @@ config.status: configure
  # Rebuilding configure.
  AUTOCONF = autoconf
  $(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config/acx.m4 \
-       $(srcdir)/config/override.m4 $(srcdir)/config/proginstall.m4
+       $(srcdir)/config/override.m4 $(srcdir)/config/proginstall.m4 \
+       $(srcdir)/config/elf.m4 $(srcdir)/config/isl.m4 \
+       $(srcdir)/libtool.m4 $(srcdir)/ltoptions.m4 $(srcdir)/ltsugar.m4 \
+       $(srcdir)/ltversion.m4 $(srcdir)/lt~obsolete.m4
         cd $(srcdir) && $(AUTOCONF)
  
  # ------------------------------