Automatic date update in version.in

[thirdparty/binutils-gdb.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index e94018b6328a15ef046009b4680ad3cf195525bd..be38b34e9bfe1db349cd1596186cbe373b5478d5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,11 +3,13 @@
 #
 # 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 Free Software Foundation
+#   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
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
@@ -16,8 +18,8 @@
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
 #
 
 # First, test for a proper version of make, but only where one is required.
@@ -99,8 +101,6 @@ TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@
 tooldir = @tooldir@
 build_tooldir = @build_tooldir@
 
-GDB_NLM_DEPS = 
-
 # This is the name of the environment variable used for the path to
 # the libraries.
 RPATH_ENVVAR = @RPATH_ENVVAR@
@@ -116,6 +116,19 @@ BUILD_SUBDIR = @build_subdir@
 # directories built for the build system.
 BUILD_CONFIGARGS = @build_configargs@ --with-build-subdir="$(BUILD_SUBDIR)"
 
+# Linker flags to use on the host, for stage1 or when not
+# bootstrapping.
+STAGE1_LDFLAGS = @stage1_ldflags@
+
+# Libraries to use on the host, for stage1 or when not bootstrapping.
+STAGE1_LIBS = @stage1_libs@
+
+# Linker flags to use for stage2 and later.
+POSTSTAGE1_LDFLAGS = @poststage1_ldflags@
+
+# Libraries to use for stage2 and later.
+POSTSTAGE1_LIBS = @poststage1_libs@
+
 # This is the list of variables to export in the environment when
 # configuring any subdirectory.  It must also be exported whenever
 # recursing into a build directory in case that directory's Makefile
@@ -126,6 +139,8 @@ BASE_EXPORTS = \
        BISON="$(BISON)"; export BISON; \
        YACC="$(YACC)"; export YACC; \
        M4="$(M4)"; export M4; \
+       SED="$(SED)"; export SED; \
+       AWK="$(AWK)"; export AWK; \
        MAKEINFO="$(MAKEINFO)"; export MAKEINFO;
 
 # This is the list of variables to export in the environment when
@@ -137,11 +152,11 @@ BUILD_EXPORTS = \
        CC="$(CC_FOR_BUILD)"; export CC; \
        CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \
        CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CPPFLAGS="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS; \
        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; \
        DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
        LD="$(LD_FOR_BUILD)"; export LD; \
        LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \
@@ -154,11 +169,11 @@ BUILD_EXPORTS = \
 # built for the build system to override those in BASE_FLAGS_TO_PASS.
 EXTRA_BUILD_FLAGS = \
        CFLAGS="$(CFLAGS_FOR_BUILD)" \
-       CPPFLAGS="$(CPPFLAGS_FOR_BUILD)" \
        LDFLAGS="$(LDFLAGS_FOR_BUILD)"
 
 # This is the list of directories to built for the host system.
 SUBDIRS = @configdirs@
+TARGET_CONFIGDIRS = @target_configdirs@
 # This is set by the configure script to the arguments to use when configuring
 # directories built for the host system.
 HOST_CONFIGARGS = @host_configargs@
@@ -174,46 +189,78 @@ HOST_EXPORTS = \
        ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \
        CFLAGS="$(CFLAGS)"; export CFLAGS; \
        CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CPPFLAGS="$(CPPFLAGS)"; export CPPFLAGS; \
        CXX="$(CXX)"; export CXX; \
        CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
+       GFORTRAN="$(GFORTRAN)"; export GFORTRAN; \
+       GOC="$(GOC)"; export GOC; \
        AR="$(AR)"; export AR; \
        AS="$(AS)"; export AS; \
        CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
-       LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
+       LDFLAGS="$(STAGE1_LDFLAGS) $(LDFLAGS)"; export LDFLAGS; \
        NM="$(NM)"; export NM; \
        RANLIB="$(RANLIB)"; export RANLIB; \
        WINDRES="$(WINDRES)"; export WINDRES; \
        WINDMC="$(WINDMC)"; export WINDMC; \
        OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
        OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
+       READELF="$(READELF)"; export READELF; \
        AR_FOR_TARGET="$(AR_FOR_TARGET)"; export AR_FOR_TARGET; \
        AS_FOR_TARGET="$(AS_FOR_TARGET)"; export AS_FOR_TARGET; \
        GCC_FOR_TARGET="$(GCC_FOR_TARGET)"; export GCC_FOR_TARGET; \
        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; \
+       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
        $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
 
+POSTSTAGE1_CXX_EXPORT = \
+       CXX='$(CXX)'; export CXX; \
+       CXX_FOR_BUILD='$(CXX_FOR_BUILD)'; export CXX_FOR_BUILD;
+@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/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 \
+         `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; \
+       CXX_FOR_BUILD="$$CXX"; export CXX_FOR_BUILD;
+@endif target-libstdc++-v3-bootstrap
+
 # Similar, for later GCC stages.
 POSTSTAGE1_HOST_EXPORTS = \
        $(HOST_EXPORTS) \
        CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
-         -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
-       CC_FOR_BUILD="$(STAGE_CC_WRAPPER) \
-         $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
-         -B$$r/$(HOST_SUBDIR)/prev-gcc/ \
-         -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; \
-       LDFLAGS="$(BOOT_LDFLAGS)"; export LDFLAGS;
+         -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ \
+         $(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;
 
 # Target libraries are put under this directory:
 TARGET_SUBDIR = @target_subdir@
@@ -221,48 +268,63 @@ TARGET_SUBDIR = @target_subdir@
 # directories built for the target.
 TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)"
 # This is the list of variables to export in the environment when
-# configuring subdirectories for the host system.
+# configuring subdirectories for the target system.
 BASE_TARGET_EXPORTS = \
        $(BASE_EXPORTS) \
        AR="$(AR_FOR_TARGET)"; export AR; \
        AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
-       CC="$(CC_FOR_TARGET)"; export CC; \
-       CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
        CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
-       GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       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; \
        LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
        LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
        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; \
        WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
        WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
-       $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
+@if gcc-bootstrap
+       $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
+@endif gcc-bootstrap
+       $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
+       TARGET_CONFIGDIRS="$(TARGET_CONFIGDIRS)"; export TARGET_CONFIGDIRS;
 
 RAW_CXX_TARGET_EXPORTS = \
        $(BASE_TARGET_EXPORTS) \
        CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
-       CXX="$(RAW_CXX_FOR_TARGET)"; export CXX;
+       CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
 
 NORMAL_TARGET_EXPORTS = \
        $(BASE_TARGET_EXPORTS) \
-       CXX="$(CXX_FOR_TARGET)"; export CXX;
+       CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
 
 # Where to find GMP
 HOST_GMPLIBS = @gmplibs@
 HOST_GMPINC = @gmpinc@
 
+# Where to find isl
+HOST_ISLLIBS = @isllibs@
+HOST_ISLINC = @islinc@
+HOST_ISLVER = @islver@
+
+# Where to find libelf
+HOST_LIBELFLIBS = @libelflibs@
+HOST_LIBELFINC = @libelfinc@
+
 # ----------------------------------------------
 # Programs producing files for the BUILD machine
 # ----------------------------------------------
 
-SHELL = @config_shell@
+SHELL = @SHELL@
 
 # pwd command to use.  Allow user to override default by setting PWDCMD in
 # the environment to account for automounters.  The make variable must not
@@ -278,12 +340,11 @@ AR_FOR_BUILD = @AR_FOR_BUILD@
 AS_FOR_BUILD = @AS_FOR_BUILD@
 CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
-CPPFLAGS_FOR_BUILD = @CPPFLAGS_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@
 LD_FOR_BUILD = @LD_FOR_BUILD@
 NM_FOR_BUILD = @NM_FOR_BUILD@
@@ -300,8 +361,10 @@ 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@
 BISON = @BISON@
 YACC = @YACC@
 FLEX = @FLEX@
@@ -311,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.
@@ -332,6 +397,7 @@ LIPO = @LIPO@
 NM = @NM@
 OBJDUMP = @OBJDUMP@
 RANLIB = @RANLIB@
+READELF = @READELF@
 STRIP = @STRIP@
 WINDRES = @WINDRES@
 WINDMC = @WINDMC@
@@ -340,61 +406,143 @@ GNATBIND = @GNATBIND@
 GNATMAKE = @GNATMAKE@
 
 CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBCFLAGS = $(CFLAGS)
 CXXFLAGS = @CXXFLAGS@
 LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
-
-# 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).
-
-STAGE1_CHECKING=@stage1_checking@
-STAGE1_LANGUAGES=@stage1_languages@
-
-STAGE1_CFLAGS=@stage1_cflags@
-STAGE2_CFLAGS=$(BOOT_CFLAGS)
-STAGE3_CFLAGS=$(BOOT_CFLAGS)
-STAGE4_CFLAGS=$(BOOT_CFLAGS)
-
-STAGE1_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-STAGE2_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-STAGE3_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-STAGE4_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
+GOCFLAGS = $(CFLAGS)
+
+CREATE_GCOV = create_gcov
+
+TFLAGS =
+
+# Defaults for all stages; some are overridden below.
+
+STAGE_CFLAGS = $(BOOT_CFLAGS)
+STAGE_TFLAGS = $(TFLAGS)
+STAGE_CONFIGURE_FLAGS=@stage2_werror_flag@
+
+
+# Defaults for stage 1; some are overridden below.
+STAGE1_CFLAGS = $(STAGE_CFLAGS)
+STAGE1_CXXFLAGS = $(CXXFLAGS)
+@if target-libstdc++-v3-bootstrap
+# Override the above if we're bootstrapping C++.
+STAGE1_CXXFLAGS = $(STAGE1_CFLAGS)
+@endif target-libstdc++-v3-bootstrap
+STAGE1_TFLAGS = $(STAGE_TFLAGS)
+STAGE1_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
+
+# Defaults for stage 2; some are overridden below.
+STAGE2_CFLAGS = $(STAGE_CFLAGS)
+STAGE2_CXXFLAGS = $(CXXFLAGS)
+@if target-libstdc++-v3-bootstrap
+# Override the above if we're bootstrapping C++.
+STAGE2_CXXFLAGS = $(STAGE2_CFLAGS)
+@endif target-libstdc++-v3-bootstrap
+STAGE2_TFLAGS = $(STAGE_TFLAGS)
+STAGE2_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
+
+# Defaults for stage 3; some are overridden below.
+STAGE3_CFLAGS = $(STAGE_CFLAGS)
+STAGE3_CXXFLAGS = $(CXXFLAGS)
+@if target-libstdc++-v3-bootstrap
+# Override the above if we're bootstrapping C++.
+STAGE3_CXXFLAGS = $(STAGE3_CFLAGS)
+@endif target-libstdc++-v3-bootstrap
+STAGE3_TFLAGS = $(STAGE_TFLAGS)
+STAGE3_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
+
+# Defaults for stage 4; some are overridden below.
+STAGE4_CFLAGS = $(STAGE_CFLAGS)
+STAGE4_CXXFLAGS = $(CXXFLAGS)
+@if target-libstdc++-v3-bootstrap
+# Override the above if we're bootstrapping C++.
+STAGE4_CXXFLAGS = $(STAGE4_CFLAGS)
+@endif target-libstdc++-v3-bootstrap
+STAGE4_TFLAGS = $(STAGE_TFLAGS)
+STAGE4_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
+
+# Defaults for stage profile; some are overridden below.
+STAGEprofile_CFLAGS = $(STAGE_CFLAGS)
+STAGEprofile_CXXFLAGS = $(CXXFLAGS)
+@if target-libstdc++-v3-bootstrap
+# Override the above if we're bootstrapping C++.
+STAGEprofile_CXXFLAGS = $(STAGEprofile_CFLAGS)
+@endif target-libstdc++-v3-bootstrap
+STAGEprofile_TFLAGS = $(STAGE_TFLAGS)
+STAGEprofile_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
+
+# Defaults for stage feedback; some are overridden below.
+STAGEfeedback_CFLAGS = $(STAGE_CFLAGS)
+STAGEfeedback_CXXFLAGS = $(CXXFLAGS)
+@if target-libstdc++-v3-bootstrap
+# Override the above if we're bootstrapping C++.
+STAGEfeedback_CXXFLAGS = $(STAGEfeedback_CFLAGS)
+@endif target-libstdc++-v3-bootstrap
+STAGEfeedback_TFLAGS = $(STAGE_TFLAGS)
+STAGEfeedback_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
+
+
+# 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@
+STAGE1_LANGUAGES = @stage1_languages@
+# * We force-disable intermodule optimizations, even if
+#   --enable-intermodule was passed, since the installed compiler
+#   probably can't handle them.  Luckily, autoconf always respects
+#   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-build-format-warnings
+
+STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate
+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)
-do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
 
 # -----------------------------------------------
 # Programs producing files for the TARGET machine
 # -----------------------------------------------
 
-FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
-
 AR_FOR_TARGET=@AR_FOR_TARGET@
 AS_FOR_TARGET=@AS_FOR_TARGET@
-CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ $(FLAGS_FOR_TARGET)
+CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@
 
 # If GCC_FOR_TARGET is not overriden on the command line, then this
 # variable is passed down to the gcc Makefile, where it is used to
 # build libgcc2.a.  We define it here so that it can itself be
 # overridden on the command line.
-GCC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCC_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ $(FLAGS_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@
+GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@
+GOC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GOC_FOR_TARGET@
 DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
 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@
 WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
 WINDMC_FOR_TARGET=@WINDMC_FOR_TARGET@
@@ -404,14 +552,18 @@ COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
 COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
 
 CFLAGS_FOR_TARGET = @CFLAGS_FOR_TARGET@
-CPPFLAGS_FOR_TARGET = @CPPFLAGS_FOR_TARGET@
 CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@
-SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
-DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@
 
 LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
 LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
 LDFLAGS_FOR_TARGET = @LDFLAGS_FOR_TARGET@
+GOCFLAGS_FOR_TARGET = -O2 -g
+
+FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
+SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
+DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@
+
+XGCC_FLAGS_FOR_TARGET = $(FLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
 
 # ------------------------------------
 # Miscellaneous targets and flag lists
@@ -429,16 +581,32 @@ all:
 ###
 
 # This is the list of directories that may be needed in RPATH_ENVVAR
-# so that prorgams 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)$(HOST_LIB_PATH_gcc)
+# so that programs built for the target machine work.
+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/.libs:
+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:
@@ -448,11 +616,19 @@ TARGET_LIB_PATH_libssp = $$r/$(TARGET_SUBDIR)/libssp/.libs:
 TARGET_LIB_PATH_libgomp = $$r/$(TARGET_SUBDIR)/libgomp/.libs:
 @endif target-libgomp
 
+@if target-libitm
+TARGET_LIB_PATH_libitm = $$r/$(TARGET_SUBDIR)/libitm/.libs:
+@endif target-libitm
+
+@if target-libatomic
+TARGET_LIB_PATH_libatomic = $$r/$(TARGET_SUBDIR)/libatomic/.libs:
+@endif target-libatomic
+
 
 
 # This is the list of directories that may be needed in RPATH_ENVVAR
 # so that programs built for the host machine work.
-HOST_LIB_PATH = $(HOST_LIB_PATH_bfd)$(HOST_LIB_PATH_opcodes)$(HOST_LIB_PATH_gmp)$(HOST_LIB_PATH_mpfr)
+HOST_LIB_PATH = $(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
@@ -460,16 +636,6 @@ HOST_LIB_PATH_gcc = $$r/$(HOST_SUBDIR)/gcc$(GCC_SHLIB_SUBDIR):$$r/$(HOST_SUBDIR)
 @endif gcc
 
 
-@if bfd
-HOST_LIB_PATH_bfd = \
-  $$r/$(HOST_SUBDIR)/bfd/.libs:$$r/$(HOST_SUBDIR)/prev-bfd/.libs:
-@endif bfd
-
-@if opcodes
-HOST_LIB_PATH_opcodes = \
-  $$r/$(HOST_SUBDIR)/opcodes/.libs:$$r/$(HOST_SUBDIR)/prev-opcodes/.libs:
-@endif opcodes
-
 @if gmp
 HOST_LIB_PATH_gmp = \
   $$r/$(HOST_SUBDIR)/gmp/.libs:$$r/$(HOST_SUBDIR)/prev-gmp/.libs:
@@ -477,11 +643,48 @@ 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/src/.libs:$$r/$(HOST_SUBDIR)/prev-mpc/src/.libs:
+@endif mpc
+
+@if isl
+HOST_LIB_PATH_isl = \
+  $$r/$(HOST_SUBDIR)/isl/.libs:$$r/$(HOST_SUBDIR)/prev-isl/.libs:
+@endif isl
 
-# Flags to pass down to all sub-makes.
+@if libelf
+HOST_LIB_PATH_libelf = \
+  $$r/$(HOST_SUBDIR)/libelf/.libs:$$r/$(HOST_SUBDIR)/prev-libelf/.libs:
+@endif libelf
+
+
+CXX_FOR_TARGET_FLAG_TO_PASS = \
+       "CXX_FOR_TARGET=$(CXX_FOR_TARGET)"
+@if target-libstdc++-v3
+# CXX_FOR_TARGET is tricky to get right for target libs that require a
+# functional C++ compiler.  When we recurse, if we expand
+# CXX_FOR_TARGET before configuring libstdc++-v3, we won't get
+# libstdc++ include flags from the script.  Instead, we get an
+# -funconfigured-* word, so that we'll get errors if this invalid C++
+# command line is used for anything, but also so that we can use the
+# word to decide whether or not to pass on this CXX_FOR_TARGET.  If we
+# don't pass it on, sub-make will use the default definition, that
+# re-expands it at the time of use, so we'll get it right when we need
+# it.  One potential exception is the expansion of CXX_FOR_TARGET
+# passed down as part of CXX within TARGET_FLAGS, but this wouldn't
+# really work, for C++ host programs can't depend on the current-stage
+# C++ target library.
+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. 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)" \
@@ -508,10 +711,10 @@ BASE_FLAGS_TO_PASS = \
        "tooldir=$(tooldir)" \
        "build_tooldir=$(build_tooldir)" \
        "target_alias=$(target_alias)" \
+       "AWK=$(AWK)" \
        "BISON=$(BISON)" \
        "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
        "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
-       "CPPFLAGS_FOR_BUILD=$(CPPFLAGS_FOR_BUILD)" \
        "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
        "EXPECT=$(EXPECT)" \
        "FLEX=$(FLEX)" \
@@ -525,6 +728,7 @@ BASE_FLAGS_TO_PASS = \
        "MAKE=$(MAKE)" \
        "RUNTEST=$(RUNTEST)" \
        "RUNTESTFLAGS=$(RUNTESTFLAGS)" \
+       "SED=$(SED)" \
        "SHELL=$(SHELL)" \
        "YACC=$(YACC)" \
        "`echo 'ADAFLAGS=$(ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
@@ -534,17 +738,12 @@ BASE_FLAGS_TO_PASS = \
        "BOOT_CFLAGS=$(BOOT_CFLAGS)" \
        "BOOT_LDFLAGS=$(BOOT_LDFLAGS)" \
        "CFLAGS=$(CFLAGS)" \
-       "CPPFLAGS=$(CPPFLAGS)" \
        "CXXFLAGS=$(CXXFLAGS)" \
        "LDFLAGS=$(LDFLAGS)" \
        "LIBCFLAGS=$(LIBCFLAGS)" \
        "LIBCXXFLAGS=$(LIBCXXFLAGS)" \
-       "STAGE1_CFLAGS=$(STAGE1_CFLAGS)" \
        "STAGE1_CHECKING=$(STAGE1_CHECKING)" \
        "STAGE1_LANGUAGES=$(STAGE1_LANGUAGES)" \
-       "STAGE2_CFLAGS=$(STAGE2_CFLAGS)" \
-       "STAGE3_CFLAGS=$(STAGE3_CFLAGS)" \
-       "STAGE4_CFLAGS=$(STAGE4_CFLAGS)" \
        "GNATBIND=$(GNATBIND)" \
        "GNATMAKE=$(GNATMAKE)" \
        "AR_FOR_TARGET=$(AR_FOR_TARGET)" \
@@ -552,11 +751,12 @@ BASE_FLAGS_TO_PASS = \
        "CC_FOR_TARGET=$(CC_FOR_TARGET)" \
        "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
        "CPPFLAGS_FOR_TARGET=$(CPPFLAGS_FOR_TARGET)" \
-       "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
        "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
        "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
-       "GCJ_FOR_TARGET=$(GCJ_FOR_TARGET)" \
+       "FLAGS_FOR_TARGET=$(FLAGS_FOR_TARGET)" \
        "GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \
+       "GOC_FOR_TARGET=$(GOC_FOR_TARGET)" \
+       "GOCFLAGS_FOR_TARGET=$(GOCFLAGS_FOR_TARGET)" \
        "LD_FOR_TARGET=$(LD_FOR_TARGET)" \
        "LIPO_FOR_TARGET=$(LIPO_FOR_TARGET)" \
        "LDFLAGS_FOR_TARGET=$(LDFLAGS_FOR_TARGET)" \
@@ -564,14 +764,38 @@ 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)" \
        "WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \
        "WINDMC_FOR_TARGET=$(WINDMC_FOR_TARGET)" \
+       "BUILD_CONFIG=$(BUILD_CONFIG)" \
        "`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
        "LEAN=$(LEAN)" \
+       "STAGE1_CFLAGS=$(STAGE1_CFLAGS)" \
+       "STAGE1_CXXFLAGS=$(STAGE1_CXXFLAGS)" \
+       "STAGE1_TFLAGS=$(STAGE1_TFLAGS)" \
+       "STAGE2_CFLAGS=$(STAGE2_CFLAGS)" \
+       "STAGE2_CXXFLAGS=$(STAGE2_CXXFLAGS)" \
+       "STAGE2_TFLAGS=$(STAGE2_TFLAGS)" \
+       "STAGE3_CFLAGS=$(STAGE3_CFLAGS)" \
+       "STAGE3_CXXFLAGS=$(STAGE3_CXXFLAGS)" \
+       "STAGE3_TFLAGS=$(STAGE3_TFLAGS)" \
+       "STAGE4_CFLAGS=$(STAGE4_CFLAGS)" \
+       "STAGE4_CXXFLAGS=$(STAGE4_CXXFLAGS)" \
+       "STAGE4_TFLAGS=$(STAGE4_TFLAGS)" \
+       "STAGEprofile_CFLAGS=$(STAGEprofile_CFLAGS)" \
+       "STAGEprofile_CXXFLAGS=$(STAGEprofile_CXXFLAGS)" \
+       "STAGEprofile_TFLAGS=$(STAGEprofile_TFLAGS)" \
+       "STAGEfeedback_CFLAGS=$(STAGEfeedback_CFLAGS)" \
+       "STAGEfeedback_CXXFLAGS=$(STAGEfeedback_CXXFLAGS)" \
+       "STAGEfeedback_TFLAGS=$(STAGEfeedback_TFLAGS)" \
+       $(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)
@@ -584,37 +808,46 @@ EXTRA_HOST_FLAGS = \
        'CC=$(CC)' \
        'CXX=$(CXX)' \
        'DLLTOOL=$(DLLTOOL)' \
+       'GFORTRAN=$(GFORTRAN)' \
+       'GOC=$(GOC)' \
        'LD=$(LD)' \
        'LIPO=$(LIPO)' \
        'NM=$(NM)' \
        'OBJDUMP=$(OBJDUMP)' \
        'RANLIB=$(RANLIB)' \
+       '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 that are concerned with the location of the X11 include files
-# and library files
-#
-# NOTE: until the top-level is getting the values via autoconf, it only
-# causes problems to have this top-level Makefile overriding the autoconf-set
-# values in child directories.  Only variables that don't conflict with
-# autoconf'ed ones should be passed by X11_FLAGS_TO_PASS for now.
-#
-X11_FLAGS_TO_PASS = \
-       'X11_EXTRA_CFLAGS=$(X11_EXTRA_CFLAGS)' \
-       'X11_EXTRA_LIBS=$(X11_EXTRA_LIBS)'
+# 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 = \
        CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
-       GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind" \
-       LDFLAGS="$(BOOT_LDFLAGS)" \
+       CXX="$${CXX}" CXX_FOR_BUILD="$${CXX_FOR_BUILD}" \
+       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
@@ -623,21 +856,31 @@ POSTSTAGE1_FLAGS_TO_PASS = \
 EXTRA_TARGET_FLAGS = \
        'AR=$$(AR_FOR_TARGET)' \
        'AS=$(COMPILER_AS_FOR_TARGET)' \
-       'CC=$$(CC_FOR_TARGET)' \
-       'CFLAGS=$$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
-       'CPPFLAGS=$$(CPPFLAGS_FOR_TARGET)' \
-       'CXX=$$(CXX_FOR_TARGET)' \
-       'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
+       'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+       'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
+       '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)' \
+       'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+       'GOC=$$(GOC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+       'GOCFLAGS=$$(GOCFLAGS_FOR_TARGET)' \
        'LD=$(COMPILER_LD_FOR_TARGET)' \
        'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
-       'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
-       'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
+       'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
+       '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)'
+       '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)
 
@@ -650,109 +893,95 @@ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
 EXTRA_GCC_FLAGS = \
        "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
        "`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-       "`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-       "`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-       "`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-       "`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
+       "`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
 
 GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
 
+@if gcc
+BUILD_CONFIG = @BUILD_CONFIG@
+ifneq ($(BUILD_CONFIG),)
+include $(foreach CONFIG, $(BUILD_CONFIG), $(srcdir)/config/$(CONFIG).mk)
+endif
+@endif gcc
+
 .PHONY: configure-host
 configure-host:  \
-    maybe-configure-ash \
-    maybe-configure-autoconf \
-    maybe-configure-automake \
-    maybe-configure-bash \
     maybe-configure-bfd \
     maybe-configure-opcodes \
     maybe-configure-binutils \
     maybe-configure-bison \
-    maybe-configure-byacc \
-    maybe-configure-bzip2 \
+    maybe-configure-cgen \
     maybe-configure-dejagnu \
-    maybe-configure-diff \
-    maybe-configure-dosutils \
     maybe-configure-etc \
     maybe-configure-fastjar \
-    maybe-configure-fileutils \
-    maybe-configure-findutils \
-    maybe-configure-find \
     maybe-configure-fixincludes \
     maybe-configure-flex \
     maybe-configure-gas \
     maybe-configure-gcc \
-    maybe-configure-gawk \
-    maybe-configure-gettext \
     maybe-configure-gmp \
     maybe-configure-mpfr \
-    maybe-configure-gnuserv \
+    maybe-configure-mpc \
+    maybe-configure-isl \
+    maybe-configure-libelf \
     maybe-configure-gold \
     maybe-configure-gprof \
-    maybe-configure-gzip \
-    maybe-configure-hello \
-    maybe-configure-indent \
     maybe-configure-intl \
     maybe-configure-tcl \
     maybe-configure-itcl \
     maybe-configure-ld \
+    maybe-configure-libbacktrace \
     maybe-configure-libcpp \
     maybe-configure-libdecnumber \
     maybe-configure-libgui \
     maybe-configure-libiberty \
-    maybe-configure-libtool \
+    maybe-configure-libiberty-linker-plugin \
+    maybe-configure-libiconv \
     maybe-configure-m4 \
-    maybe-configure-make \
-    maybe-configure-mmalloc \
-    maybe-configure-patch \
-    maybe-configure-perl \
-    maybe-configure-prms \
-    maybe-configure-rcs \
     maybe-configure-readline \
-    maybe-configure-release \
-    maybe-configure-recode \
-    maybe-configure-sed \
-    maybe-configure-send-pr \
-    maybe-configure-shellutils \
     maybe-configure-sid \
     maybe-configure-sim \
-    maybe-configure-tar \
     maybe-configure-texinfo \
-    maybe-configure-textutils \
-    maybe-configure-time \
-    maybe-configure-uudecode \
-    maybe-configure-wdiff \
-    maybe-configure-zip \
     maybe-configure-zlib \
+    maybe-configure-gnulib \
+    maybe-configure-gdbsupport \
+    maybe-configure-gdbserver \
     maybe-configure-gdb \
     maybe-configure-expect \
     maybe-configure-guile \
     maybe-configure-tk \
     maybe-configure-libtermcap \
     maybe-configure-utils \
-    maybe-configure-gnattools
+    maybe-configure-gnattools \
+    maybe-configure-lto-plugin \
+    maybe-configure-libcc1 \
+    maybe-configure-gotools \
+    maybe-configure-libctf
 .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 \
+    maybe-configure-target-libbacktrace \
+    maybe-configure-target-libquadmath \
     maybe-configure-target-libgfortran \
     maybe-configure-target-libobjc \
+    maybe-configure-target-libgo \
     maybe-configure-target-libtermcap \
     maybe-configure-target-winsup \
     maybe-configure-target-libgloss \
-    maybe-configure-target-libiberty \
-    maybe-configure-target-gperf \
-    maybe-configure-target-examples \
     maybe-configure-target-libffi \
-    maybe-configure-target-libjava \
     maybe-configure-target-zlib \
-    maybe-configure-target-boehm-gc \
-    maybe-configure-target-qthreads \
     maybe-configure-target-rda \
     maybe-configure-target-libada \
-    maybe-configure-target-libgomp
+    maybe-configure-target-libgomp \
+    maybe-configure-target-libitm \
+    maybe-configure-target-libatomic
 
 # The target built for a native non-bootstrap build.
 .PHONY: all
@@ -766,28 +995,31 @@ all:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+@if gcc-bootstrap
        if [ -f stage_last ]; then \
+         TFLAGS="$(STAGE$(shell test ! -f stage_last || sed s,^stage,, stage_last)_TFLAGS)"; \
          $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \
        else \
-         $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \
-       fi
+@endif gcc-bootstrap
+         $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target \
+@if gcc-bootstrap
+           ; \
+       fi \
+@endif gcc-bootstrap
+       && :
 
 .PHONY: all-build
 
 all-build: maybe-all-build-libiberty
 all-build: maybe-all-build-bison
-all-build: maybe-all-build-byacc
 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
 
-all-host: maybe-all-ash
-all-host: maybe-all-autoconf
-all-host: maybe-all-automake
-all-host: maybe-all-bash
 @if bfd-no-bootstrap
 all-host: maybe-all-bfd
 @endif bfd-no-bootstrap
@@ -798,17 +1030,13 @@ all-host: maybe-all-opcodes
 all-host: maybe-all-binutils
 @endif binutils-no-bootstrap
 all-host: maybe-all-bison
-all-host: maybe-all-byacc
-all-host: maybe-all-bzip2
+all-host: maybe-all-cgen
 all-host: maybe-all-dejagnu
-all-host: maybe-all-diff
-all-host: maybe-all-dosutils
 all-host: maybe-all-etc
 all-host: maybe-all-fastjar
-all-host: maybe-all-fileutils
-all-host: maybe-all-findutils
-all-host: maybe-all-find
+@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
@@ -816,22 +1044,25 @@ all-host: maybe-all-gas
 @if gcc-no-bootstrap
 all-host: maybe-all-gcc
 @endif gcc-no-bootstrap
-all-host: maybe-all-gawk
-all-host: maybe-all-gettext
 @if gmp-no-bootstrap
 all-host: maybe-all-gmp
 @endif gmp-no-bootstrap
 @if mpfr-no-bootstrap
 all-host: maybe-all-mpfr
 @endif mpfr-no-bootstrap
-all-host: maybe-all-gnuserv
+@if mpc-no-bootstrap
+all-host: maybe-all-mpc
+@endif mpc-no-bootstrap
+@if isl-no-bootstrap
+all-host: maybe-all-isl
+@endif isl-no-bootstrap
+@if libelf-no-bootstrap
+all-host: maybe-all-libelf
+@endif libelf-no-bootstrap
 @if gold-no-bootstrap
 all-host: maybe-all-gold
 @endif gold-no-bootstrap
 all-host: maybe-all-gprof
-all-host: maybe-all-gzip
-all-host: maybe-all-hello
-all-host: maybe-all-indent
 @if intl-no-bootstrap
 all-host: maybe-all-intl
 @endif intl-no-bootstrap
@@ -840,6 +1071,9 @@ all-host: maybe-all-itcl
 @if ld-no-bootstrap
 all-host: maybe-all-ld
 @endif ld-no-bootstrap
+@if libbacktrace-no-bootstrap
+all-host: maybe-all-libbacktrace
+@endif libbacktrace-no-bootstrap
 @if libcpp-no-bootstrap
 all-host: maybe-all-libcpp
 @endif libcpp-no-bootstrap
@@ -850,32 +1084,23 @@ all-host: maybe-all-libgui
 @if libiberty-no-bootstrap
 all-host: maybe-all-libiberty
 @endif libiberty-no-bootstrap
-all-host: maybe-all-libtool
+@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-make
-all-host: maybe-all-mmalloc
-all-host: maybe-all-patch
-all-host: maybe-all-perl
-all-host: maybe-all-prms
-all-host: maybe-all-rcs
 all-host: maybe-all-readline
-all-host: maybe-all-release
-all-host: maybe-all-recode
-all-host: maybe-all-sed
-all-host: maybe-all-send-pr
-all-host: maybe-all-shellutils
 all-host: maybe-all-sid
 all-host: maybe-all-sim
-all-host: maybe-all-tar
 all-host: maybe-all-texinfo
-all-host: maybe-all-textutils
-all-host: maybe-all-time
-all-host: maybe-all-uudecode
-all-host: maybe-all-wdiff
-all-host: maybe-all-zip
 @if zlib-no-bootstrap
 all-host: maybe-all-zlib
 @endif zlib-no-bootstrap
+all-host: maybe-all-gnulib
+all-host: maybe-all-gdbsupport
+all-host: maybe-all-gdbserver
 all-host: maybe-all-gdb
 all-host: maybe-all-expect
 all-host: maybe-all-guile
@@ -883,32 +1108,53 @@ all-host: maybe-all-tk
 all-host: maybe-all-libtermcap
 all-host: maybe-all-utils
 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
+@if libctf-no-bootstrap
+all-host: maybe-all-libctf
+@endif libctf-no-bootstrap
 
 .PHONY: all-target
 
+@if target-libstdc++-v3-no-bootstrap
 all-target: maybe-all-target-libstdc++-v3
-all-target: maybe-all-target-libmudflap
+@endif target-libstdc++-v3-no-bootstrap
+@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
 all-target: maybe-all-target-libgcc
 @endif target-libgcc-no-bootstrap
+all-target: maybe-all-target-libbacktrace
+all-target: maybe-all-target-libquadmath
 all-target: maybe-all-target-libgfortran
 all-target: maybe-all-target-libobjc
+all-target: maybe-all-target-libgo
 all-target: maybe-all-target-libtermcap
 all-target: maybe-all-target-winsup
 all-target: maybe-all-target-libgloss
-all-target: maybe-all-target-libiberty
-all-target: maybe-all-target-gperf
-all-target: maybe-all-target-examples
 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-qthreads
 all-target: maybe-all-target-rda
 all-target: maybe-all-target-libada
+@if target-libgomp-no-bootstrap
 all-target: maybe-all-target-libgomp
+@endif target-libgomp-no-bootstrap
+all-target: maybe-all-target-libitm
+all-target: maybe-all-target-libatomic
 
 # Do a target for all the subdirectories.  A ``make do-X'' will do a
 # ``make X'' in all subdirectories (because, in general, there is a
@@ -926,70 +1172,45 @@ do-info:
 
 .PHONY: info-host
 
-info-host: maybe-info-ash
-info-host: maybe-info-autoconf
-info-host: maybe-info-automake
-info-host: maybe-info-bash
 info-host: maybe-info-bfd
 info-host: maybe-info-opcodes
 info-host: maybe-info-binutils
 info-host: maybe-info-bison
-info-host: maybe-info-byacc
-info-host: maybe-info-bzip2
+info-host: maybe-info-cgen
 info-host: maybe-info-dejagnu
-info-host: maybe-info-diff
-info-host: maybe-info-dosutils
 info-host: maybe-info-etc
 info-host: maybe-info-fastjar
-info-host: maybe-info-fileutils
-info-host: maybe-info-findutils
-info-host: maybe-info-find
 info-host: maybe-info-fixincludes
 info-host: maybe-info-flex
 info-host: maybe-info-gas
 info-host: maybe-info-gcc
-info-host: maybe-info-gawk
-info-host: maybe-info-gettext
 info-host: maybe-info-gmp
 info-host: maybe-info-mpfr
-info-host: maybe-info-gnuserv
+info-host: maybe-info-mpc
+info-host: maybe-info-isl
+info-host: maybe-info-libelf
 info-host: maybe-info-gold
 info-host: maybe-info-gprof
-info-host: maybe-info-gzip
-info-host: maybe-info-hello
-info-host: maybe-info-indent
 info-host: maybe-info-intl
 info-host: maybe-info-tcl
 info-host: maybe-info-itcl
 info-host: maybe-info-ld
+info-host: maybe-info-libbacktrace
 info-host: maybe-info-libcpp
 info-host: maybe-info-libdecnumber
 info-host: maybe-info-libgui
 info-host: maybe-info-libiberty
-info-host: maybe-info-libtool
+info-host: maybe-info-libiberty-linker-plugin
+info-host: maybe-info-libiconv
 info-host: maybe-info-m4
-info-host: maybe-info-make
-info-host: maybe-info-mmalloc
-info-host: maybe-info-patch
-info-host: maybe-info-perl
-info-host: maybe-info-prms
-info-host: maybe-info-rcs
 info-host: maybe-info-readline
-info-host: maybe-info-release
-info-host: maybe-info-recode
-info-host: maybe-info-sed
-info-host: maybe-info-send-pr
-info-host: maybe-info-shellutils
 info-host: maybe-info-sid
 info-host: maybe-info-sim
-info-host: maybe-info-tar
 info-host: maybe-info-texinfo
-info-host: maybe-info-textutils
-info-host: maybe-info-time
-info-host: maybe-info-uudecode
-info-host: maybe-info-wdiff
-info-host: maybe-info-zip
 info-host: maybe-info-zlib
+info-host: maybe-info-gnulib
+info-host: maybe-info-gdbsupport
+info-host: maybe-info-gdbserver
 info-host: maybe-info-gdb
 info-host: maybe-info-expect
 info-host: maybe-info-guile
@@ -997,30 +1218,37 @@ info-host: maybe-info-tk
 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
+info-host: maybe-info-libctf
 
 .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
+info-target: maybe-info-target-libbacktrace
+info-target: maybe-info-target-libquadmath
 info-target: maybe-info-target-libgfortran
 info-target: maybe-info-target-libobjc
+info-target: maybe-info-target-libgo
 info-target: maybe-info-target-libtermcap
 info-target: maybe-info-target-winsup
 info-target: maybe-info-target-libgloss
-info-target: maybe-info-target-libiberty
-info-target: maybe-info-target-gperf
-info-target: maybe-info-target-examples
 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-qthreads
 info-target: maybe-info-target-rda
 info-target: maybe-info-target-libada
 info-target: maybe-info-target-libgomp
+info-target: maybe-info-target-libitm
+info-target: maybe-info-target-libatomic
 
 .PHONY: do-dvi
 do-dvi:
@@ -1033,70 +1261,45 @@ do-dvi:
 
 .PHONY: dvi-host
 
-dvi-host: maybe-dvi-ash
-dvi-host: maybe-dvi-autoconf
-dvi-host: maybe-dvi-automake
-dvi-host: maybe-dvi-bash
 dvi-host: maybe-dvi-bfd
 dvi-host: maybe-dvi-opcodes
 dvi-host: maybe-dvi-binutils
 dvi-host: maybe-dvi-bison
-dvi-host: maybe-dvi-byacc
-dvi-host: maybe-dvi-bzip2
+dvi-host: maybe-dvi-cgen
 dvi-host: maybe-dvi-dejagnu
-dvi-host: maybe-dvi-diff
-dvi-host: maybe-dvi-dosutils
 dvi-host: maybe-dvi-etc
 dvi-host: maybe-dvi-fastjar
-dvi-host: maybe-dvi-fileutils
-dvi-host: maybe-dvi-findutils
-dvi-host: maybe-dvi-find
 dvi-host: maybe-dvi-fixincludes
 dvi-host: maybe-dvi-flex
 dvi-host: maybe-dvi-gas
 dvi-host: maybe-dvi-gcc
-dvi-host: maybe-dvi-gawk
-dvi-host: maybe-dvi-gettext
 dvi-host: maybe-dvi-gmp
 dvi-host: maybe-dvi-mpfr
-dvi-host: maybe-dvi-gnuserv
+dvi-host: maybe-dvi-mpc
+dvi-host: maybe-dvi-isl
+dvi-host: maybe-dvi-libelf
 dvi-host: maybe-dvi-gold
 dvi-host: maybe-dvi-gprof
-dvi-host: maybe-dvi-gzip
-dvi-host: maybe-dvi-hello
-dvi-host: maybe-dvi-indent
 dvi-host: maybe-dvi-intl
 dvi-host: maybe-dvi-tcl
 dvi-host: maybe-dvi-itcl
 dvi-host: maybe-dvi-ld
+dvi-host: maybe-dvi-libbacktrace
 dvi-host: maybe-dvi-libcpp
 dvi-host: maybe-dvi-libdecnumber
 dvi-host: maybe-dvi-libgui
 dvi-host: maybe-dvi-libiberty
-dvi-host: maybe-dvi-libtool
+dvi-host: maybe-dvi-libiberty-linker-plugin
+dvi-host: maybe-dvi-libiconv
 dvi-host: maybe-dvi-m4
-dvi-host: maybe-dvi-make
-dvi-host: maybe-dvi-mmalloc
-dvi-host: maybe-dvi-patch
-dvi-host: maybe-dvi-perl
-dvi-host: maybe-dvi-prms
-dvi-host: maybe-dvi-rcs
 dvi-host: maybe-dvi-readline
-dvi-host: maybe-dvi-release
-dvi-host: maybe-dvi-recode
-dvi-host: maybe-dvi-sed
-dvi-host: maybe-dvi-send-pr
-dvi-host: maybe-dvi-shellutils
 dvi-host: maybe-dvi-sid
 dvi-host: maybe-dvi-sim
-dvi-host: maybe-dvi-tar
 dvi-host: maybe-dvi-texinfo
-dvi-host: maybe-dvi-textutils
-dvi-host: maybe-dvi-time
-dvi-host: maybe-dvi-uudecode
-dvi-host: maybe-dvi-wdiff
-dvi-host: maybe-dvi-zip
 dvi-host: maybe-dvi-zlib
+dvi-host: maybe-dvi-gnulib
+dvi-host: maybe-dvi-gdbsupport
+dvi-host: maybe-dvi-gdbserver
 dvi-host: maybe-dvi-gdb
 dvi-host: maybe-dvi-expect
 dvi-host: maybe-dvi-guile
@@ -1104,30 +1307,37 @@ dvi-host: maybe-dvi-tk
 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
+dvi-host: maybe-dvi-libctf
 
 .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
+dvi-target: maybe-dvi-target-libbacktrace
+dvi-target: maybe-dvi-target-libquadmath
 dvi-target: maybe-dvi-target-libgfortran
 dvi-target: maybe-dvi-target-libobjc
+dvi-target: maybe-dvi-target-libgo
 dvi-target: maybe-dvi-target-libtermcap
 dvi-target: maybe-dvi-target-winsup
 dvi-target: maybe-dvi-target-libgloss
-dvi-target: maybe-dvi-target-libiberty
-dvi-target: maybe-dvi-target-gperf
-dvi-target: maybe-dvi-target-examples
 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-qthreads
 dvi-target: maybe-dvi-target-rda
 dvi-target: maybe-dvi-target-libada
 dvi-target: maybe-dvi-target-libgomp
+dvi-target: maybe-dvi-target-libitm
+dvi-target: maybe-dvi-target-libatomic
 
 .PHONY: do-pdf
 do-pdf:
@@ -1140,70 +1350,45 @@ do-pdf:
 
 .PHONY: pdf-host
 
-pdf-host: maybe-pdf-ash
-pdf-host: maybe-pdf-autoconf
-pdf-host: maybe-pdf-automake
-pdf-host: maybe-pdf-bash
 pdf-host: maybe-pdf-bfd
 pdf-host: maybe-pdf-opcodes
 pdf-host: maybe-pdf-binutils
 pdf-host: maybe-pdf-bison
-pdf-host: maybe-pdf-byacc
-pdf-host: maybe-pdf-bzip2
+pdf-host: maybe-pdf-cgen
 pdf-host: maybe-pdf-dejagnu
-pdf-host: maybe-pdf-diff
-pdf-host: maybe-pdf-dosutils
 pdf-host: maybe-pdf-etc
 pdf-host: maybe-pdf-fastjar
-pdf-host: maybe-pdf-fileutils
-pdf-host: maybe-pdf-findutils
-pdf-host: maybe-pdf-find
 pdf-host: maybe-pdf-fixincludes
 pdf-host: maybe-pdf-flex
 pdf-host: maybe-pdf-gas
 pdf-host: maybe-pdf-gcc
-pdf-host: maybe-pdf-gawk
-pdf-host: maybe-pdf-gettext
 pdf-host: maybe-pdf-gmp
 pdf-host: maybe-pdf-mpfr
-pdf-host: maybe-pdf-gnuserv
+pdf-host: maybe-pdf-mpc
+pdf-host: maybe-pdf-isl
+pdf-host: maybe-pdf-libelf
 pdf-host: maybe-pdf-gold
 pdf-host: maybe-pdf-gprof
-pdf-host: maybe-pdf-gzip
-pdf-host: maybe-pdf-hello
-pdf-host: maybe-pdf-indent
 pdf-host: maybe-pdf-intl
 pdf-host: maybe-pdf-tcl
 pdf-host: maybe-pdf-itcl
 pdf-host: maybe-pdf-ld
+pdf-host: maybe-pdf-libbacktrace
 pdf-host: maybe-pdf-libcpp
 pdf-host: maybe-pdf-libdecnumber
 pdf-host: maybe-pdf-libgui
 pdf-host: maybe-pdf-libiberty
-pdf-host: maybe-pdf-libtool
+pdf-host: maybe-pdf-libiberty-linker-plugin
+pdf-host: maybe-pdf-libiconv
 pdf-host: maybe-pdf-m4
-pdf-host: maybe-pdf-make
-pdf-host: maybe-pdf-mmalloc
-pdf-host: maybe-pdf-patch
-pdf-host: maybe-pdf-perl
-pdf-host: maybe-pdf-prms
-pdf-host: maybe-pdf-rcs
 pdf-host: maybe-pdf-readline
-pdf-host: maybe-pdf-release
-pdf-host: maybe-pdf-recode
-pdf-host: maybe-pdf-sed
-pdf-host: maybe-pdf-send-pr
-pdf-host: maybe-pdf-shellutils
 pdf-host: maybe-pdf-sid
 pdf-host: maybe-pdf-sim
-pdf-host: maybe-pdf-tar
 pdf-host: maybe-pdf-texinfo
-pdf-host: maybe-pdf-textutils
-pdf-host: maybe-pdf-time
-pdf-host: maybe-pdf-uudecode
-pdf-host: maybe-pdf-wdiff
-pdf-host: maybe-pdf-zip
 pdf-host: maybe-pdf-zlib
+pdf-host: maybe-pdf-gnulib
+pdf-host: maybe-pdf-gdbsupport
+pdf-host: maybe-pdf-gdbserver
 pdf-host: maybe-pdf-gdb
 pdf-host: maybe-pdf-expect
 pdf-host: maybe-pdf-guile
@@ -1211,30 +1396,37 @@ pdf-host: maybe-pdf-tk
 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
+pdf-host: maybe-pdf-libctf
 
 .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
+pdf-target: maybe-pdf-target-libbacktrace
+pdf-target: maybe-pdf-target-libquadmath
 pdf-target: maybe-pdf-target-libgfortran
 pdf-target: maybe-pdf-target-libobjc
+pdf-target: maybe-pdf-target-libgo
 pdf-target: maybe-pdf-target-libtermcap
 pdf-target: maybe-pdf-target-winsup
 pdf-target: maybe-pdf-target-libgloss
-pdf-target: maybe-pdf-target-libiberty
-pdf-target: maybe-pdf-target-gperf
-pdf-target: maybe-pdf-target-examples
 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-qthreads
 pdf-target: maybe-pdf-target-rda
 pdf-target: maybe-pdf-target-libada
 pdf-target: maybe-pdf-target-libgomp
+pdf-target: maybe-pdf-target-libitm
+pdf-target: maybe-pdf-target-libatomic
 
 .PHONY: do-html
 do-html:
@@ -1247,70 +1439,45 @@ do-html:
 
 .PHONY: html-host
 
-html-host: maybe-html-ash
-html-host: maybe-html-autoconf
-html-host: maybe-html-automake
-html-host: maybe-html-bash
 html-host: maybe-html-bfd
 html-host: maybe-html-opcodes
 html-host: maybe-html-binutils
 html-host: maybe-html-bison
-html-host: maybe-html-byacc
-html-host: maybe-html-bzip2
+html-host: maybe-html-cgen
 html-host: maybe-html-dejagnu
-html-host: maybe-html-diff
-html-host: maybe-html-dosutils
 html-host: maybe-html-etc
 html-host: maybe-html-fastjar
-html-host: maybe-html-fileutils
-html-host: maybe-html-findutils
-html-host: maybe-html-find
 html-host: maybe-html-fixincludes
 html-host: maybe-html-flex
 html-host: maybe-html-gas
 html-host: maybe-html-gcc
-html-host: maybe-html-gawk
-html-host: maybe-html-gettext
 html-host: maybe-html-gmp
 html-host: maybe-html-mpfr
-html-host: maybe-html-gnuserv
+html-host: maybe-html-mpc
+html-host: maybe-html-isl
+html-host: maybe-html-libelf
 html-host: maybe-html-gold
 html-host: maybe-html-gprof
-html-host: maybe-html-gzip
-html-host: maybe-html-hello
-html-host: maybe-html-indent
 html-host: maybe-html-intl
 html-host: maybe-html-tcl
 html-host: maybe-html-itcl
 html-host: maybe-html-ld
+html-host: maybe-html-libbacktrace
 html-host: maybe-html-libcpp
 html-host: maybe-html-libdecnumber
 html-host: maybe-html-libgui
 html-host: maybe-html-libiberty
-html-host: maybe-html-libtool
+html-host: maybe-html-libiberty-linker-plugin
+html-host: maybe-html-libiconv
 html-host: maybe-html-m4
-html-host: maybe-html-make
-html-host: maybe-html-mmalloc
-html-host: maybe-html-patch
-html-host: maybe-html-perl
-html-host: maybe-html-prms
-html-host: maybe-html-rcs
 html-host: maybe-html-readline
-html-host: maybe-html-release
-html-host: maybe-html-recode
-html-host: maybe-html-sed
-html-host: maybe-html-send-pr
-html-host: maybe-html-shellutils
 html-host: maybe-html-sid
 html-host: maybe-html-sim
-html-host: maybe-html-tar
 html-host: maybe-html-texinfo
-html-host: maybe-html-textutils
-html-host: maybe-html-time
-html-host: maybe-html-uudecode
-html-host: maybe-html-wdiff
-html-host: maybe-html-zip
 html-host: maybe-html-zlib
+html-host: maybe-html-gnulib
+html-host: maybe-html-gdbsupport
+html-host: maybe-html-gdbserver
 html-host: maybe-html-gdb
 html-host: maybe-html-expect
 html-host: maybe-html-guile
@@ -1318,30 +1485,37 @@ html-host: maybe-html-tk
 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
+html-host: maybe-html-libctf
 
 .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
+html-target: maybe-html-target-libbacktrace
+html-target: maybe-html-target-libquadmath
 html-target: maybe-html-target-libgfortran
 html-target: maybe-html-target-libobjc
+html-target: maybe-html-target-libgo
 html-target: maybe-html-target-libtermcap
 html-target: maybe-html-target-winsup
 html-target: maybe-html-target-libgloss
-html-target: maybe-html-target-libiberty
-html-target: maybe-html-target-gperf
-html-target: maybe-html-target-examples
 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-qthreads
 html-target: maybe-html-target-rda
 html-target: maybe-html-target-libada
 html-target: maybe-html-target-libgomp
+html-target: maybe-html-target-libitm
+html-target: maybe-html-target-libatomic
 
 .PHONY: do-TAGS
 do-TAGS:
@@ -1354,70 +1528,45 @@ do-TAGS:
 
 .PHONY: TAGS-host
 
-TAGS-host: maybe-TAGS-ash
-TAGS-host: maybe-TAGS-autoconf
-TAGS-host: maybe-TAGS-automake
-TAGS-host: maybe-TAGS-bash
 TAGS-host: maybe-TAGS-bfd
 TAGS-host: maybe-TAGS-opcodes
 TAGS-host: maybe-TAGS-binutils
 TAGS-host: maybe-TAGS-bison
-TAGS-host: maybe-TAGS-byacc
-TAGS-host: maybe-TAGS-bzip2
+TAGS-host: maybe-TAGS-cgen
 TAGS-host: maybe-TAGS-dejagnu
-TAGS-host: maybe-TAGS-diff
-TAGS-host: maybe-TAGS-dosutils
 TAGS-host: maybe-TAGS-etc
 TAGS-host: maybe-TAGS-fastjar
-TAGS-host: maybe-TAGS-fileutils
-TAGS-host: maybe-TAGS-findutils
-TAGS-host: maybe-TAGS-find
 TAGS-host: maybe-TAGS-fixincludes
 TAGS-host: maybe-TAGS-flex
 TAGS-host: maybe-TAGS-gas
 TAGS-host: maybe-TAGS-gcc
-TAGS-host: maybe-TAGS-gawk
-TAGS-host: maybe-TAGS-gettext
 TAGS-host: maybe-TAGS-gmp
 TAGS-host: maybe-TAGS-mpfr
-TAGS-host: maybe-TAGS-gnuserv
+TAGS-host: maybe-TAGS-mpc
+TAGS-host: maybe-TAGS-isl
+TAGS-host: maybe-TAGS-libelf
 TAGS-host: maybe-TAGS-gold
 TAGS-host: maybe-TAGS-gprof
-TAGS-host: maybe-TAGS-gzip
-TAGS-host: maybe-TAGS-hello
-TAGS-host: maybe-TAGS-indent
 TAGS-host: maybe-TAGS-intl
 TAGS-host: maybe-TAGS-tcl
 TAGS-host: maybe-TAGS-itcl
 TAGS-host: maybe-TAGS-ld
+TAGS-host: maybe-TAGS-libbacktrace
 TAGS-host: maybe-TAGS-libcpp
 TAGS-host: maybe-TAGS-libdecnumber
 TAGS-host: maybe-TAGS-libgui
 TAGS-host: maybe-TAGS-libiberty
-TAGS-host: maybe-TAGS-libtool
+TAGS-host: maybe-TAGS-libiberty-linker-plugin
+TAGS-host: maybe-TAGS-libiconv
 TAGS-host: maybe-TAGS-m4
-TAGS-host: maybe-TAGS-make
-TAGS-host: maybe-TAGS-mmalloc
-TAGS-host: maybe-TAGS-patch
-TAGS-host: maybe-TAGS-perl
-TAGS-host: maybe-TAGS-prms
-TAGS-host: maybe-TAGS-rcs
 TAGS-host: maybe-TAGS-readline
-TAGS-host: maybe-TAGS-release
-TAGS-host: maybe-TAGS-recode
-TAGS-host: maybe-TAGS-sed
-TAGS-host: maybe-TAGS-send-pr
-TAGS-host: maybe-TAGS-shellutils
 TAGS-host: maybe-TAGS-sid
 TAGS-host: maybe-TAGS-sim
-TAGS-host: maybe-TAGS-tar
 TAGS-host: maybe-TAGS-texinfo
-TAGS-host: maybe-TAGS-textutils
-TAGS-host: maybe-TAGS-time
-TAGS-host: maybe-TAGS-uudecode
-TAGS-host: maybe-TAGS-wdiff
-TAGS-host: maybe-TAGS-zip
 TAGS-host: maybe-TAGS-zlib
+TAGS-host: maybe-TAGS-gnulib
+TAGS-host: maybe-TAGS-gdbsupport
+TAGS-host: maybe-TAGS-gdbserver
 TAGS-host: maybe-TAGS-gdb
 TAGS-host: maybe-TAGS-expect
 TAGS-host: maybe-TAGS-guile
@@ -1425,30 +1574,37 @@ TAGS-host: maybe-TAGS-tk
 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
+TAGS-host: maybe-TAGS-libctf
 
 .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
+TAGS-target: maybe-TAGS-target-libbacktrace
+TAGS-target: maybe-TAGS-target-libquadmath
 TAGS-target: maybe-TAGS-target-libgfortran
 TAGS-target: maybe-TAGS-target-libobjc
+TAGS-target: maybe-TAGS-target-libgo
 TAGS-target: maybe-TAGS-target-libtermcap
 TAGS-target: maybe-TAGS-target-winsup
 TAGS-target: maybe-TAGS-target-libgloss
-TAGS-target: maybe-TAGS-target-libiberty
-TAGS-target: maybe-TAGS-target-gperf
-TAGS-target: maybe-TAGS-target-examples
 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-qthreads
 TAGS-target: maybe-TAGS-target-rda
 TAGS-target: maybe-TAGS-target-libada
 TAGS-target: maybe-TAGS-target-libgomp
+TAGS-target: maybe-TAGS-target-libitm
+TAGS-target: maybe-TAGS-target-libatomic
 
 .PHONY: do-install-info
 do-install-info:
@@ -1461,70 +1617,45 @@ do-install-info:
 
 .PHONY: install-info-host
 
-install-info-host: maybe-install-info-ash
-install-info-host: maybe-install-info-autoconf
-install-info-host: maybe-install-info-automake
-install-info-host: maybe-install-info-bash
 install-info-host: maybe-install-info-bfd
 install-info-host: maybe-install-info-opcodes
 install-info-host: maybe-install-info-binutils
 install-info-host: maybe-install-info-bison
-install-info-host: maybe-install-info-byacc
-install-info-host: maybe-install-info-bzip2
+install-info-host: maybe-install-info-cgen
 install-info-host: maybe-install-info-dejagnu
-install-info-host: maybe-install-info-diff
-install-info-host: maybe-install-info-dosutils
 install-info-host: maybe-install-info-etc
 install-info-host: maybe-install-info-fastjar
-install-info-host: maybe-install-info-fileutils
-install-info-host: maybe-install-info-findutils
-install-info-host: maybe-install-info-find
 install-info-host: maybe-install-info-fixincludes
 install-info-host: maybe-install-info-flex
 install-info-host: maybe-install-info-gas
 install-info-host: maybe-install-info-gcc
-install-info-host: maybe-install-info-gawk
-install-info-host: maybe-install-info-gettext
 install-info-host: maybe-install-info-gmp
 install-info-host: maybe-install-info-mpfr
-install-info-host: maybe-install-info-gnuserv
+install-info-host: maybe-install-info-mpc
+install-info-host: maybe-install-info-isl
+install-info-host: maybe-install-info-libelf
 install-info-host: maybe-install-info-gold
 install-info-host: maybe-install-info-gprof
-install-info-host: maybe-install-info-gzip
-install-info-host: maybe-install-info-hello
-install-info-host: maybe-install-info-indent
 install-info-host: maybe-install-info-intl
 install-info-host: maybe-install-info-tcl
 install-info-host: maybe-install-info-itcl
 install-info-host: maybe-install-info-ld
+install-info-host: maybe-install-info-libbacktrace
 install-info-host: maybe-install-info-libcpp
 install-info-host: maybe-install-info-libdecnumber
 install-info-host: maybe-install-info-libgui
 install-info-host: maybe-install-info-libiberty
-install-info-host: maybe-install-info-libtool
+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-make
-install-info-host: maybe-install-info-mmalloc
-install-info-host: maybe-install-info-patch
-install-info-host: maybe-install-info-perl
-install-info-host: maybe-install-info-prms
-install-info-host: maybe-install-info-rcs
 install-info-host: maybe-install-info-readline
-install-info-host: maybe-install-info-release
-install-info-host: maybe-install-info-recode
-install-info-host: maybe-install-info-sed
-install-info-host: maybe-install-info-send-pr
-install-info-host: maybe-install-info-shellutils
 install-info-host: maybe-install-info-sid
 install-info-host: maybe-install-info-sim
-install-info-host: maybe-install-info-tar
 install-info-host: maybe-install-info-texinfo
-install-info-host: maybe-install-info-textutils
-install-info-host: maybe-install-info-time
-install-info-host: maybe-install-info-uudecode
-install-info-host: maybe-install-info-wdiff
-install-info-host: maybe-install-info-zip
 install-info-host: maybe-install-info-zlib
+install-info-host: maybe-install-info-gnulib
+install-info-host: maybe-install-info-gdbsupport
+install-info-host: maybe-install-info-gdbserver
 install-info-host: maybe-install-info-gdb
 install-info-host: maybe-install-info-expect
 install-info-host: maybe-install-info-guile
@@ -1532,30 +1663,37 @@ install-info-host: maybe-install-info-tk
 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
+install-info-host: maybe-install-info-libctf
 
 .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
+install-info-target: maybe-install-info-target-libbacktrace
+install-info-target: maybe-install-info-target-libquadmath
 install-info-target: maybe-install-info-target-libgfortran
 install-info-target: maybe-install-info-target-libobjc
+install-info-target: maybe-install-info-target-libgo
 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-libiberty
-install-info-target: maybe-install-info-target-gperf
-install-info-target: maybe-install-info-target-examples
 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-qthreads
 install-info-target: maybe-install-info-target-rda
 install-info-target: maybe-install-info-target-libada
 install-info-target: maybe-install-info-target-libgomp
+install-info-target: maybe-install-info-target-libitm
+install-info-target: maybe-install-info-target-libatomic
 
 .PHONY: do-install-pdf
 do-install-pdf:
@@ -1568,70 +1706,45 @@ do-install-pdf:
 
 .PHONY: install-pdf-host
 
-install-pdf-host: maybe-install-pdf-ash
-install-pdf-host: maybe-install-pdf-autoconf
-install-pdf-host: maybe-install-pdf-automake
-install-pdf-host: maybe-install-pdf-bash
 install-pdf-host: maybe-install-pdf-bfd
 install-pdf-host: maybe-install-pdf-opcodes
 install-pdf-host: maybe-install-pdf-binutils
 install-pdf-host: maybe-install-pdf-bison
-install-pdf-host: maybe-install-pdf-byacc
-install-pdf-host: maybe-install-pdf-bzip2
+install-pdf-host: maybe-install-pdf-cgen
 install-pdf-host: maybe-install-pdf-dejagnu
-install-pdf-host: maybe-install-pdf-diff
-install-pdf-host: maybe-install-pdf-dosutils
 install-pdf-host: maybe-install-pdf-etc
 install-pdf-host: maybe-install-pdf-fastjar
-install-pdf-host: maybe-install-pdf-fileutils
-install-pdf-host: maybe-install-pdf-findutils
-install-pdf-host: maybe-install-pdf-find
 install-pdf-host: maybe-install-pdf-fixincludes
 install-pdf-host: maybe-install-pdf-flex
 install-pdf-host: maybe-install-pdf-gas
 install-pdf-host: maybe-install-pdf-gcc
-install-pdf-host: maybe-install-pdf-gawk
-install-pdf-host: maybe-install-pdf-gettext
 install-pdf-host: maybe-install-pdf-gmp
 install-pdf-host: maybe-install-pdf-mpfr
-install-pdf-host: maybe-install-pdf-gnuserv
+install-pdf-host: maybe-install-pdf-mpc
+install-pdf-host: maybe-install-pdf-isl
+install-pdf-host: maybe-install-pdf-libelf
 install-pdf-host: maybe-install-pdf-gold
 install-pdf-host: maybe-install-pdf-gprof
-install-pdf-host: maybe-install-pdf-gzip
-install-pdf-host: maybe-install-pdf-hello
-install-pdf-host: maybe-install-pdf-indent
 install-pdf-host: maybe-install-pdf-intl
 install-pdf-host: maybe-install-pdf-tcl
 install-pdf-host: maybe-install-pdf-itcl
 install-pdf-host: maybe-install-pdf-ld
+install-pdf-host: maybe-install-pdf-libbacktrace
 install-pdf-host: maybe-install-pdf-libcpp
 install-pdf-host: maybe-install-pdf-libdecnumber
 install-pdf-host: maybe-install-pdf-libgui
 install-pdf-host: maybe-install-pdf-libiberty
-install-pdf-host: maybe-install-pdf-libtool
+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-make
-install-pdf-host: maybe-install-pdf-mmalloc
-install-pdf-host: maybe-install-pdf-patch
-install-pdf-host: maybe-install-pdf-perl
-install-pdf-host: maybe-install-pdf-prms
-install-pdf-host: maybe-install-pdf-rcs
 install-pdf-host: maybe-install-pdf-readline
-install-pdf-host: maybe-install-pdf-release
-install-pdf-host: maybe-install-pdf-recode
-install-pdf-host: maybe-install-pdf-sed
-install-pdf-host: maybe-install-pdf-send-pr
-install-pdf-host: maybe-install-pdf-shellutils
 install-pdf-host: maybe-install-pdf-sid
 install-pdf-host: maybe-install-pdf-sim
-install-pdf-host: maybe-install-pdf-tar
 install-pdf-host: maybe-install-pdf-texinfo
-install-pdf-host: maybe-install-pdf-textutils
-install-pdf-host: maybe-install-pdf-time
-install-pdf-host: maybe-install-pdf-uudecode
-install-pdf-host: maybe-install-pdf-wdiff
-install-pdf-host: maybe-install-pdf-zip
 install-pdf-host: maybe-install-pdf-zlib
+install-pdf-host: maybe-install-pdf-gnulib
+install-pdf-host: maybe-install-pdf-gdbsupport
+install-pdf-host: maybe-install-pdf-gdbserver
 install-pdf-host: maybe-install-pdf-gdb
 install-pdf-host: maybe-install-pdf-expect
 install-pdf-host: maybe-install-pdf-guile
@@ -1639,30 +1752,37 @@ install-pdf-host: maybe-install-pdf-tk
 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
+install-pdf-host: maybe-install-pdf-libctf
 
 .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
+install-pdf-target: maybe-install-pdf-target-libbacktrace
+install-pdf-target: maybe-install-pdf-target-libquadmath
 install-pdf-target: maybe-install-pdf-target-libgfortran
 install-pdf-target: maybe-install-pdf-target-libobjc
+install-pdf-target: maybe-install-pdf-target-libgo
 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-libiberty
-install-pdf-target: maybe-install-pdf-target-gperf
-install-pdf-target: maybe-install-pdf-target-examples
 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-qthreads
 install-pdf-target: maybe-install-pdf-target-rda
 install-pdf-target: maybe-install-pdf-target-libada
 install-pdf-target: maybe-install-pdf-target-libgomp
+install-pdf-target: maybe-install-pdf-target-libitm
+install-pdf-target: maybe-install-pdf-target-libatomic
 
 .PHONY: do-install-html
 do-install-html:
@@ -1675,70 +1795,45 @@ do-install-html:
 
 .PHONY: install-html-host
 
-install-html-host: maybe-install-html-ash
-install-html-host: maybe-install-html-autoconf
-install-html-host: maybe-install-html-automake
-install-html-host: maybe-install-html-bash
 install-html-host: maybe-install-html-bfd
 install-html-host: maybe-install-html-opcodes
 install-html-host: maybe-install-html-binutils
 install-html-host: maybe-install-html-bison
-install-html-host: maybe-install-html-byacc
-install-html-host: maybe-install-html-bzip2
+install-html-host: maybe-install-html-cgen
 install-html-host: maybe-install-html-dejagnu
-install-html-host: maybe-install-html-diff
-install-html-host: maybe-install-html-dosutils
 install-html-host: maybe-install-html-etc
 install-html-host: maybe-install-html-fastjar
-install-html-host: maybe-install-html-fileutils
-install-html-host: maybe-install-html-findutils
-install-html-host: maybe-install-html-find
 install-html-host: maybe-install-html-fixincludes
 install-html-host: maybe-install-html-flex
 install-html-host: maybe-install-html-gas
 install-html-host: maybe-install-html-gcc
-install-html-host: maybe-install-html-gawk
-install-html-host: maybe-install-html-gettext
 install-html-host: maybe-install-html-gmp
 install-html-host: maybe-install-html-mpfr
-install-html-host: maybe-install-html-gnuserv
+install-html-host: maybe-install-html-mpc
+install-html-host: maybe-install-html-isl
+install-html-host: maybe-install-html-libelf
 install-html-host: maybe-install-html-gold
 install-html-host: maybe-install-html-gprof
-install-html-host: maybe-install-html-gzip
-install-html-host: maybe-install-html-hello
-install-html-host: maybe-install-html-indent
 install-html-host: maybe-install-html-intl
 install-html-host: maybe-install-html-tcl
 install-html-host: maybe-install-html-itcl
 install-html-host: maybe-install-html-ld
+install-html-host: maybe-install-html-libbacktrace
 install-html-host: maybe-install-html-libcpp
 install-html-host: maybe-install-html-libdecnumber
 install-html-host: maybe-install-html-libgui
 install-html-host: maybe-install-html-libiberty
-install-html-host: maybe-install-html-libtool
+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-make
-install-html-host: maybe-install-html-mmalloc
-install-html-host: maybe-install-html-patch
-install-html-host: maybe-install-html-perl
-install-html-host: maybe-install-html-prms
-install-html-host: maybe-install-html-rcs
 install-html-host: maybe-install-html-readline
-install-html-host: maybe-install-html-release
-install-html-host: maybe-install-html-recode
-install-html-host: maybe-install-html-sed
-install-html-host: maybe-install-html-send-pr
-install-html-host: maybe-install-html-shellutils
 install-html-host: maybe-install-html-sid
 install-html-host: maybe-install-html-sim
-install-html-host: maybe-install-html-tar
 install-html-host: maybe-install-html-texinfo
-install-html-host: maybe-install-html-textutils
-install-html-host: maybe-install-html-time
-install-html-host: maybe-install-html-uudecode
-install-html-host: maybe-install-html-wdiff
-install-html-host: maybe-install-html-zip
 install-html-host: maybe-install-html-zlib
+install-html-host: maybe-install-html-gnulib
+install-html-host: maybe-install-html-gdbsupport
+install-html-host: maybe-install-html-gdbserver
 install-html-host: maybe-install-html-gdb
 install-html-host: maybe-install-html-expect
 install-html-host: maybe-install-html-guile
@@ -1746,30 +1841,37 @@ install-html-host: maybe-install-html-tk
 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
+install-html-host: maybe-install-html-libctf
 
 .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
+install-html-target: maybe-install-html-target-libbacktrace
+install-html-target: maybe-install-html-target-libquadmath
 install-html-target: maybe-install-html-target-libgfortran
 install-html-target: maybe-install-html-target-libobjc
+install-html-target: maybe-install-html-target-libgo
 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-libiberty
-install-html-target: maybe-install-html-target-gperf
-install-html-target: maybe-install-html-target-examples
 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-qthreads
 install-html-target: maybe-install-html-target-rda
 install-html-target: maybe-install-html-target-libada
 install-html-target: maybe-install-html-target-libgomp
+install-html-target: maybe-install-html-target-libitm
+install-html-target: maybe-install-html-target-libatomic
 
 .PHONY: do-installcheck
 do-installcheck:
@@ -1782,70 +1884,45 @@ do-installcheck:
 
 .PHONY: installcheck-host
 
-installcheck-host: maybe-installcheck-ash
-installcheck-host: maybe-installcheck-autoconf
-installcheck-host: maybe-installcheck-automake
-installcheck-host: maybe-installcheck-bash
 installcheck-host: maybe-installcheck-bfd
 installcheck-host: maybe-installcheck-opcodes
 installcheck-host: maybe-installcheck-binutils
 installcheck-host: maybe-installcheck-bison
-installcheck-host: maybe-installcheck-byacc
-installcheck-host: maybe-installcheck-bzip2
+installcheck-host: maybe-installcheck-cgen
 installcheck-host: maybe-installcheck-dejagnu
-installcheck-host: maybe-installcheck-diff
-installcheck-host: maybe-installcheck-dosutils
 installcheck-host: maybe-installcheck-etc
 installcheck-host: maybe-installcheck-fastjar
-installcheck-host: maybe-installcheck-fileutils
-installcheck-host: maybe-installcheck-findutils
-installcheck-host: maybe-installcheck-find
 installcheck-host: maybe-installcheck-fixincludes
 installcheck-host: maybe-installcheck-flex
 installcheck-host: maybe-installcheck-gas
 installcheck-host: maybe-installcheck-gcc
-installcheck-host: maybe-installcheck-gawk
-installcheck-host: maybe-installcheck-gettext
 installcheck-host: maybe-installcheck-gmp
 installcheck-host: maybe-installcheck-mpfr
-installcheck-host: maybe-installcheck-gnuserv
+installcheck-host: maybe-installcheck-mpc
+installcheck-host: maybe-installcheck-isl
+installcheck-host: maybe-installcheck-libelf
 installcheck-host: maybe-installcheck-gold
 installcheck-host: maybe-installcheck-gprof
-installcheck-host: maybe-installcheck-gzip
-installcheck-host: maybe-installcheck-hello
-installcheck-host: maybe-installcheck-indent
 installcheck-host: maybe-installcheck-intl
 installcheck-host: maybe-installcheck-tcl
 installcheck-host: maybe-installcheck-itcl
 installcheck-host: maybe-installcheck-ld
+installcheck-host: maybe-installcheck-libbacktrace
 installcheck-host: maybe-installcheck-libcpp
 installcheck-host: maybe-installcheck-libdecnumber
 installcheck-host: maybe-installcheck-libgui
 installcheck-host: maybe-installcheck-libiberty
-installcheck-host: maybe-installcheck-libtool
+installcheck-host: maybe-installcheck-libiberty-linker-plugin
+installcheck-host: maybe-installcheck-libiconv
 installcheck-host: maybe-installcheck-m4
-installcheck-host: maybe-installcheck-make
-installcheck-host: maybe-installcheck-mmalloc
-installcheck-host: maybe-installcheck-patch
-installcheck-host: maybe-installcheck-perl
-installcheck-host: maybe-installcheck-prms
-installcheck-host: maybe-installcheck-rcs
 installcheck-host: maybe-installcheck-readline
-installcheck-host: maybe-installcheck-release
-installcheck-host: maybe-installcheck-recode
-installcheck-host: maybe-installcheck-sed
-installcheck-host: maybe-installcheck-send-pr
-installcheck-host: maybe-installcheck-shellutils
 installcheck-host: maybe-installcheck-sid
 installcheck-host: maybe-installcheck-sim
-installcheck-host: maybe-installcheck-tar
 installcheck-host: maybe-installcheck-texinfo
-installcheck-host: maybe-installcheck-textutils
-installcheck-host: maybe-installcheck-time
-installcheck-host: maybe-installcheck-uudecode
-installcheck-host: maybe-installcheck-wdiff
-installcheck-host: maybe-installcheck-zip
 installcheck-host: maybe-installcheck-zlib
+installcheck-host: maybe-installcheck-gnulib
+installcheck-host: maybe-installcheck-gdbsupport
+installcheck-host: maybe-installcheck-gdbserver
 installcheck-host: maybe-installcheck-gdb
 installcheck-host: maybe-installcheck-expect
 installcheck-host: maybe-installcheck-guile
@@ -1853,30 +1930,37 @@ installcheck-host: maybe-installcheck-tk
 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
+installcheck-host: maybe-installcheck-libctf
 
 .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
+installcheck-target: maybe-installcheck-target-libbacktrace
+installcheck-target: maybe-installcheck-target-libquadmath
 installcheck-target: maybe-installcheck-target-libgfortran
 installcheck-target: maybe-installcheck-target-libobjc
+installcheck-target: maybe-installcheck-target-libgo
 installcheck-target: maybe-installcheck-target-libtermcap
 installcheck-target: maybe-installcheck-target-winsup
 installcheck-target: maybe-installcheck-target-libgloss
-installcheck-target: maybe-installcheck-target-libiberty
-installcheck-target: maybe-installcheck-target-gperf
-installcheck-target: maybe-installcheck-target-examples
 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-qthreads
 installcheck-target: maybe-installcheck-target-rda
 installcheck-target: maybe-installcheck-target-libada
 installcheck-target: maybe-installcheck-target-libgomp
+installcheck-target: maybe-installcheck-target-libitm
+installcheck-target: maybe-installcheck-target-libatomic
 
 .PHONY: do-mostlyclean
 do-mostlyclean:
@@ -1889,70 +1973,45 @@ do-mostlyclean:
 
 .PHONY: mostlyclean-host
 
-mostlyclean-host: maybe-mostlyclean-ash
-mostlyclean-host: maybe-mostlyclean-autoconf
-mostlyclean-host: maybe-mostlyclean-automake
-mostlyclean-host: maybe-mostlyclean-bash
 mostlyclean-host: maybe-mostlyclean-bfd
 mostlyclean-host: maybe-mostlyclean-opcodes
 mostlyclean-host: maybe-mostlyclean-binutils
 mostlyclean-host: maybe-mostlyclean-bison
-mostlyclean-host: maybe-mostlyclean-byacc
-mostlyclean-host: maybe-mostlyclean-bzip2
+mostlyclean-host: maybe-mostlyclean-cgen
 mostlyclean-host: maybe-mostlyclean-dejagnu
-mostlyclean-host: maybe-mostlyclean-diff
-mostlyclean-host: maybe-mostlyclean-dosutils
 mostlyclean-host: maybe-mostlyclean-etc
 mostlyclean-host: maybe-mostlyclean-fastjar
-mostlyclean-host: maybe-mostlyclean-fileutils
-mostlyclean-host: maybe-mostlyclean-findutils
-mostlyclean-host: maybe-mostlyclean-find
 mostlyclean-host: maybe-mostlyclean-fixincludes
 mostlyclean-host: maybe-mostlyclean-flex
 mostlyclean-host: maybe-mostlyclean-gas
 mostlyclean-host: maybe-mostlyclean-gcc
-mostlyclean-host: maybe-mostlyclean-gawk
-mostlyclean-host: maybe-mostlyclean-gettext
 mostlyclean-host: maybe-mostlyclean-gmp
 mostlyclean-host: maybe-mostlyclean-mpfr
-mostlyclean-host: maybe-mostlyclean-gnuserv
+mostlyclean-host: maybe-mostlyclean-mpc
+mostlyclean-host: maybe-mostlyclean-isl
+mostlyclean-host: maybe-mostlyclean-libelf
 mostlyclean-host: maybe-mostlyclean-gold
 mostlyclean-host: maybe-mostlyclean-gprof
-mostlyclean-host: maybe-mostlyclean-gzip
-mostlyclean-host: maybe-mostlyclean-hello
-mostlyclean-host: maybe-mostlyclean-indent
 mostlyclean-host: maybe-mostlyclean-intl
 mostlyclean-host: maybe-mostlyclean-tcl
 mostlyclean-host: maybe-mostlyclean-itcl
 mostlyclean-host: maybe-mostlyclean-ld
+mostlyclean-host: maybe-mostlyclean-libbacktrace
 mostlyclean-host: maybe-mostlyclean-libcpp
 mostlyclean-host: maybe-mostlyclean-libdecnumber
 mostlyclean-host: maybe-mostlyclean-libgui
 mostlyclean-host: maybe-mostlyclean-libiberty
-mostlyclean-host: maybe-mostlyclean-libtool
+mostlyclean-host: maybe-mostlyclean-libiberty-linker-plugin
+mostlyclean-host: maybe-mostlyclean-libiconv
 mostlyclean-host: maybe-mostlyclean-m4
-mostlyclean-host: maybe-mostlyclean-make
-mostlyclean-host: maybe-mostlyclean-mmalloc
-mostlyclean-host: maybe-mostlyclean-patch
-mostlyclean-host: maybe-mostlyclean-perl
-mostlyclean-host: maybe-mostlyclean-prms
-mostlyclean-host: maybe-mostlyclean-rcs
 mostlyclean-host: maybe-mostlyclean-readline
-mostlyclean-host: maybe-mostlyclean-release
-mostlyclean-host: maybe-mostlyclean-recode
-mostlyclean-host: maybe-mostlyclean-sed
-mostlyclean-host: maybe-mostlyclean-send-pr
-mostlyclean-host: maybe-mostlyclean-shellutils
 mostlyclean-host: maybe-mostlyclean-sid
 mostlyclean-host: maybe-mostlyclean-sim
-mostlyclean-host: maybe-mostlyclean-tar
 mostlyclean-host: maybe-mostlyclean-texinfo
-mostlyclean-host: maybe-mostlyclean-textutils
-mostlyclean-host: maybe-mostlyclean-time
-mostlyclean-host: maybe-mostlyclean-uudecode
-mostlyclean-host: maybe-mostlyclean-wdiff
-mostlyclean-host: maybe-mostlyclean-zip
 mostlyclean-host: maybe-mostlyclean-zlib
+mostlyclean-host: maybe-mostlyclean-gnulib
+mostlyclean-host: maybe-mostlyclean-gdbsupport
+mostlyclean-host: maybe-mostlyclean-gdbserver
 mostlyclean-host: maybe-mostlyclean-gdb
 mostlyclean-host: maybe-mostlyclean-expect
 mostlyclean-host: maybe-mostlyclean-guile
@@ -1960,30 +2019,37 @@ mostlyclean-host: maybe-mostlyclean-tk
 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
+mostlyclean-host: maybe-mostlyclean-libctf
 
 .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
+mostlyclean-target: maybe-mostlyclean-target-libbacktrace
+mostlyclean-target: maybe-mostlyclean-target-libquadmath
 mostlyclean-target: maybe-mostlyclean-target-libgfortran
 mostlyclean-target: maybe-mostlyclean-target-libobjc
+mostlyclean-target: maybe-mostlyclean-target-libgo
 mostlyclean-target: maybe-mostlyclean-target-libtermcap
 mostlyclean-target: maybe-mostlyclean-target-winsup
 mostlyclean-target: maybe-mostlyclean-target-libgloss
-mostlyclean-target: maybe-mostlyclean-target-libiberty
-mostlyclean-target: maybe-mostlyclean-target-gperf
-mostlyclean-target: maybe-mostlyclean-target-examples
 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-qthreads
 mostlyclean-target: maybe-mostlyclean-target-rda
 mostlyclean-target: maybe-mostlyclean-target-libada
 mostlyclean-target: maybe-mostlyclean-target-libgomp
+mostlyclean-target: maybe-mostlyclean-target-libitm
+mostlyclean-target: maybe-mostlyclean-target-libatomic
 
 .PHONY: do-clean
 do-clean:
@@ -1996,70 +2062,45 @@ do-clean:
 
 .PHONY: clean-host
 
-clean-host: maybe-clean-ash
-clean-host: maybe-clean-autoconf
-clean-host: maybe-clean-automake
-clean-host: maybe-clean-bash
 clean-host: maybe-clean-bfd
 clean-host: maybe-clean-opcodes
 clean-host: maybe-clean-binutils
 clean-host: maybe-clean-bison
-clean-host: maybe-clean-byacc
-clean-host: maybe-clean-bzip2
+clean-host: maybe-clean-cgen
 clean-host: maybe-clean-dejagnu
-clean-host: maybe-clean-diff
-clean-host: maybe-clean-dosutils
 clean-host: maybe-clean-etc
 clean-host: maybe-clean-fastjar
-clean-host: maybe-clean-fileutils
-clean-host: maybe-clean-findutils
-clean-host: maybe-clean-find
 clean-host: maybe-clean-fixincludes
 clean-host: maybe-clean-flex
 clean-host: maybe-clean-gas
 clean-host: maybe-clean-gcc
-clean-host: maybe-clean-gawk
-clean-host: maybe-clean-gettext
 clean-host: maybe-clean-gmp
 clean-host: maybe-clean-mpfr
-clean-host: maybe-clean-gnuserv
+clean-host: maybe-clean-mpc
+clean-host: maybe-clean-isl
+clean-host: maybe-clean-libelf
 clean-host: maybe-clean-gold
 clean-host: maybe-clean-gprof
-clean-host: maybe-clean-gzip
-clean-host: maybe-clean-hello
-clean-host: maybe-clean-indent
 clean-host: maybe-clean-intl
 clean-host: maybe-clean-tcl
 clean-host: maybe-clean-itcl
 clean-host: maybe-clean-ld
+clean-host: maybe-clean-libbacktrace
 clean-host: maybe-clean-libcpp
 clean-host: maybe-clean-libdecnumber
 clean-host: maybe-clean-libgui
 clean-host: maybe-clean-libiberty
-clean-host: maybe-clean-libtool
+clean-host: maybe-clean-libiberty-linker-plugin
+clean-host: maybe-clean-libiconv
 clean-host: maybe-clean-m4
-clean-host: maybe-clean-make
-clean-host: maybe-clean-mmalloc
-clean-host: maybe-clean-patch
-clean-host: maybe-clean-perl
-clean-host: maybe-clean-prms
-clean-host: maybe-clean-rcs
 clean-host: maybe-clean-readline
-clean-host: maybe-clean-release
-clean-host: maybe-clean-recode
-clean-host: maybe-clean-sed
-clean-host: maybe-clean-send-pr
-clean-host: maybe-clean-shellutils
 clean-host: maybe-clean-sid
 clean-host: maybe-clean-sim
-clean-host: maybe-clean-tar
 clean-host: maybe-clean-texinfo
-clean-host: maybe-clean-textutils
-clean-host: maybe-clean-time
-clean-host: maybe-clean-uudecode
-clean-host: maybe-clean-wdiff
-clean-host: maybe-clean-zip
 clean-host: maybe-clean-zlib
+clean-host: maybe-clean-gnulib
+clean-host: maybe-clean-gdbsupport
+clean-host: maybe-clean-gdbserver
 clean-host: maybe-clean-gdb
 clean-host: maybe-clean-expect
 clean-host: maybe-clean-guile
@@ -2067,30 +2108,37 @@ clean-host: maybe-clean-tk
 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
+clean-host: maybe-clean-libctf
 
 .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
+clean-target: maybe-clean-target-libbacktrace
+clean-target: maybe-clean-target-libquadmath
 clean-target: maybe-clean-target-libgfortran
 clean-target: maybe-clean-target-libobjc
+clean-target: maybe-clean-target-libgo
 clean-target: maybe-clean-target-libtermcap
 clean-target: maybe-clean-target-winsup
 clean-target: maybe-clean-target-libgloss
-clean-target: maybe-clean-target-libiberty
-clean-target: maybe-clean-target-gperf
-clean-target: maybe-clean-target-examples
 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-qthreads
 clean-target: maybe-clean-target-rda
 clean-target: maybe-clean-target-libada
 clean-target: maybe-clean-target-libgomp
+clean-target: maybe-clean-target-libitm
+clean-target: maybe-clean-target-libatomic
 
 .PHONY: do-distclean
 do-distclean:
@@ -2103,70 +2151,45 @@ do-distclean:
 
 .PHONY: distclean-host
 
-distclean-host: maybe-distclean-ash
-distclean-host: maybe-distclean-autoconf
-distclean-host: maybe-distclean-automake
-distclean-host: maybe-distclean-bash
 distclean-host: maybe-distclean-bfd
 distclean-host: maybe-distclean-opcodes
 distclean-host: maybe-distclean-binutils
 distclean-host: maybe-distclean-bison
-distclean-host: maybe-distclean-byacc
-distclean-host: maybe-distclean-bzip2
+distclean-host: maybe-distclean-cgen
 distclean-host: maybe-distclean-dejagnu
-distclean-host: maybe-distclean-diff
-distclean-host: maybe-distclean-dosutils
 distclean-host: maybe-distclean-etc
 distclean-host: maybe-distclean-fastjar
-distclean-host: maybe-distclean-fileutils
-distclean-host: maybe-distclean-findutils
-distclean-host: maybe-distclean-find
 distclean-host: maybe-distclean-fixincludes
 distclean-host: maybe-distclean-flex
 distclean-host: maybe-distclean-gas
 distclean-host: maybe-distclean-gcc
-distclean-host: maybe-distclean-gawk
-distclean-host: maybe-distclean-gettext
 distclean-host: maybe-distclean-gmp
 distclean-host: maybe-distclean-mpfr
-distclean-host: maybe-distclean-gnuserv
+distclean-host: maybe-distclean-mpc
+distclean-host: maybe-distclean-isl
+distclean-host: maybe-distclean-libelf
 distclean-host: maybe-distclean-gold
 distclean-host: maybe-distclean-gprof
-distclean-host: maybe-distclean-gzip
-distclean-host: maybe-distclean-hello
-distclean-host: maybe-distclean-indent
 distclean-host: maybe-distclean-intl
 distclean-host: maybe-distclean-tcl
 distclean-host: maybe-distclean-itcl
 distclean-host: maybe-distclean-ld
+distclean-host: maybe-distclean-libbacktrace
 distclean-host: maybe-distclean-libcpp
 distclean-host: maybe-distclean-libdecnumber
 distclean-host: maybe-distclean-libgui
 distclean-host: maybe-distclean-libiberty
-distclean-host: maybe-distclean-libtool
+distclean-host: maybe-distclean-libiberty-linker-plugin
+distclean-host: maybe-distclean-libiconv
 distclean-host: maybe-distclean-m4
-distclean-host: maybe-distclean-make
-distclean-host: maybe-distclean-mmalloc
-distclean-host: maybe-distclean-patch
-distclean-host: maybe-distclean-perl
-distclean-host: maybe-distclean-prms
-distclean-host: maybe-distclean-rcs
 distclean-host: maybe-distclean-readline
-distclean-host: maybe-distclean-release
-distclean-host: maybe-distclean-recode
-distclean-host: maybe-distclean-sed
-distclean-host: maybe-distclean-send-pr
-distclean-host: maybe-distclean-shellutils
 distclean-host: maybe-distclean-sid
 distclean-host: maybe-distclean-sim
-distclean-host: maybe-distclean-tar
 distclean-host: maybe-distclean-texinfo
-distclean-host: maybe-distclean-textutils
-distclean-host: maybe-distclean-time
-distclean-host: maybe-distclean-uudecode
-distclean-host: maybe-distclean-wdiff
-distclean-host: maybe-distclean-zip
 distclean-host: maybe-distclean-zlib
+distclean-host: maybe-distclean-gnulib
+distclean-host: maybe-distclean-gdbsupport
+distclean-host: maybe-distclean-gdbserver
 distclean-host: maybe-distclean-gdb
 distclean-host: maybe-distclean-expect
 distclean-host: maybe-distclean-guile
@@ -2174,30 +2197,37 @@ distclean-host: maybe-distclean-tk
 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
+distclean-host: maybe-distclean-libctf
 
 .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
+distclean-target: maybe-distclean-target-libbacktrace
+distclean-target: maybe-distclean-target-libquadmath
 distclean-target: maybe-distclean-target-libgfortran
 distclean-target: maybe-distclean-target-libobjc
+distclean-target: maybe-distclean-target-libgo
 distclean-target: maybe-distclean-target-libtermcap
 distclean-target: maybe-distclean-target-winsup
 distclean-target: maybe-distclean-target-libgloss
-distclean-target: maybe-distclean-target-libiberty
-distclean-target: maybe-distclean-target-gperf
-distclean-target: maybe-distclean-target-examples
 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-qthreads
 distclean-target: maybe-distclean-target-rda
 distclean-target: maybe-distclean-target-libada
 distclean-target: maybe-distclean-target-libgomp
+distclean-target: maybe-distclean-target-libitm
+distclean-target: maybe-distclean-target-libatomic
 
 .PHONY: do-maintainer-clean
 do-maintainer-clean:
@@ -2210,70 +2240,45 @@ do-maintainer-clean:
 
 .PHONY: maintainer-clean-host
 
-maintainer-clean-host: maybe-maintainer-clean-ash
-maintainer-clean-host: maybe-maintainer-clean-autoconf
-maintainer-clean-host: maybe-maintainer-clean-automake
-maintainer-clean-host: maybe-maintainer-clean-bash
 maintainer-clean-host: maybe-maintainer-clean-bfd
 maintainer-clean-host: maybe-maintainer-clean-opcodes
 maintainer-clean-host: maybe-maintainer-clean-binutils
 maintainer-clean-host: maybe-maintainer-clean-bison
-maintainer-clean-host: maybe-maintainer-clean-byacc
-maintainer-clean-host: maybe-maintainer-clean-bzip2
+maintainer-clean-host: maybe-maintainer-clean-cgen
 maintainer-clean-host: maybe-maintainer-clean-dejagnu
-maintainer-clean-host: maybe-maintainer-clean-diff
-maintainer-clean-host: maybe-maintainer-clean-dosutils
 maintainer-clean-host: maybe-maintainer-clean-etc
 maintainer-clean-host: maybe-maintainer-clean-fastjar
-maintainer-clean-host: maybe-maintainer-clean-fileutils
-maintainer-clean-host: maybe-maintainer-clean-findutils
-maintainer-clean-host: maybe-maintainer-clean-find
 maintainer-clean-host: maybe-maintainer-clean-fixincludes
 maintainer-clean-host: maybe-maintainer-clean-flex
 maintainer-clean-host: maybe-maintainer-clean-gas
 maintainer-clean-host: maybe-maintainer-clean-gcc
-maintainer-clean-host: maybe-maintainer-clean-gawk
-maintainer-clean-host: maybe-maintainer-clean-gettext
 maintainer-clean-host: maybe-maintainer-clean-gmp
 maintainer-clean-host: maybe-maintainer-clean-mpfr
-maintainer-clean-host: maybe-maintainer-clean-gnuserv
+maintainer-clean-host: maybe-maintainer-clean-mpc
+maintainer-clean-host: maybe-maintainer-clean-isl
+maintainer-clean-host: maybe-maintainer-clean-libelf
 maintainer-clean-host: maybe-maintainer-clean-gold
 maintainer-clean-host: maybe-maintainer-clean-gprof
-maintainer-clean-host: maybe-maintainer-clean-gzip
-maintainer-clean-host: maybe-maintainer-clean-hello
-maintainer-clean-host: maybe-maintainer-clean-indent
 maintainer-clean-host: maybe-maintainer-clean-intl
 maintainer-clean-host: maybe-maintainer-clean-tcl
 maintainer-clean-host: maybe-maintainer-clean-itcl
 maintainer-clean-host: maybe-maintainer-clean-ld
+maintainer-clean-host: maybe-maintainer-clean-libbacktrace
 maintainer-clean-host: maybe-maintainer-clean-libcpp
 maintainer-clean-host: maybe-maintainer-clean-libdecnumber
 maintainer-clean-host: maybe-maintainer-clean-libgui
 maintainer-clean-host: maybe-maintainer-clean-libiberty
-maintainer-clean-host: maybe-maintainer-clean-libtool
+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-make
-maintainer-clean-host: maybe-maintainer-clean-mmalloc
-maintainer-clean-host: maybe-maintainer-clean-patch
-maintainer-clean-host: maybe-maintainer-clean-perl
-maintainer-clean-host: maybe-maintainer-clean-prms
-maintainer-clean-host: maybe-maintainer-clean-rcs
 maintainer-clean-host: maybe-maintainer-clean-readline
-maintainer-clean-host: maybe-maintainer-clean-release
-maintainer-clean-host: maybe-maintainer-clean-recode
-maintainer-clean-host: maybe-maintainer-clean-sed
-maintainer-clean-host: maybe-maintainer-clean-send-pr
-maintainer-clean-host: maybe-maintainer-clean-shellutils
 maintainer-clean-host: maybe-maintainer-clean-sid
 maintainer-clean-host: maybe-maintainer-clean-sim
-maintainer-clean-host: maybe-maintainer-clean-tar
 maintainer-clean-host: maybe-maintainer-clean-texinfo
-maintainer-clean-host: maybe-maintainer-clean-textutils
-maintainer-clean-host: maybe-maintainer-clean-time
-maintainer-clean-host: maybe-maintainer-clean-uudecode
-maintainer-clean-host: maybe-maintainer-clean-wdiff
-maintainer-clean-host: maybe-maintainer-clean-zip
 maintainer-clean-host: maybe-maintainer-clean-zlib
+maintainer-clean-host: maybe-maintainer-clean-gnulib
+maintainer-clean-host: maybe-maintainer-clean-gdbsupport
+maintainer-clean-host: maybe-maintainer-clean-gdbserver
 maintainer-clean-host: maybe-maintainer-clean-gdb
 maintainer-clean-host: maybe-maintainer-clean-expect
 maintainer-clean-host: maybe-maintainer-clean-guile
@@ -2281,30 +2286,37 @@ maintainer-clean-host: maybe-maintainer-clean-tk
 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
+maintainer-clean-host: maybe-maintainer-clean-libctf
 
 .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
+maintainer-clean-target: maybe-maintainer-clean-target-libbacktrace
+maintainer-clean-target: maybe-maintainer-clean-target-libquadmath
 maintainer-clean-target: maybe-maintainer-clean-target-libgfortran
 maintainer-clean-target: maybe-maintainer-clean-target-libobjc
+maintainer-clean-target: maybe-maintainer-clean-target-libgo
 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-libiberty
-maintainer-clean-target: maybe-maintainer-clean-target-gperf
-maintainer-clean-target: maybe-maintainer-clean-target-examples
 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-qthreads
 maintainer-clean-target: maybe-maintainer-clean-target-rda
 maintainer-clean-target: maybe-maintainer-clean-target-libada
 maintainer-clean-target: maybe-maintainer-clean-target-libgomp
+maintainer-clean-target: maybe-maintainer-clean-target-libitm
+maintainer-clean-target: maybe-maintainer-clean-target-libatomic
 
 
 # Here are the targets which correspond to the do-X targets.
@@ -2325,9 +2337,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
 
@@ -2338,7 +2350,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
@@ -2350,7 +2362,9 @@ 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:
        @echo "This command is intended for maintainers to use;"
@@ -2371,101 +2385,83 @@ check: do-check
 # Only include modules actually being configured and built.
 .PHONY: check-host
 check-host:  \
-    maybe-check-ash \
-    maybe-check-autoconf \
-    maybe-check-automake \
-    maybe-check-bash \
     maybe-check-bfd \
     maybe-check-opcodes \
     maybe-check-binutils \
     maybe-check-bison \
-    maybe-check-byacc \
-    maybe-check-bzip2 \
+    maybe-check-cgen \
     maybe-check-dejagnu \
-    maybe-check-diff \
-    maybe-check-dosutils \
     maybe-check-etc \
     maybe-check-fastjar \
-    maybe-check-fileutils \
-    maybe-check-findutils \
-    maybe-check-find \
     maybe-check-fixincludes \
     maybe-check-flex \
     maybe-check-gas \
     maybe-check-gcc \
-    maybe-check-gawk \
-    maybe-check-gettext \
     maybe-check-gmp \
     maybe-check-mpfr \
-    maybe-check-gnuserv \
+    maybe-check-mpc \
+    maybe-check-isl \
+    maybe-check-libelf \
     maybe-check-gold \
     maybe-check-gprof \
-    maybe-check-gzip \
-    maybe-check-hello \
-    maybe-check-indent \
     maybe-check-intl \
     maybe-check-tcl \
     maybe-check-itcl \
     maybe-check-ld \
+    maybe-check-libbacktrace \
     maybe-check-libcpp \
     maybe-check-libdecnumber \
     maybe-check-libgui \
     maybe-check-libiberty \
-    maybe-check-libtool \
+    maybe-check-libiberty-linker-plugin \
+    maybe-check-libiconv \
     maybe-check-m4 \
-    maybe-check-make \
-    maybe-check-mmalloc \
-    maybe-check-patch \
-    maybe-check-perl \
-    maybe-check-prms \
-    maybe-check-rcs \
     maybe-check-readline \
-    maybe-check-release \
-    maybe-check-recode \
-    maybe-check-sed \
-    maybe-check-send-pr \
-    maybe-check-shellutils \
     maybe-check-sid \
     maybe-check-sim \
-    maybe-check-tar \
     maybe-check-texinfo \
-    maybe-check-textutils \
-    maybe-check-time \
-    maybe-check-uudecode \
-    maybe-check-wdiff \
-    maybe-check-zip \
     maybe-check-zlib \
+    maybe-check-gnulib \
+    maybe-check-gdbsupport \
+    maybe-check-gdbserver \
     maybe-check-gdb \
     maybe-check-expect \
     maybe-check-guile \
     maybe-check-tk \
     maybe-check-libtermcap \
     maybe-check-utils \
-    maybe-check-gnattools
+    maybe-check-gnattools \
+    maybe-check-lto-plugin \
+    maybe-check-libcc1 \
+    maybe-check-gotools \
+    maybe-check-libctf
 
 .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 \
+    maybe-check-target-libbacktrace \
+    maybe-check-target-libquadmath \
     maybe-check-target-libgfortran \
     maybe-check-target-libobjc \
+    maybe-check-target-libgo \
     maybe-check-target-libtermcap \
     maybe-check-target-winsup \
     maybe-check-target-libgloss \
-    maybe-check-target-libiberty \
-    maybe-check-target-gperf \
-    maybe-check-target-examples \
     maybe-check-target-libffi \
-    maybe-check-target-libjava \
     maybe-check-target-zlib \
-    maybe-check-target-boehm-gc \
-    maybe-check-target-qthreads \
     maybe-check-target-rda \
     maybe-check-target-libada \
-    maybe-check-target-libgomp
+    maybe-check-target-libgomp \
+    maybe-check-target-libitm \
+    maybe-check-target-libatomic
 
 do-check:
        @: $(MAKE); $(unstage)
@@ -2494,6 +2490,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
@@ -2505,195 +2522,245 @@ install:
 
 .PHONY: install-host-nogcc
 install-host-nogcc:  \
-    maybe-install-ash \
-    maybe-install-autoconf \
-    maybe-install-automake \
-    maybe-install-bash \
     maybe-install-bfd \
     maybe-install-opcodes \
     maybe-install-binutils \
     maybe-install-bison \
-    maybe-install-byacc \
-    maybe-install-bzip2 \
+    maybe-install-cgen \
     maybe-install-dejagnu \
-    maybe-install-diff \
-    maybe-install-dosutils \
     maybe-install-etc \
     maybe-install-fastjar \
-    maybe-install-fileutils \
-    maybe-install-findutils \
-    maybe-install-find \
     maybe-install-fixincludes \
     maybe-install-flex \
     maybe-install-gas \
-    maybe-install-gawk \
-    maybe-install-gettext \
     maybe-install-gmp \
     maybe-install-mpfr \
-    maybe-install-gnuserv \
+    maybe-install-mpc \
+    maybe-install-isl \
+    maybe-install-libelf \
     maybe-install-gold \
     maybe-install-gprof \
-    maybe-install-gzip \
-    maybe-install-hello \
-    maybe-install-indent \
     maybe-install-intl \
     maybe-install-tcl \
     maybe-install-itcl \
     maybe-install-ld \
+    maybe-install-libbacktrace \
     maybe-install-libcpp \
     maybe-install-libdecnumber \
     maybe-install-libgui \
     maybe-install-libiberty \
-    maybe-install-libtool \
+    maybe-install-libiberty-linker-plugin \
+    maybe-install-libiconv \
     maybe-install-m4 \
-    maybe-install-make \
-    maybe-install-mmalloc \
-    maybe-install-patch \
-    maybe-install-perl \
-    maybe-install-prms \
-    maybe-install-rcs \
     maybe-install-readline \
-    maybe-install-release \
-    maybe-install-recode \
-    maybe-install-sed \
-    maybe-install-send-pr \
-    maybe-install-shellutils \
     maybe-install-sid \
     maybe-install-sim \
-    maybe-install-tar \
     maybe-install-texinfo \
-    maybe-install-textutils \
-    maybe-install-time \
-    maybe-install-uudecode \
-    maybe-install-wdiff \
-    maybe-install-zip \
     maybe-install-zlib \
+    maybe-install-gnulib \
+    maybe-install-gdbsupport \
+    maybe-install-gdbserver \
     maybe-install-gdb \
     maybe-install-expect \
     maybe-install-guile \
     maybe-install-tk \
     maybe-install-libtermcap \
     maybe-install-utils \
-    maybe-install-gnattools
+    maybe-install-gnattools \
+    maybe-install-lto-plugin \
+    maybe-install-libcc1 \
+    maybe-install-gotools \
+    maybe-install-libctf
 
 .PHONY: install-host
 install-host:  \
-    maybe-install-ash \
-    maybe-install-autoconf \
-    maybe-install-automake \
-    maybe-install-bash \
     maybe-install-bfd \
     maybe-install-opcodes \
     maybe-install-binutils \
     maybe-install-bison \
-    maybe-install-byacc \
-    maybe-install-bzip2 \
+    maybe-install-cgen \
     maybe-install-dejagnu \
-    maybe-install-diff \
-    maybe-install-dosutils \
     maybe-install-etc \
     maybe-install-fastjar \
-    maybe-install-fileutils \
-    maybe-install-findutils \
-    maybe-install-find \
     maybe-install-fixincludes \
     maybe-install-flex \
     maybe-install-gas \
     maybe-install-gcc \
-    maybe-install-gawk \
-    maybe-install-gettext \
     maybe-install-gmp \
     maybe-install-mpfr \
-    maybe-install-gnuserv \
+    maybe-install-mpc \
+    maybe-install-isl \
+    maybe-install-libelf \
     maybe-install-gold \
     maybe-install-gprof \
-    maybe-install-gzip \
-    maybe-install-hello \
-    maybe-install-indent \
     maybe-install-intl \
     maybe-install-tcl \
     maybe-install-itcl \
     maybe-install-ld \
+    maybe-install-libbacktrace \
     maybe-install-libcpp \
     maybe-install-libdecnumber \
     maybe-install-libgui \
     maybe-install-libiberty \
-    maybe-install-libtool \
+    maybe-install-libiberty-linker-plugin \
+    maybe-install-libiconv \
     maybe-install-m4 \
-    maybe-install-make \
-    maybe-install-mmalloc \
-    maybe-install-patch \
-    maybe-install-perl \
-    maybe-install-prms \
-    maybe-install-rcs \
     maybe-install-readline \
-    maybe-install-release \
-    maybe-install-recode \
-    maybe-install-sed \
-    maybe-install-send-pr \
-    maybe-install-shellutils \
     maybe-install-sid \
     maybe-install-sim \
-    maybe-install-tar \
     maybe-install-texinfo \
-    maybe-install-textutils \
-    maybe-install-time \
-    maybe-install-uudecode \
-    maybe-install-wdiff \
-    maybe-install-zip \
     maybe-install-zlib \
+    maybe-install-gnulib \
+    maybe-install-gdbsupport \
+    maybe-install-gdbserver \
     maybe-install-gdb \
     maybe-install-expect \
     maybe-install-guile \
     maybe-install-tk \
     maybe-install-libtermcap \
     maybe-install-utils \
-    maybe-install-gnattools
+    maybe-install-gnattools \
+    maybe-install-lto-plugin \
+    maybe-install-libcc1 \
+    maybe-install-gotools \
+    maybe-install-libctf
 
 .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 \
+    maybe-install-target-libbacktrace \
+    maybe-install-target-libquadmath \
     maybe-install-target-libgfortran \
     maybe-install-target-libobjc \
+    maybe-install-target-libgo \
     maybe-install-target-libtermcap \
     maybe-install-target-winsup \
     maybe-install-target-libgloss \
-    maybe-install-target-libiberty \
-    maybe-install-target-gperf \
-    maybe-install-target-examples \
     maybe-install-target-libffi \
-    maybe-install-target-libjava \
     maybe-install-target-zlib \
-    maybe-install-target-boehm-gc \
-    maybe-install-target-qthreads \
     maybe-install-target-rda \
     maybe-install-target-libada \
-    maybe-install-target-libgomp
+    maybe-install-target-libgomp \
+    maybe-install-target-libitm \
+    maybe-install-target-libatomic
 
 uninstall:
        @echo "the uninstall target is not supported in this tree"
 
 .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 because Cygnus can not distribute
-# the fixed header files.
+# install-no-fixedincludes is used to allow the elaboration of binary packages
+# suitable for distribution, where we cannot include the fixed system header
+# files.
 .PHONY: install-no-fixedincludes
 install-no-fixedincludes: installdirs install-host-nogcc \
-       install-target gcc-no-fixedincludes
+       install-target gcc-install-no-fixedincludes
+
+.PHONY: install-strip
+install-strip:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-strip-host install-strip-target
+
+.PHONY: install-strip-host
+install-strip-host:  \
+    maybe-install-strip-bfd \
+    maybe-install-strip-opcodes \
+    maybe-install-strip-binutils \
+    maybe-install-strip-bison \
+    maybe-install-strip-cgen \
+    maybe-install-strip-dejagnu \
+    maybe-install-strip-etc \
+    maybe-install-strip-fastjar \
+    maybe-install-strip-fixincludes \
+    maybe-install-strip-flex \
+    maybe-install-strip-gas \
+    maybe-install-strip-gcc \
+    maybe-install-strip-gmp \
+    maybe-install-strip-mpfr \
+    maybe-install-strip-mpc \
+    maybe-install-strip-isl \
+    maybe-install-strip-libelf \
+    maybe-install-strip-gold \
+    maybe-install-strip-gprof \
+    maybe-install-strip-intl \
+    maybe-install-strip-tcl \
+    maybe-install-strip-itcl \
+    maybe-install-strip-ld \
+    maybe-install-strip-libbacktrace \
+    maybe-install-strip-libcpp \
+    maybe-install-strip-libdecnumber \
+    maybe-install-strip-libgui \
+    maybe-install-strip-libiberty \
+    maybe-install-strip-libiberty-linker-plugin \
+    maybe-install-strip-libiconv \
+    maybe-install-strip-m4 \
+    maybe-install-strip-readline \
+    maybe-install-strip-sid \
+    maybe-install-strip-sim \
+    maybe-install-strip-texinfo \
+    maybe-install-strip-zlib \
+    maybe-install-strip-gnulib \
+    maybe-install-strip-gdbsupport \
+    maybe-install-strip-gdbserver \
+    maybe-install-strip-gdb \
+    maybe-install-strip-expect \
+    maybe-install-strip-guile \
+    maybe-install-strip-tk \
+    maybe-install-strip-libtermcap \
+    maybe-install-strip-utils \
+    maybe-install-strip-gnattools \
+    maybe-install-strip-lto-plugin \
+    maybe-install-strip-libcc1 \
+    maybe-install-strip-gotools \
+    maybe-install-strip-libctf
+
+.PHONY: install-strip-target
+install-strip-target:  \
+    maybe-install-strip-target-libstdc++-v3 \
+    maybe-install-strip-target-libsanitizer \
+    maybe-install-strip-target-libmpx \
+    maybe-install-strip-target-libvtv \
+    maybe-install-strip-target-libcilkrts \
+    maybe-install-strip-target-liboffloadmic \
+    maybe-install-strip-target-libssp \
+    maybe-install-strip-target-newlib \
+    maybe-install-strip-target-libgcc \
+    maybe-install-strip-target-libbacktrace \
+    maybe-install-strip-target-libquadmath \
+    maybe-install-strip-target-libgfortran \
+    maybe-install-strip-target-libobjc \
+    maybe-install-strip-target-libgo \
+    maybe-install-strip-target-libtermcap \
+    maybe-install-strip-target-winsup \
+    maybe-install-strip-target-libgloss \
+    maybe-install-strip-target-libffi \
+    maybe-install-strip-target-zlib \
+    maybe-install-strip-target-rda \
+    maybe-install-strip-target-libada \
+    maybe-install-strip-target-libgomp \
+    maybe-install-strip-target-libitm \
+    maybe-install-strip-target-libatomic
+
 
 ### other supporting targets
 
@@ -2705,10 +2772,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:
@@ -2750,8 +2817,8 @@ 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 ; \
-       $(BUILD_EXPORTS) \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libiberty; \
+       $(BUILD_EXPORTS)  \
        echo Configuring in $(BUILD_SUBDIR)/libiberty; \
        cd "$(BUILD_SUBDIR)/libiberty" || exit 1; \
        case $(srcdir) in \
@@ -2759,12 +2826,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
 
@@ -2784,9 +2852,9 @@ all-build-libiberty: configure-build-libiberty
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(BUILD_EXPORTS) \
+       $(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
 
@@ -2806,8 +2874,8 @@ 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 ; \
-       $(BUILD_EXPORTS) \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison; \
+       $(BUILD_EXPORTS)  \
        echo Configuring in $(BUILD_SUBDIR)/bison; \
        cd "$(BUILD_SUBDIR)/bison" || exit 1; \
        case $(srcdir) in \
@@ -2815,12 +2883,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
 
@@ -2840,9 +2909,9 @@ all-build-bison: configure-build-bison
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(BUILD_EXPORTS) \
+       $(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
 
@@ -2850,62 +2919,6 @@ all-build-bison: configure-build-bison
 
 
 
-.PHONY: configure-build-byacc maybe-configure-build-byacc
-maybe-configure-build-byacc:
-@if gcc-bootstrap
-configure-build-byacc: stage_current
-@endif gcc-bootstrap
-@if build-byacc
-maybe-configure-build-byacc: configure-build-byacc
-configure-build-byacc: 
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(BUILD_SUBDIR)/byacc/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/byacc ; \
-       $(BUILD_EXPORTS) \
-       echo Configuring in $(BUILD_SUBDIR)/byacc; \
-       cd "$(BUILD_SUBDIR)/byacc" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(BUILD_SUBDIR)/byacc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/byacc"; \
-       libsrcdir="$$s/byacc"; \
-       rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif build-byacc
-
-
-
-
-
-.PHONY: all-build-byacc maybe-all-build-byacc
-maybe-all-build-byacc:
-@if gcc-bootstrap
-all-build-byacc: stage_current
-@endif gcc-bootstrap
-@if build-byacc
-TARGET-build-byacc=all
-maybe-all-build-byacc: all-build-byacc
-all-build-byacc: configure-build-byacc
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(BUILD_EXPORTS) \
-       (cd $(BUILD_SUBDIR)/byacc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)  \
-               $(TARGET-build-byacc))
-@endif build-byacc
-
-
-
-
-
 .PHONY: configure-build-flex maybe-configure-build-flex
 maybe-configure-build-flex:
 @if gcc-bootstrap
@@ -2918,8 +2931,8 @@ 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 ; \
-       $(BUILD_EXPORTS) \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex; \
+       $(BUILD_EXPORTS)  \
        echo Configuring in $(BUILD_SUBDIR)/flex; \
        cd "$(BUILD_SUBDIR)/flex" || exit 1; \
        case $(srcdir) in \
@@ -2927,12 +2940,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
 
@@ -2952,9 +2966,9 @@ all-build-flex: configure-build-flex
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(BUILD_EXPORTS) \
+       $(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
 
@@ -2974,8 +2988,8 @@ 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 ; \
-       $(BUILD_EXPORTS) \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4; \
+       $(BUILD_EXPORTS)  \
        echo Configuring in $(BUILD_SUBDIR)/m4; \
        cd "$(BUILD_SUBDIR)/m4" || exit 1; \
        case $(srcdir) in \
@@ -2983,12 +2997,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
 
@@ -3008,9 +3023,9 @@ all-build-m4: configure-build-m4
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(BUILD_EXPORTS) \
+       $(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
 
@@ -3030,8 +3045,8 @@ 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 ; \
-       $(BUILD_EXPORTS) \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo; \
+       $(BUILD_EXPORTS)  \
        echo Configuring in $(BUILD_SUBDIR)/texinfo; \
        cd "$(BUILD_SUBDIR)/texinfo" || exit 1; \
        case $(srcdir) in \
@@ -3039,12 +3054,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
 
@@ -3064,9 +3080,9 @@ all-build-texinfo: configure-build-texinfo
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(BUILD_EXPORTS) \
+       $(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
 
@@ -3086,8 +3102,8 @@ 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 ; \
-       $(BUILD_EXPORTS) \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes; \
+       $(BUILD_EXPORTS)  \
        echo Configuring in $(BUILD_SUBDIR)/fixincludes; \
        cd "$(BUILD_SUBDIR)/fixincludes" || exit 1; \
        case $(srcdir) in \
@@ -3095,12 +3111,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
 
@@ -3120,9 +3137,9 @@ all-build-fixincludes: configure-build-fixincludes
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(BUILD_EXPORTS) \
+       $(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
 
@@ -3130,964 +3147,638 @@ all-build-fixincludes: configure-build-fixincludes
 
 
 
-# --------------------------------------
-# Modules which run on the host machine
-# --------------------------------------
-
-
-.PHONY: configure-ash maybe-configure-ash
-maybe-configure-ash:
+.PHONY: configure-build-libcpp maybe-configure-build-libcpp
+maybe-configure-build-libcpp:
 @if gcc-bootstrap
-configure-ash: stage_current
+configure-build-libcpp: stage_current
 @endif gcc-bootstrap
-@if ash
-maybe-configure-ash: configure-ash
-configure-ash: 
+@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 $(HOST_SUBDIR)/ash/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ash ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/ash; \
-       cd "$(HOST_SUBDIR)/ash" || exit 1; \
+       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 $(HOST_SUBDIR)/ash/ | \
+         *) topdir=`echo $(BUILD_SUBDIR)/libcpp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ash"; \
-       libsrcdir="$$s/ash"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+       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 ash
+@endif build-libcpp
 
 
 
 
 
-.PHONY: all-ash maybe-all-ash
-maybe-all-ash:
+.PHONY: all-build-libcpp maybe-all-build-libcpp
+maybe-all-build-libcpp:
 @if gcc-bootstrap
-all-ash: stage_current
+all-build-libcpp: stage_current
 @endif gcc-bootstrap
-@if ash
-TARGET-ash=all
-maybe-all-ash: all-ash
-all-ash: configure-ash
+@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; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-ash))
-@endif ash
+       $(BUILD_EXPORTS)  \
+       (cd $(BUILD_SUBDIR)/libcpp && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)   \
+               $(TARGET-build-libcpp))
+@endif build-libcpp
 
 
 
 
-.PHONY: check-ash maybe-check-ash
-maybe-check-ash:
-@if ash
-maybe-check-ash: check-ash
 
-check-ash:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif ash
+# --------------------------------------
+# Modules which run on the host machine
+# --------------------------------------
 
-.PHONY: install-ash maybe-install-ash
-maybe-install-ash:
-@if ash
-maybe-install-ash: install-ash
 
-install-ash: installdirs
-       @: $(MAKE); $(unstage)
+.PHONY: configure-bfd maybe-configure-bfd
+maybe-configure-bfd:
+@if gcc-bootstrap
+configure-bfd: stage_current
+@endif gcc-bootstrap
+@if bfd
+maybe-configure-bfd: configure-bfd
+configure-bfd: 
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif ash
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-ash info-ash
-maybe-info-ash:
-@if ash
-maybe-info-ash: info-ash
-
-info-ash: \
-    configure-ash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 ash" ; \
-       (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(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 ash
-
-.PHONY: maybe-dvi-ash dvi-ash
-maybe-dvi-ash:
-@if ash
-maybe-dvi-ash: dvi-ash
-
-dvi-ash: \
-    configure-ash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 ash" ; \
-       (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(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 ash
-
-.PHONY: maybe-pdf-ash pdf-ash
-maybe-pdf-ash:
-@if ash
-maybe-pdf-ash: pdf-ash
-
-pdf-ash: \
-    configure-ash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 ash" ; \
-       (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(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 ash
-
-.PHONY: maybe-html-ash html-ash
-maybe-html-ash:
-@if ash
-maybe-html-ash: html-ash
-
-html-ash: \
-    configure-ash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 ash" ; \
-       (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(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 ash
-
-.PHONY: maybe-TAGS-ash TAGS-ash
-maybe-TAGS-ash:
-@if ash
-maybe-TAGS-ash: TAGS-ash
-
-TAGS-ash: \
-    configure-ash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 ash" ; \
-       (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(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 ash
-
-.PHONY: maybe-install-info-ash install-info-ash
-maybe-install-info-ash:
-@if ash
-maybe-install-info-ash: install-info-ash
-
-install-info-ash: \
-    configure-ash \
-    info-ash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 ash" ; \
-       (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(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 ash
-
-.PHONY: maybe-install-pdf-ash install-pdf-ash
-maybe-install-pdf-ash:
-@if ash
-maybe-install-pdf-ash: install-pdf-ash
-
-install-pdf-ash: \
-    configure-ash \
-    pdf-ash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 ash" ; \
-       (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(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 ash
-
-.PHONY: maybe-install-html-ash install-html-ash
-maybe-install-html-ash:
-@if ash
-maybe-install-html-ash: install-html-ash
-
-install-html-ash: \
-    configure-ash \
-    html-ash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 ash" ; \
-       (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(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) \
+       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(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; \
+       module_srcdir=bfd; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias}  \
          || exit 1
+@endif bfd
 
-@endif ash
 
-.PHONY: maybe-installcheck-ash installcheck-ash
-maybe-installcheck-ash:
-@if ash
-maybe-installcheck-ash: installcheck-ash
 
-installcheck-ash: \
-    configure-ash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: configure-stage1-bfd maybe-configure-stage1-bfd
+maybe-configure-stage1-bfd:
+@if bfd-bootstrap
+maybe-configure-stage1-bfd: configure-stage1-bfd
+configure-stage1-bfd:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing installcheck in ash" ; \
-       (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(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 ash
-
-.PHONY: maybe-mostlyclean-ash mostlyclean-ash
-maybe-mostlyclean-ash:
-@if ash
-maybe-mostlyclean-ash: mostlyclean-ash
+       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; \
+       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; \
+       module_srcdir=bfd; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif bfd-bootstrap
 
-mostlyclean-ash: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: configure-stage2-bfd maybe-configure-stage2-bfd
+maybe-configure-stage2-bfd:
+@if bfd-bootstrap
+maybe-configure-stage2-bfd: configure-stage2-bfd
+configure-stage2-bfd:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing mostlyclean in ash" ; \
-       (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(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 ash
-
-.PHONY: maybe-clean-ash clean-ash
-maybe-clean-ash:
-@if ash
-maybe-clean-ash: clean-ash
+       $(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)/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; \
+       module_srcdir=bfd; \
+       $(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 bfd-bootstrap
 
-clean-ash: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: configure-stage3-bfd maybe-configure-stage3-bfd
+maybe-configure-stage3-bfd:
+@if bfd-bootstrap
+maybe-configure-stage3-bfd: configure-stage3-bfd
+configure-stage3-bfd:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing clean in ash" ; \
-       (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(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 ash
-
-.PHONY: maybe-distclean-ash distclean-ash
-maybe-distclean-ash:
-@if ash
-maybe-distclean-ash: distclean-ash
+       $(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)/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; \
+       module_srcdir=bfd; \
+       $(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 bfd-bootstrap
 
-distclean-ash: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: configure-stage4-bfd maybe-configure-stage4-bfd
+maybe-configure-stage4-bfd:
+@if bfd-bootstrap
+maybe-configure-stage4-bfd: configure-stage4-bfd
+configure-stage4-bfd:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing distclean in ash" ; \
-       (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(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 ash
-
-.PHONY: maybe-maintainer-clean-ash maintainer-clean-ash
-maybe-maintainer-clean-ash:
-@if ash
-maybe-maintainer-clean-ash: maintainer-clean-ash
+       $(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)/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; \
+       module_srcdir=bfd; \
+       $(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 bfd-bootstrap
 
-maintainer-clean-ash: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: configure-stageprofile-bfd maybe-configure-stageprofile-bfd
+maybe-configure-stageprofile-bfd:
+@if bfd-bootstrap
+maybe-configure-stageprofile-bfd: configure-stageprofile-bfd
+configure-stageprofile-bfd:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing maintainer-clean in ash" ; \
-       (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(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 ash
-
-
+       $(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)/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; \
+       module_srcdir=bfd; \
+       $(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 bfd-bootstrap
 
-.PHONY: configure-autoconf maybe-configure-autoconf
-maybe-configure-autoconf:
-@if gcc-bootstrap
-configure-autoconf: stage_current
-@endif gcc-bootstrap
-@if autoconf
-maybe-configure-autoconf: configure-autoconf
-configure-autoconf: 
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stagefeedback-bfd maybe-configure-stagefeedback-bfd
+maybe-configure-stagefeedback-bfd:
+@if bfd-bootstrap
+maybe-configure-stagefeedback-bfd: configure-stagefeedback-bfd
+configure-stagefeedback-bfd:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/autoconf/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/autoconf ; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/autoconf; \
-       cd "$(HOST_SUBDIR)/autoconf" || exit 1; \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/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)/autoconf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/autoconf"; \
-       libsrcdir="$$s/autoconf"; \
-       $(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}  \
-         || exit 1
-@endif autoconf
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif bfd-bootstrap
 
 
 
 
 
-.PHONY: all-autoconf maybe-all-autoconf
-maybe-all-autoconf:
+.PHONY: all-bfd maybe-all-bfd
+maybe-all-bfd:
 @if gcc-bootstrap
-all-autoconf: stage_current
+all-bfd: stage_current
 @endif gcc-bootstrap
-@if autoconf
-TARGET-autoconf=all
-maybe-all-autoconf: all-autoconf
-all-autoconf: configure-autoconf
-       @: $(MAKE); $(unstage)
+@if bfd
+TARGET-bfd=all
+maybe-all-bfd: all-bfd
+all-bfd: configure-bfd
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/autoconf && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-autoconf))
-@endif autoconf
-
-
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/bfd && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-bfd))
+@endif bfd
 
 
-.PHONY: check-autoconf maybe-check-autoconf
-maybe-check-autoconf:
-@if autoconf
-maybe-check-autoconf: check-autoconf
 
-check-autoconf:
-       @: $(MAKE); $(unstage)
+.PHONY: all-stage1-bfd maybe-all-stage1-bfd
+.PHONY: clean-stage1-bfd maybe-clean-stage1-bfd
+maybe-all-stage1-bfd:
+maybe-clean-stage1-bfd:
+@if bfd-bootstrap
+maybe-all-stage1-bfd: all-stage1-bfd
+all-stage1: all-stage1-bfd
+TARGET-stage1-bfd = $(TARGET-bfd)
+all-stage1-bfd: configure-stage1-bfd
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/autoconf && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif autoconf
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/bfd && \
+        \
+       $(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-bfd)
 
-.PHONY: install-autoconf maybe-install-autoconf
-maybe-install-autoconf:
-@if autoconf
-maybe-install-autoconf: install-autoconf
+maybe-clean-stage1-bfd: clean-stage1-bfd
+clean-stage1: clean-stage1-bfd
+clean-stage1-bfd:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-bfd/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif bfd-bootstrap
 
-install-autoconf: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/autoconf && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif autoconf
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-autoconf info-autoconf
-maybe-info-autoconf:
-@if autoconf
-maybe-info-autoconf: info-autoconf
-
-info-autoconf: \
-    configure-autoconf 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
-         $(MAKE) $(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 autoconf
-
-.PHONY: maybe-dvi-autoconf dvi-autoconf
-maybe-dvi-autoconf:
-@if autoconf
-maybe-dvi-autoconf: dvi-autoconf
-
-dvi-autoconf: \
-    configure-autoconf 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
-         $(MAKE) $(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 autoconf
-
-.PHONY: maybe-pdf-autoconf pdf-autoconf
-maybe-pdf-autoconf:
-@if autoconf
-maybe-pdf-autoconf: pdf-autoconf
-
-pdf-autoconf: \
-    configure-autoconf 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
-         $(MAKE) $(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 autoconf
-
-.PHONY: maybe-html-autoconf html-autoconf
-maybe-html-autoconf:
-@if autoconf
-maybe-html-autoconf: html-autoconf
-
-html-autoconf: \
-    configure-autoconf 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
-         $(MAKE) $(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 autoconf
-
-.PHONY: maybe-TAGS-autoconf TAGS-autoconf
-maybe-TAGS-autoconf:
-@if autoconf
-maybe-TAGS-autoconf: TAGS-autoconf
-
-TAGS-autoconf: \
-    configure-autoconf 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
-         $(MAKE) $(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 autoconf
-
-.PHONY: maybe-install-info-autoconf install-info-autoconf
-maybe-install-info-autoconf:
-@if autoconf
-maybe-install-info-autoconf: install-info-autoconf
-
-install-info-autoconf: \
-    configure-autoconf \
-    info-autoconf 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
-         $(MAKE) $(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 autoconf
-
-.PHONY: maybe-install-pdf-autoconf install-pdf-autoconf
-maybe-install-pdf-autoconf:
-@if autoconf
-maybe-install-pdf-autoconf: install-pdf-autoconf
-
-install-pdf-autoconf: \
-    configure-autoconf \
-    pdf-autoconf 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
-         $(MAKE) $(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 autoconf
-
-.PHONY: maybe-install-html-autoconf install-html-autoconf
-maybe-install-html-autoconf:
-@if autoconf
-maybe-install-html-autoconf: install-html-autoconf
-
-install-html-autoconf: \
-    configure-autoconf \
-    html-autoconf 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
-         $(MAKE) $(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 autoconf
-
-.PHONY: maybe-installcheck-autoconf installcheck-autoconf
-maybe-installcheck-autoconf:
-@if autoconf
-maybe-installcheck-autoconf: installcheck-autoconf
-
-installcheck-autoconf: \
-    configure-autoconf 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stage2-bfd maybe-all-stage2-bfd
+.PHONY: clean-stage2-bfd maybe-clean-stage2-bfd
+maybe-all-stage2-bfd:
+maybe-clean-stage2-bfd:
+@if bfd-bootstrap
+maybe-all-stage2-bfd: all-stage2-bfd
+all-stage2: all-stage2-bfd
+TARGET-stage2-bfd = $(TARGET-bfd)
+all-stage2-bfd: configure-stage2-bfd
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing installcheck in autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
-         $(MAKE) $(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
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/bfd && \
+        \
+       $(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-bfd)
 
-@endif autoconf
+maybe-clean-stage2-bfd: clean-stage2-bfd
+clean-stage2: clean-stage2-bfd
+clean-stage2-bfd:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-bfd/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif bfd-bootstrap
 
-.PHONY: maybe-mostlyclean-autoconf mostlyclean-autoconf
-maybe-mostlyclean-autoconf:
-@if autoconf
-maybe-mostlyclean-autoconf: mostlyclean-autoconf
 
-mostlyclean-autoconf: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stage3-bfd maybe-all-stage3-bfd
+.PHONY: clean-stage3-bfd maybe-clean-stage3-bfd
+maybe-all-stage3-bfd:
+maybe-clean-stage3-bfd:
+@if bfd-bootstrap
+maybe-all-stage3-bfd: all-stage3-bfd
+all-stage3: all-stage3-bfd
+TARGET-stage3-bfd = $(TARGET-bfd)
+all-stage3-bfd: configure-stage3-bfd
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing mostlyclean in autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
-         $(MAKE) $(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
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/bfd && \
+        \
+       $(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-bfd)
 
-@endif autoconf
+maybe-clean-stage3-bfd: clean-stage3-bfd
+clean-stage3: clean-stage3-bfd
+clean-stage3-bfd:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-bfd/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif bfd-bootstrap
 
-.PHONY: maybe-clean-autoconf clean-autoconf
-maybe-clean-autoconf:
-@if autoconf
-maybe-clean-autoconf: clean-autoconf
 
-clean-autoconf: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stage4-bfd maybe-all-stage4-bfd
+.PHONY: clean-stage4-bfd maybe-clean-stage4-bfd
+maybe-all-stage4-bfd:
+maybe-clean-stage4-bfd:
+@if bfd-bootstrap
+maybe-all-stage4-bfd: all-stage4-bfd
+all-stage4: all-stage4-bfd
+TARGET-stage4-bfd = $(TARGET-bfd)
+all-stage4-bfd: configure-stage4-bfd
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing clean in autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
-         $(MAKE) $(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
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/bfd && \
+        \
+       $(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-bfd)
 
-@endif autoconf
+maybe-clean-stage4-bfd: clean-stage4-bfd
+clean-stage4: clean-stage4-bfd
+clean-stage4-bfd:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-bfd/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif bfd-bootstrap
 
-.PHONY: maybe-distclean-autoconf distclean-autoconf
-maybe-distclean-autoconf:
-@if autoconf
-maybe-distclean-autoconf: distclean-autoconf
 
-distclean-autoconf: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stageprofile-bfd maybe-all-stageprofile-bfd
+.PHONY: clean-stageprofile-bfd maybe-clean-stageprofile-bfd
+maybe-all-stageprofile-bfd:
+maybe-clean-stageprofile-bfd:
+@if bfd-bootstrap
+maybe-all-stageprofile-bfd: all-stageprofile-bfd
+all-stageprofile: all-stageprofile-bfd
+TARGET-stageprofile-bfd = $(TARGET-bfd)
+all-stageprofile-bfd: configure-stageprofile-bfd
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing distclean in autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
-         $(MAKE) $(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
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/bfd && \
+        \
+       $(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-bfd)
 
-@endif autoconf
+maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
+clean-stageprofile: clean-stageprofile-bfd
+clean-stageprofile-bfd:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-bfd/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif bfd-bootstrap
 
-.PHONY: maybe-maintainer-clean-autoconf maintainer-clean-autoconf
-maybe-maintainer-clean-autoconf:
-@if autoconf
-maybe-maintainer-clean-autoconf: maintainer-clean-autoconf
 
-maintainer-clean-autoconf: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stagefeedback-bfd maybe-all-stagefeedback-bfd
+.PHONY: clean-stagefeedback-bfd maybe-clean-stagefeedback-bfd
+maybe-all-stagefeedback-bfd:
+maybe-clean-stagefeedback-bfd:
+@if bfd-bootstrap
+maybe-all-stagefeedback-bfd: all-stagefeedback-bfd
+all-stagefeedback: all-stagefeedback-bfd
+TARGET-stagefeedback-bfd = $(TARGET-bfd)
+all-stagefeedback-bfd: configure-stagefeedback-bfd
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        $(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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
-         $(MAKE) $(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 autoconf
-
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/bfd && \
+        \
+       $(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-bfd)
 
+maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
+clean-stagefeedback: clean-stagefeedback-bfd
+clean-stagefeedback-bfd:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-bfd/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/bfd && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif bfd-bootstrap
 
-.PHONY: configure-automake maybe-configure-automake
-maybe-configure-automake:
-@if gcc-bootstrap
-configure-automake: stage_current
-@endif gcc-bootstrap
-@if automake
-maybe-configure-automake: configure-automake
-configure-automake: 
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/automake/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/automake ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/automake; \
-       cd "$(HOST_SUBDIR)/automake" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/automake/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/automake"; \
-       libsrcdir="$$s/automake"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif automake
 
 
 
 
+.PHONY: check-bfd maybe-check-bfd
+maybe-check-bfd:
+@if bfd
+maybe-check-bfd: check-bfd
 
-.PHONY: all-automake maybe-all-automake
-maybe-all-automake:
-@if gcc-bootstrap
-all-automake: stage_current
-@endif gcc-bootstrap
-@if automake
-TARGET-automake=all
-maybe-all-automake: all-automake
-all-automake: configure-automake
+check-bfd:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/automake && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-automake))
-@endif automake
-
-
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/bfd && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
+@endif bfd
 
-.PHONY: check-automake maybe-check-automake
-maybe-check-automake:
-@if automake
-maybe-check-automake: check-automake
+.PHONY: install-bfd maybe-install-bfd
+maybe-install-bfd:
+@if bfd
+maybe-install-bfd: install-bfd
 
-check-automake:
+install-bfd: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/automake && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       (cd $(HOST_SUBDIR)/bfd && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif automake
+@endif bfd
 
-.PHONY: install-automake maybe-install-automake
-maybe-install-automake:
-@if automake
-maybe-install-automake: install-automake
+.PHONY: install-strip-bfd maybe-install-strip-bfd
+maybe-install-strip-bfd:
+@if bfd
+maybe-install-strip-bfd: install-strip-bfd
 
-install-automake: installdirs
+install-strip-bfd: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/automake && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+       (cd $(HOST_SUBDIR)/bfd && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif automake
+@endif bfd
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-automake info-automake
-maybe-info-automake:
-@if automake
-maybe-info-automake: info-automake
+.PHONY: maybe-info-bfd info-bfd
+maybe-info-bfd:
+@if bfd
+maybe-info-bfd: info-bfd
 
-info-automake: \
-    configure-automake 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/Makefile ] || exit 0; \
+info-bfd: \
+    configure-bfd 
+       @[ -f ./bfd/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4095,25 +3786,24 @@ info-automake: \
                  info) \
          || exit 1
 
-@endif automake
+@endif bfd
 
-.PHONY: maybe-dvi-automake dvi-automake
-maybe-dvi-automake:
-@if automake
-maybe-dvi-automake: dvi-automake
+.PHONY: maybe-dvi-bfd dvi-bfd
+maybe-dvi-bfd:
+@if bfd
+maybe-dvi-bfd: dvi-bfd
 
-dvi-automake: \
-    configure-automake 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/Makefile ] || exit 0; \
+dvi-bfd: \
+    configure-bfd 
+       @[ -f ./bfd/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4121,25 +3811,24 @@ dvi-automake: \
                  dvi) \
          || exit 1
 
-@endif automake
+@endif bfd
 
-.PHONY: maybe-pdf-automake pdf-automake
-maybe-pdf-automake:
-@if automake
-maybe-pdf-automake: pdf-automake
+.PHONY: maybe-pdf-bfd pdf-bfd
+maybe-pdf-bfd:
+@if bfd
+maybe-pdf-bfd: pdf-bfd
 
-pdf-automake: \
-    configure-automake 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/Makefile ] || exit 0; \
+pdf-bfd: \
+    configure-bfd 
+       @[ -f ./bfd/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4147,25 +3836,24 @@ pdf-automake: \
                  pdf) \
          || exit 1
 
-@endif automake
+@endif bfd
 
-.PHONY: maybe-html-automake html-automake
-maybe-html-automake:
-@if automake
-maybe-html-automake: html-automake
+.PHONY: maybe-html-bfd html-bfd
+maybe-html-bfd:
+@if bfd
+maybe-html-bfd: html-bfd
 
-html-automake: \
-    configure-automake 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/Makefile ] || exit 0; \
+html-bfd: \
+    configure-bfd 
+       @[ -f ./bfd/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4173,25 +3861,24 @@ html-automake: \
                  html) \
          || exit 1
 
-@endif automake
+@endif bfd
 
-.PHONY: maybe-TAGS-automake TAGS-automake
-maybe-TAGS-automake:
-@if automake
-maybe-TAGS-automake: TAGS-automake
+.PHONY: maybe-TAGS-bfd TAGS-bfd
+maybe-TAGS-bfd:
+@if bfd
+maybe-TAGS-bfd: TAGS-bfd
 
-TAGS-automake: \
-    configure-automake 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/Makefile ] || exit 0; \
+TAGS-bfd: \
+    configure-bfd 
+       @[ -f ./bfd/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4199,26 +3886,25 @@ TAGS-automake: \
                  TAGS) \
          || exit 1
 
-@endif automake
+@endif bfd
 
-.PHONY: maybe-install-info-automake install-info-automake
-maybe-install-info-automake:
-@if automake
-maybe-install-info-automake: install-info-automake
+.PHONY: maybe-install-info-bfd install-info-bfd
+maybe-install-info-bfd:
+@if bfd
+maybe-install-info-bfd: install-info-bfd
 
-install-info-automake: \
-    configure-automake \
-    info-automake 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/Makefile ] || exit 0; \
+install-info-bfd: \
+    configure-bfd \
+    info-bfd 
+       @[ -f ./bfd/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4226,26 +3912,25 @@ install-info-automake: \
                  install-info) \
          || exit 1
 
-@endif automake
+@endif bfd
 
-.PHONY: maybe-install-pdf-automake install-pdf-automake
-maybe-install-pdf-automake:
-@if automake
-maybe-install-pdf-automake: install-pdf-automake
+.PHONY: maybe-install-pdf-bfd install-pdf-bfd
+maybe-install-pdf-bfd:
+@if bfd
+maybe-install-pdf-bfd: install-pdf-bfd
 
-install-pdf-automake: \
-    configure-automake \
-    pdf-automake 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/Makefile ] || exit 0; \
+install-pdf-bfd: \
+    configure-bfd \
+    pdf-bfd 
+       @[ -f ./bfd/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4253,26 +3938,25 @@ install-pdf-automake: \
                  install-pdf) \
          || exit 1
 
-@endif automake
+@endif bfd
 
-.PHONY: maybe-install-html-automake install-html-automake
-maybe-install-html-automake:
-@if automake
-maybe-install-html-automake: install-html-automake
+.PHONY: maybe-install-html-bfd install-html-bfd
+maybe-install-html-bfd:
+@if bfd
+maybe-install-html-bfd: install-html-bfd
 
-install-html-automake: \
-    configure-automake \
-    html-automake 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/Makefile ] || exit 0; \
+install-html-bfd: \
+    configure-bfd \
+    html-bfd 
+       @[ -f ./bfd/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4280,25 +3964,24 @@ install-html-automake: \
                  install-html) \
          || exit 1
 
-@endif automake
+@endif bfd
 
-.PHONY: maybe-installcheck-automake installcheck-automake
-maybe-installcheck-automake:
-@if automake
-maybe-installcheck-automake: installcheck-automake
+.PHONY: maybe-installcheck-bfd installcheck-bfd
+maybe-installcheck-bfd:
+@if bfd
+maybe-installcheck-bfd: installcheck-bfd
 
-installcheck-automake: \
-    configure-automake 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/Makefile ] || exit 0; \
+installcheck-bfd: \
+    configure-bfd 
+       @[ -f ./bfd/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4306,24 +3989,23 @@ installcheck-automake: \
                  installcheck) \
          || exit 1
 
-@endif automake
+@endif bfd
 
-.PHONY: maybe-mostlyclean-automake mostlyclean-automake
-maybe-mostlyclean-automake:
-@if automake
-maybe-mostlyclean-automake: mostlyclean-automake
+.PHONY: maybe-mostlyclean-bfd mostlyclean-bfd
+maybe-mostlyclean-bfd:
+@if bfd
+maybe-mostlyclean-bfd: mostlyclean-bfd
 
-mostlyclean-automake: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/Makefile ] || exit 0; \
+mostlyclean-bfd: 
+       @[ -f ./bfd/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4331,24 +4013,23 @@ mostlyclean-automake:
                  mostlyclean) \
          || exit 1
 
-@endif automake
+@endif bfd
 
-.PHONY: maybe-clean-automake clean-automake
-maybe-clean-automake:
-@if automake
-maybe-clean-automake: clean-automake
+.PHONY: maybe-clean-bfd clean-bfd
+maybe-clean-bfd:
+@if bfd
+maybe-clean-bfd: clean-bfd
 
-clean-automake: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/Makefile ] || exit 0; \
+clean-bfd: 
+       @[ -f ./bfd/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4356,24 +4037,23 @@ clean-automake:
                  clean) \
          || exit 1
 
-@endif automake
+@endif bfd
 
-.PHONY: maybe-distclean-automake distclean-automake
-maybe-distclean-automake:
-@if automake
-maybe-distclean-automake: distclean-automake
+.PHONY: maybe-distclean-bfd distclean-bfd
+maybe-distclean-bfd:
+@if bfd
+maybe-distclean-bfd: distclean-bfd
 
-distclean-automake: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/Makefile ] || exit 0; \
+distclean-bfd: 
+       @[ -f ./bfd/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4381,24 +4061,23 @@ distclean-automake:
                  distclean) \
          || exit 1
 
-@endif automake
+@endif bfd
 
-.PHONY: maybe-maintainer-clean-automake maintainer-clean-automake
-maybe-maintainer-clean-automake:
-@if automake
-maybe-maintainer-clean-automake: maintainer-clean-automake
+.PHONY: maybe-maintainer-clean-bfd maintainer-clean-bfd
+maybe-maintainer-clean-bfd:
+@if bfd
+maybe-maintainer-clean-bfd: maintainer-clean-bfd
 
-maintainer-clean-automake: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/Makefile ] || exit 0; \
+maintainer-clean-bfd: 
+       @[ -f ./bfd/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4406,113 +4085,580 @@ maintainer-clean-automake:
                  maintainer-clean) \
          || exit 1
 
-@endif automake
+@endif bfd
 
 
 
-.PHONY: configure-bash maybe-configure-bash
-maybe-configure-bash:
+.PHONY: configure-opcodes maybe-configure-opcodes
+maybe-configure-opcodes:
 @if gcc-bootstrap
-configure-bash: stage_current
+configure-opcodes: stage_current
 @endif gcc-bootstrap
-@if bash
-maybe-configure-bash: configure-bash
-configure-bash: 
-       @: $(MAKE); $(unstage)
+@if opcodes
+maybe-configure-opcodes: configure-opcodes
+configure-opcodes: 
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/bash/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bash ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/bash; \
-       cd "$(HOST_SUBDIR)/bash" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/opcodes; \
+       cd "$(HOST_SUBDIR)/opcodes" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/bash/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bash"; \
-       libsrcdir="$$s/bash"; \
-       $(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 bash
-
-
+@endif opcodes
 
 
 
-.PHONY: all-bash maybe-all-bash
-maybe-all-bash:
-@if gcc-bootstrap
-all-bash: stage_current
-@endif gcc-bootstrap
-@if bash
-TARGET-bash=all
-maybe-all-bash: all-bash
-all-bash: configure-bash
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+.PHONY: configure-stage1-opcodes maybe-configure-stage1-opcodes
+maybe-configure-stage1-opcodes:
+@if opcodes-bootstrap
+maybe-configure-stage1-opcodes: configure-stage1-opcodes
+configure-stage1-opcodes:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/bash && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-bash))
-@endif bash
+       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; \
+       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; \
+       module_srcdir=opcodes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif opcodes-bootstrap
 
+.PHONY: configure-stage2-opcodes maybe-configure-stage2-opcodes
+maybe-configure-stage2-opcodes:
+@if opcodes-bootstrap
+maybe-configure-stage2-opcodes: configure-stage2-opcodes
+configure-stage2-opcodes:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/opcodes/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)/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; \
+       module_srcdir=opcodes; \
+       $(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 opcodes-bootstrap
 
+.PHONY: configure-stage3-opcodes maybe-configure-stage3-opcodes
+maybe-configure-stage3-opcodes:
+@if opcodes-bootstrap
+maybe-configure-stage3-opcodes: configure-stage3-opcodes
+configure-stage3-opcodes:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/opcodes/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)/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; \
+       module_srcdir=opcodes; \
+       $(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 opcodes-bootstrap
 
+.PHONY: configure-stage4-opcodes maybe-configure-stage4-opcodes
+maybe-configure-stage4-opcodes:
+@if opcodes-bootstrap
+maybe-configure-stage4-opcodes: configure-stage4-opcodes
+configure-stage4-opcodes:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/opcodes/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)/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; \
+       module_srcdir=opcodes; \
+       $(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 opcodes-bootstrap
 
-.PHONY: check-bash maybe-check-bash
-maybe-check-bash:
-@if bash
-maybe-check-bash: check-bash
+.PHONY: configure-stageprofile-opcodes maybe-configure-stageprofile-opcodes
+maybe-configure-stageprofile-opcodes:
+@if opcodes-bootstrap
+maybe-configure-stageprofile-opcodes: configure-stageprofile-opcodes
+configure-stageprofile-opcodes:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/opcodes/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)/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; \
+       module_srcdir=opcodes; \
+       $(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 opcodes-bootstrap
 
-check-bash:
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stagefeedback-opcodes maybe-configure-stagefeedback-opcodes
+maybe-configure-stagefeedback-opcodes:
+@if opcodes-bootstrap
+maybe-configure-stagefeedback-opcodes: configure-stagefeedback-opcodes
+configure-stagefeedback-opcodes:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/bash && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       $(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)/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; \
+       module_srcdir=opcodes; \
+       $(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 opcodes-bootstrap
+
+
+
+
+
+.PHONY: all-opcodes maybe-all-opcodes
+maybe-all-opcodes:
+@if gcc-bootstrap
+all-opcodes: stage_current
+@endif gcc-bootstrap
+@if opcodes
+TARGET-opcodes=all
+maybe-all-opcodes: all-opcodes
+all-opcodes: configure-opcodes
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/opcodes && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-opcodes))
+@endif opcodes
+
+
+
+.PHONY: all-stage1-opcodes maybe-all-stage1-opcodes
+.PHONY: clean-stage1-opcodes maybe-clean-stage1-opcodes
+maybe-all-stage1-opcodes:
+maybe-clean-stage1-opcodes:
+@if opcodes-bootstrap
+maybe-all-stage1-opcodes: all-stage1-opcodes
+all-stage1: all-stage1-opcodes
+TARGET-stage1-opcodes = $(TARGET-opcodes)
+all-stage1-opcodes: configure-stage1-opcodes
+       @[ $(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)/opcodes && \
+        \
+       $(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-opcodes)
+
+maybe-clean-stage1-opcodes: clean-stage1-opcodes
+clean-stage1: clean-stage1-opcodes
+clean-stage1-opcodes:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-opcodes/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: all-stage2-opcodes maybe-all-stage2-opcodes
+.PHONY: clean-stage2-opcodes maybe-clean-stage2-opcodes
+maybe-all-stage2-opcodes:
+maybe-clean-stage2-opcodes:
+@if opcodes-bootstrap
+maybe-all-stage2-opcodes: all-stage2-opcodes
+all-stage2: all-stage2-opcodes
+TARGET-stage2-opcodes = $(TARGET-opcodes)
+all-stage2-opcodes: configure-stage2-opcodes
+       @[ $(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)/opcodes && \
+        \
+       $(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-opcodes)
+
+maybe-clean-stage2-opcodes: clean-stage2-opcodes
+clean-stage2: clean-stage2-opcodes
+clean-stage2-opcodes:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-opcodes/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: all-stage3-opcodes maybe-all-stage3-opcodes
+.PHONY: clean-stage3-opcodes maybe-clean-stage3-opcodes
+maybe-all-stage3-opcodes:
+maybe-clean-stage3-opcodes:
+@if opcodes-bootstrap
+maybe-all-stage3-opcodes: all-stage3-opcodes
+all-stage3: all-stage3-opcodes
+TARGET-stage3-opcodes = $(TARGET-opcodes)
+all-stage3-opcodes: configure-stage3-opcodes
+       @[ $(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)/opcodes && \
+        \
+       $(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-opcodes)
+
+maybe-clean-stage3-opcodes: clean-stage3-opcodes
+clean-stage3: clean-stage3-opcodes
+clean-stage3-opcodes:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-opcodes/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: all-stage4-opcodes maybe-all-stage4-opcodes
+.PHONY: clean-stage4-opcodes maybe-clean-stage4-opcodes
+maybe-all-stage4-opcodes:
+maybe-clean-stage4-opcodes:
+@if opcodes-bootstrap
+maybe-all-stage4-opcodes: all-stage4-opcodes
+all-stage4: all-stage4-opcodes
+TARGET-stage4-opcodes = $(TARGET-opcodes)
+all-stage4-opcodes: configure-stage4-opcodes
+       @[ $(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)/opcodes && \
+        \
+       $(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-opcodes)
+
+maybe-clean-stage4-opcodes: clean-stage4-opcodes
+clean-stage4: clean-stage4-opcodes
+clean-stage4-opcodes:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-opcodes/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: all-stageprofile-opcodes maybe-all-stageprofile-opcodes
+.PHONY: clean-stageprofile-opcodes maybe-clean-stageprofile-opcodes
+maybe-all-stageprofile-opcodes:
+maybe-clean-stageprofile-opcodes:
+@if opcodes-bootstrap
+maybe-all-stageprofile-opcodes: all-stageprofile-opcodes
+all-stageprofile: all-stageprofile-opcodes
+TARGET-stageprofile-opcodes = $(TARGET-opcodes)
+all-stageprofile-opcodes: configure-stageprofile-opcodes
+       @[ $(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)/opcodes && \
+        \
+       $(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-opcodes)
+
+maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
+clean-stageprofile: clean-stageprofile-opcodes
+clean-stageprofile-opcodes:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-opcodes/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: all-stagefeedback-opcodes maybe-all-stagefeedback-opcodes
+.PHONY: clean-stagefeedback-opcodes maybe-clean-stagefeedback-opcodes
+maybe-all-stagefeedback-opcodes:
+maybe-clean-stagefeedback-opcodes:
+@if opcodes-bootstrap
+maybe-all-stagefeedback-opcodes: all-stagefeedback-opcodes
+all-stagefeedback: all-stagefeedback-opcodes
+TARGET-stagefeedback-opcodes = $(TARGET-opcodes)
+all-stagefeedback-opcodes: configure-stagefeedback-opcodes
+       @[ $(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)/opcodes && \
+        \
+       $(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-opcodes)
+
+maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
+clean-stagefeedback: clean-stagefeedback-opcodes
+clean-stagefeedback-opcodes:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-opcodes/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/opcodes && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif opcodes-bootstrap
+
+
+
+
+
+.PHONY: check-opcodes maybe-check-opcodes
+maybe-check-opcodes:
+@if opcodes
+maybe-check-opcodes: check-opcodes
+
+check-opcodes:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/opcodes && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
-@endif bash
+@endif opcodes
 
-.PHONY: install-bash maybe-install-bash
-maybe-install-bash:
-@if bash
-maybe-install-bash: install-bash
+.PHONY: install-opcodes maybe-install-opcodes
+maybe-install-opcodes:
+@if opcodes
+maybe-install-opcodes: install-opcodes
 
-install-bash: installdirs
+install-opcodes: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/bash && \
+       (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif bash
+@endif opcodes
+
+.PHONY: install-strip-opcodes maybe-install-strip-opcodes
+maybe-install-strip-opcodes:
+@if opcodes
+maybe-install-strip-opcodes: install-strip-opcodes
+
+install-strip-opcodes: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/opcodes && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif opcodes
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-bash info-bash
-maybe-info-bash:
-@if bash
-maybe-info-bash: info-bash
+.PHONY: maybe-info-opcodes info-opcodes
+maybe-info-opcodes:
+@if opcodes
+maybe-info-opcodes: info-opcodes
 
-info-bash: \
-    configure-bash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
+info-opcodes: \
+    configure-opcodes 
+       @[ -f ./opcodes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bash" ; \
-       (cd $(HOST_SUBDIR)/bash && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4520,25 +4666,24 @@ info-bash: \
                  info) \
          || exit 1
 
-@endif bash
+@endif opcodes
 
-.PHONY: maybe-dvi-bash dvi-bash
-maybe-dvi-bash:
-@if bash
-maybe-dvi-bash: dvi-bash
+.PHONY: maybe-dvi-opcodes dvi-opcodes
+maybe-dvi-opcodes:
+@if opcodes
+maybe-dvi-opcodes: dvi-opcodes
 
-dvi-bash: \
-    configure-bash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
+dvi-opcodes: \
+    configure-opcodes 
+       @[ -f ./opcodes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bash" ; \
-       (cd $(HOST_SUBDIR)/bash && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4546,25 +4691,24 @@ dvi-bash: \
                  dvi) \
          || exit 1
 
-@endif bash
+@endif opcodes
 
-.PHONY: maybe-pdf-bash pdf-bash
-maybe-pdf-bash:
-@if bash
-maybe-pdf-bash: pdf-bash
+.PHONY: maybe-pdf-opcodes pdf-opcodes
+maybe-pdf-opcodes:
+@if opcodes
+maybe-pdf-opcodes: pdf-opcodes
 
-pdf-bash: \
-    configure-bash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
+pdf-opcodes: \
+    configure-opcodes 
+       @[ -f ./opcodes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bash" ; \
-       (cd $(HOST_SUBDIR)/bash && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4572,25 +4716,24 @@ pdf-bash: \
                  pdf) \
          || exit 1
 
-@endif bash
+@endif opcodes
 
-.PHONY: maybe-html-bash html-bash
-maybe-html-bash:
-@if bash
-maybe-html-bash: html-bash
+.PHONY: maybe-html-opcodes html-opcodes
+maybe-html-opcodes:
+@if opcodes
+maybe-html-opcodes: html-opcodes
 
-html-bash: \
-    configure-bash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
+html-opcodes: \
+    configure-opcodes 
+       @[ -f ./opcodes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bash" ; \
-       (cd $(HOST_SUBDIR)/bash && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4598,25 +4741,24 @@ html-bash: \
                  html) \
          || exit 1
 
-@endif bash
+@endif opcodes
 
-.PHONY: maybe-TAGS-bash TAGS-bash
-maybe-TAGS-bash:
-@if bash
-maybe-TAGS-bash: TAGS-bash
+.PHONY: maybe-TAGS-opcodes TAGS-opcodes
+maybe-TAGS-opcodes:
+@if opcodes
+maybe-TAGS-opcodes: TAGS-opcodes
 
-TAGS-bash: \
-    configure-bash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
+TAGS-opcodes: \
+    configure-opcodes 
+       @[ -f ./opcodes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bash" ; \
-       (cd $(HOST_SUBDIR)/bash && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4624,26 +4766,25 @@ TAGS-bash: \
                  TAGS) \
          || exit 1
 
-@endif bash
+@endif opcodes
 
-.PHONY: maybe-install-info-bash install-info-bash
-maybe-install-info-bash:
-@if bash
-maybe-install-info-bash: install-info-bash
+.PHONY: maybe-install-info-opcodes install-info-opcodes
+maybe-install-info-opcodes:
+@if opcodes
+maybe-install-info-opcodes: install-info-opcodes
 
-install-info-bash: \
-    configure-bash \
-    info-bash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
+install-info-opcodes: \
+    configure-opcodes \
+    info-opcodes 
+       @[ -f ./opcodes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bash" ; \
-       (cd $(HOST_SUBDIR)/bash && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4651,26 +4792,25 @@ install-info-bash: \
                  install-info) \
          || exit 1
 
-@endif bash
+@endif opcodes
 
-.PHONY: maybe-install-pdf-bash install-pdf-bash
-maybe-install-pdf-bash:
-@if bash
-maybe-install-pdf-bash: install-pdf-bash
+.PHONY: maybe-install-pdf-opcodes install-pdf-opcodes
+maybe-install-pdf-opcodes:
+@if opcodes
+maybe-install-pdf-opcodes: install-pdf-opcodes
 
-install-pdf-bash: \
-    configure-bash \
-    pdf-bash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
+install-pdf-opcodes: \
+    configure-opcodes \
+    pdf-opcodes 
+       @[ -f ./opcodes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bash" ; \
-       (cd $(HOST_SUBDIR)/bash && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4678,26 +4818,25 @@ install-pdf-bash: \
                  install-pdf) \
          || exit 1
 
-@endif bash
+@endif opcodes
 
-.PHONY: maybe-install-html-bash install-html-bash
-maybe-install-html-bash:
-@if bash
-maybe-install-html-bash: install-html-bash
+.PHONY: maybe-install-html-opcodes install-html-opcodes
+maybe-install-html-opcodes:
+@if opcodes
+maybe-install-html-opcodes: install-html-opcodes
 
-install-html-bash: \
-    configure-bash \
-    html-bash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
+install-html-opcodes: \
+    configure-opcodes \
+    html-opcodes 
+       @[ -f ./opcodes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bash" ; \
-       (cd $(HOST_SUBDIR)/bash && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4705,25 +4844,24 @@ install-html-bash: \
                  install-html) \
          || exit 1
 
-@endif bash
+@endif opcodes
 
-.PHONY: maybe-installcheck-bash installcheck-bash
-maybe-installcheck-bash:
-@if bash
-maybe-installcheck-bash: installcheck-bash
+.PHONY: maybe-installcheck-opcodes installcheck-opcodes
+maybe-installcheck-opcodes:
+@if opcodes
+maybe-installcheck-opcodes: installcheck-opcodes
 
-installcheck-bash: \
-    configure-bash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
+installcheck-opcodes: \
+    configure-opcodes 
+       @[ -f ./opcodes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bash" ; \
-       (cd $(HOST_SUBDIR)/bash && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4731,24 +4869,23 @@ installcheck-bash: \
                  installcheck) \
          || exit 1
 
-@endif bash
+@endif opcodes
 
-.PHONY: maybe-mostlyclean-bash mostlyclean-bash
-maybe-mostlyclean-bash:
-@if bash
-maybe-mostlyclean-bash: mostlyclean-bash
+.PHONY: maybe-mostlyclean-opcodes mostlyclean-opcodes
+maybe-mostlyclean-opcodes:
+@if opcodes
+maybe-mostlyclean-opcodes: mostlyclean-opcodes
 
-mostlyclean-bash: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
+mostlyclean-opcodes: 
+       @[ -f ./opcodes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bash" ; \
-       (cd $(HOST_SUBDIR)/bash && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4756,24 +4893,23 @@ mostlyclean-bash:
                  mostlyclean) \
          || exit 1
 
-@endif bash
+@endif opcodes
 
-.PHONY: maybe-clean-bash clean-bash
-maybe-clean-bash:
-@if bash
-maybe-clean-bash: clean-bash
+.PHONY: maybe-clean-opcodes clean-opcodes
+maybe-clean-opcodes:
+@if opcodes
+maybe-clean-opcodes: clean-opcodes
 
-clean-bash: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
+clean-opcodes: 
+       @[ -f ./opcodes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bash" ; \
-       (cd $(HOST_SUBDIR)/bash && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4781,24 +4917,23 @@ clean-bash:
                  clean) \
          || exit 1
 
-@endif bash
+@endif opcodes
 
-.PHONY: maybe-distclean-bash distclean-bash
-maybe-distclean-bash:
-@if bash
-maybe-distclean-bash: distclean-bash
+.PHONY: maybe-distclean-opcodes distclean-opcodes
+maybe-distclean-opcodes:
+@if opcodes
+maybe-distclean-opcodes: distclean-opcodes
 
-distclean-bash: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
+distclean-opcodes: 
+       @[ -f ./opcodes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bash" ; \
-       (cd $(HOST_SUBDIR)/bash && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4806,24 +4941,23 @@ distclean-bash:
                  distclean) \
          || exit 1
 
-@endif bash
+@endif opcodes
 
-.PHONY: maybe-maintainer-clean-bash maintainer-clean-bash
-maybe-maintainer-clean-bash:
-@if bash
-maybe-maintainer-clean-bash: maintainer-clean-bash
+.PHONY: maybe-maintainer-clean-opcodes maintainer-clean-opcodes
+maybe-maintainer-clean-opcodes:
+@if opcodes
+maybe-maintainer-clean-opcodes: maintainer-clean-opcodes
 
-maintainer-clean-bash: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
+maintainer-clean-opcodes: 
+       @[ -f ./opcodes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bash" ; \
-       (cd $(HOST_SUBDIR)/bash && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -4831,663 +4965,580 @@ maintainer-clean-bash:
                  maintainer-clean) \
          || exit 1
 
-@endif bash
+@endif opcodes
 
 
 
-.PHONY: configure-bfd maybe-configure-bfd
-maybe-configure-bfd:
+.PHONY: configure-binutils maybe-configure-binutils
+maybe-configure-binutils:
 @if gcc-bootstrap
-configure-bfd: stage_current
+configure-binutils: stage_current
 @endif gcc-bootstrap
-@if bfd
-maybe-configure-bfd: configure-bfd
-configure-bfd: 
+@if binutils
+maybe-configure-binutils: configure-binutils
+configure-binutils: 
        @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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/bfd; \
-       cd "$(HOST_SUBDIR)/bfd" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/binutils; \
+       cd "$(HOST_SUBDIR)/binutils" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(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 bfd
+@endif binutils
 
 
 
-.PHONY: configure-stage1-bfd maybe-configure-stage1-bfd
-maybe-configure-stage1-bfd:
-@if bfd-bootstrap
-maybe-configure-stage1-bfd: configure-stage1-bfd
-configure-stage1-bfd:
+.PHONY: configure-stage1-binutils maybe-configure-stage1-binutils
+maybe-configure-stage1-binutils:
+@if binutils-bootstrap
+maybe-configure-stage1-binutils: configure-stage1-binutils
+configure-stage1-binutils:
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-       $(HOST_EXPORTS)  \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+       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)/bfd/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(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} \
           \
-         --disable-intermodule $(STAGE1_CHECKING)        --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif bfd-bootstrap
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif binutils-bootstrap
 
-.PHONY: configure-stage2-bfd maybe-configure-stage2-bfd
-maybe-configure-stage2-bfd:
-@if bfd-bootstrap
-maybe-configure-stage2-bfd: configure-stage2-bfd
-configure-stage2-bfd:
+.PHONY: configure-stage2-binutils maybe-configure-stage2-binutils
+maybe-configure-stage2-binutils:
+@if binutils-bootstrap
+maybe-configure-stage2-binutils: configure-stage2-binutils
+configure-stage2-binutils:
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif bfd-bootstrap
-
-.PHONY: configure-stageb2g0-bfd maybe-configure-stageb2g0-bfd
-maybe-configure-stageb2g0-bfd:
-@if bfd-bootstrap
-maybe-configure-stageb2g0-bfd: configure-stageb2g0-bfd
-configure-stageb2g0-bfd:
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
-       echo Configuring stage b2g0 in $(HOST_SUBDIR)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+       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)/bfd/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(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_werror_flag@ 
-@endif bfd-bootstrap
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif binutils-bootstrap
 
-.PHONY: configure-stage3-bfd maybe-configure-stage3-bfd
-maybe-configure-stage3-bfd:
-@if bfd-bootstrap
-maybe-configure-stage3-bfd: configure-stage3-bfd
-configure-stage3-bfd:
+.PHONY: configure-stage3-binutils maybe-configure-stage3-binutils
+maybe-configure-stage3-binutils:
+@if binutils-bootstrap
+maybe-configure-stage3-binutils: configure-stage3-binutils
+configure-stage3-binutils:
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif bfd-bootstrap
-
-.PHONY: configure-stageb3g2-bfd maybe-configure-stageb3g2-bfd
-maybe-configure-stageb3g2-bfd:
-@if bfd-bootstrap
-maybe-configure-stageb3g2-bfd: configure-stageb3g2-bfd
-configure-stageb3g2-bfd:
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
-       echo Configuring stage b3g2 in $(HOST_SUBDIR)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+       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)/bfd/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(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_werror_flag@ 
-@endif bfd-bootstrap
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif binutils-bootstrap
 
-.PHONY: configure-stage4-bfd maybe-configure-stage4-bfd
-maybe-configure-stage4-bfd:
-@if bfd-bootstrap
-maybe-configure-stage4-bfd: configure-stage4-bfd
-configure-stage4-bfd:
+.PHONY: configure-stage4-binutils maybe-configure-stage4-binutils
+maybe-configure-stage4-binutils:
+@if binutils-bootstrap
+maybe-configure-stage4-binutils: configure-stage4-binutils
+configure-stage4-binutils:
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+       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)/bfd/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(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_werror_flag@ 
-@endif bfd-bootstrap
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif binutils-bootstrap
 
-.PHONY: configure-stageprofile-bfd maybe-configure-stageprofile-bfd
-maybe-configure-stageprofile-bfd:
-@if bfd-bootstrap
-maybe-configure-stageprofile-bfd: configure-stageprofile-bfd
-configure-stageprofile-bfd:
+.PHONY: configure-stageprofile-binutils maybe-configure-stageprofile-binutils
+maybe-configure-stageprofile-binutils:
+@if binutils-bootstrap
+maybe-configure-stageprofile-binutils: configure-stageprofile-binutils
+configure-stageprofile-binutils:
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       $(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)/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)/bfd/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(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_werror_flag@ 
-@endif bfd-bootstrap
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif binutils-bootstrap
 
-.PHONY: configure-stagefeedback-bfd maybe-configure-stagefeedback-bfd
-maybe-configure-stagefeedback-bfd:
-@if bfd-bootstrap
-maybe-configure-stagefeedback-bfd: configure-stagefeedback-bfd
-configure-stagefeedback-bfd:
+.PHONY: configure-stagefeedback-binutils maybe-configure-stagefeedback-binutils
+maybe-configure-stagefeedback-binutils:
+@if binutils-bootstrap
+maybe-configure-stagefeedback-binutils: configure-stagefeedback-binutils
+configure-stagefeedback-binutils:
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/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)/bfd/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(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_werror_flag@ 
-@endif bfd-bootstrap
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif binutils-bootstrap
 
 
 
 
 
-.PHONY: all-bfd maybe-all-bfd
-maybe-all-bfd:
+.PHONY: all-binutils maybe-all-binutils
+maybe-all-binutils:
 @if gcc-bootstrap
-all-bfd: stage_current
+all-binutils: stage_current
 @endif gcc-bootstrap
-@if bfd
-TARGET-bfd=all
-maybe-all-bfd: all-bfd
-all-bfd: configure-bfd
+@if binutils
+TARGET-binutils=all
+maybe-all-binutils: all-binutils
+all-binutils: configure-binutils
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/bfd && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-bfd))
-@endif bfd
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/binutils && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-binutils))
+@endif binutils
 
 
 
-.PHONY: all-stage1-bfd maybe-all-stage1-bfd
-.PHONY: clean-stage1-bfd maybe-clean-stage1-bfd
-maybe-all-stage1-bfd:
-maybe-clean-stage1-bfd:
-@if bfd-bootstrap
-maybe-all-stage1-bfd: all-stage1-bfd
-all-stage1: all-stage1-bfd
-TARGET-stage1-bfd = $(TARGET-bfd)
-all-stage1-bfd: configure-stage1-bfd
+.PHONY: all-stage1-binutils maybe-all-stage1-binutils
+.PHONY: clean-stage1-binutils maybe-clean-stage1-binutils
+maybe-all-stage1-binutils:
+maybe-clean-stage1-binutils:
+@if binutils-bootstrap
+maybe-all-stage1-binutils: all-stage1-binutils
+all-stage1: all-stage1-binutils
+TARGET-stage1-binutils = $(TARGET-binutils)
+all-stage1-binutils: configure-stage1-binutils
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/bfd && \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/binutils && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-               LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
-               $(TARGET-stage1-bfd)
+               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-binutils)
 
-maybe-clean-stage1-bfd: clean-stage1-bfd
-clean-stage1: clean-stage1-bfd
-clean-stage1-bfd:
+maybe-clean-stage1-binutils: clean-stage1-binutils
+clean-stage1: clean-stage1-binutils
+clean-stage1-binutils:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage1-bfd/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage1-binutils/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(HOST_SUBDIR)/bfd && \
+       cd $(HOST_SUBDIR)/binutils && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
-@endif bfd-bootstrap
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif binutils-bootstrap
 
 
-.PHONY: all-stage2-bfd maybe-all-stage2-bfd
-.PHONY: clean-stage2-bfd maybe-clean-stage2-bfd
-maybe-all-stage2-bfd:
-maybe-clean-stage2-bfd:
-@if bfd-bootstrap
-maybe-all-stage2-bfd: all-stage2-bfd
-all-stage2: all-stage2-bfd
-TARGET-stage2-bfd = $(TARGET-bfd)
-all-stage2-bfd: configure-stage2-bfd
+.PHONY: all-stage2-binutils maybe-all-stage2-binutils
+.PHONY: clean-stage2-binutils maybe-clean-stage2-binutils
+maybe-all-stage2-binutils:
+maybe-clean-stage2-binutils:
+@if binutils-bootstrap
+maybe-all-stage2-binutils: all-stage2-binutils
+all-stage2: all-stage2-binutils
+TARGET-stage2-binutils = $(TARGET-binutils)
+all-stage2-binutils: configure-stage2-binutils
        @[ $(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)/bfd && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/binutils && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage2-bfd)
+               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-binutils)
 
-maybe-clean-stage2-bfd: clean-stage2-bfd
-clean-stage2: clean-stage2-bfd
-clean-stage2-bfd:
+maybe-clean-stage2-binutils: clean-stage2-binutils
+clean-stage2: clean-stage2-binutils
+clean-stage2-binutils:
        @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage2-bfd/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage2-binutils/Makefile ] || exit 0; \
          $(MAKE) stage2-start; \
        fi; \
-       cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif bfd-bootstrap
-
-
-.PHONY: all-stageb2g0-bfd maybe-all-stageb2g0-bfd
-.PHONY: clean-stageb2g0-bfd maybe-clean-stageb2g0-bfd
-maybe-all-stageb2g0-bfd:
-maybe-clean-stageb2g0-bfd:
-@if bfd-bootstrap
-maybe-all-stageb2g0-bfd: all-stageb2g0-bfd
-all-stageb2g0: all-stageb2g0-bfd
-TARGET-stageb2g0-bfd = $(TARGET-bfd)
-all-stageb2g0-bfd: configure-stageb2g0-bfd
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb2g0-bfd)
-
-maybe-clean-stageb2g0-bfd: clean-stageb2g0-bfd
-clean-stageb2g0: clean-stageb2g0-bfd
-clean-stageb2g0-bfd:
-       @if [ $(current_stage) = stageb2g0 ]; then \
-         [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb2g0-bfd/Makefile ] || exit 0; \
-         $(MAKE) stageb2g0-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif bfd-bootstrap
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif binutils-bootstrap
 
 
-.PHONY: all-stage3-bfd maybe-all-stage3-bfd
-.PHONY: clean-stage3-bfd maybe-clean-stage3-bfd
-maybe-all-stage3-bfd:
-maybe-clean-stage3-bfd:
-@if bfd-bootstrap
-maybe-all-stage3-bfd: all-stage3-bfd
-all-stage3: all-stage3-bfd
-TARGET-stage3-bfd = $(TARGET-bfd)
-all-stage3-bfd: configure-stage3-bfd
+.PHONY: all-stage3-binutils maybe-all-stage3-binutils
+.PHONY: clean-stage3-binutils maybe-clean-stage3-binutils
+maybe-all-stage3-binutils:
+maybe-clean-stage3-binutils:
+@if binutils-bootstrap
+maybe-all-stage3-binutils: all-stage3-binutils
+all-stage3: all-stage3-binutils
+TARGET-stage3-binutils = $(TARGET-binutils)
+all-stage3-binutils: configure-stage3-binutils
        @[ $(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)/bfd && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/binutils && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage3-bfd)
+               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-binutils)
 
-maybe-clean-stage3-bfd: clean-stage3-bfd
-clean-stage3: clean-stage3-bfd
-clean-stage3-bfd:
+maybe-clean-stage3-binutils: clean-stage3-binutils
+clean-stage3: clean-stage3-binutils
+clean-stage3-binutils:
        @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage3-bfd/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage3-binutils/Makefile ] || exit 0; \
          $(MAKE) stage3-start; \
        fi; \
-       cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif bfd-bootstrap
-
-
-.PHONY: all-stageb3g2-bfd maybe-all-stageb3g2-bfd
-.PHONY: clean-stageb3g2-bfd maybe-clean-stageb3g2-bfd
-maybe-all-stageb3g2-bfd:
-maybe-clean-stageb3g2-bfd:
-@if bfd-bootstrap
-maybe-all-stageb3g2-bfd: all-stageb3g2-bfd
-all-stageb3g2: all-stageb3g2-bfd
-TARGET-stageb3g2-bfd = $(TARGET-bfd)
-all-stageb3g2-bfd: configure-stageb3g2-bfd
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb3g2-bfd)
-
-maybe-clean-stageb3g2-bfd: clean-stageb3g2-bfd
-clean-stageb3g2: clean-stageb3g2-bfd
-clean-stageb3g2-bfd:
-       @if [ $(current_stage) = stageb3g2 ]; then \
-         [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb3g2-bfd/Makefile ] || exit 0; \
-         $(MAKE) stageb3g2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif bfd-bootstrap
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif binutils-bootstrap
 
 
-.PHONY: all-stage4-bfd maybe-all-stage4-bfd
-.PHONY: clean-stage4-bfd maybe-clean-stage4-bfd
-maybe-all-stage4-bfd:
-maybe-clean-stage4-bfd:
-@if bfd-bootstrap
-maybe-all-stage4-bfd: all-stage4-bfd
-all-stage4: all-stage4-bfd
-TARGET-stage4-bfd = $(TARGET-bfd)
-all-stage4-bfd: configure-stage4-bfd
+.PHONY: all-stage4-binutils maybe-all-stage4-binutils
+.PHONY: clean-stage4-binutils maybe-clean-stage4-binutils
+maybe-all-stage4-binutils:
+maybe-clean-stage4-binutils:
+@if binutils-bootstrap
+maybe-all-stage4-binutils: all-stage4-binutils
+all-stage4: all-stage4-binutils
+TARGET-stage4-binutils = $(TARGET-binutils)
+all-stage4-binutils: configure-stage4-binutils
        @[ $(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)/bfd && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/binutils && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+               CFLAGS="$(STAGE4_CFLAGS)" \
+               CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage4-bfd)
+               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-binutils)
 
-maybe-clean-stage4-bfd: clean-stage4-bfd
-clean-stage4: clean-stage4-bfd
-clean-stage4-bfd:
+maybe-clean-stage4-binutils: clean-stage4-binutils
+clean-stage4: clean-stage4-binutils
+clean-stage4-binutils:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage4-bfd/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage4-binutils/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif bfd-bootstrap
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif binutils-bootstrap
 
 
-.PHONY: all-stageprofile-bfd maybe-all-stageprofile-bfd
-.PHONY: clean-stageprofile-bfd maybe-clean-stageprofile-bfd
-maybe-all-stageprofile-bfd:
-maybe-clean-stageprofile-bfd:
-@if bfd-bootstrap
-maybe-all-stageprofile-bfd: all-stageprofile-bfd
-all-stageprofile: all-stageprofile-bfd
-TARGET-stageprofile-bfd = $(TARGET-bfd)
-all-stageprofile-bfd: configure-stageprofile-bfd
+.PHONY: all-stageprofile-binutils maybe-all-stageprofile-binutils
+.PHONY: clean-stageprofile-binutils maybe-clean-stageprofile-binutils
+maybe-all-stageprofile-binutils:
+maybe-clean-stageprofile-binutils:
+@if binutils-bootstrap
+maybe-all-stageprofile-binutils: all-stageprofile-binutils
+all-stageprofile: all-stageprofile-binutils
+TARGET-stageprofile-binutils = $(TARGET-binutils)
+all-stageprofile-binutils: configure-stageprofile-binutils
        @[ $(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)/bfd && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/binutils && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageprofile-bfd)
+               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-binutils)
 
-maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
-clean-stageprofile: clean-stageprofile-bfd
-clean-stageprofile-bfd:
+maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
+clean-stageprofile: clean-stageprofile-binutils
+clean-stageprofile-binutils:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stageprofile-bfd/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageprofile-binutils/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif bfd-bootstrap
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif binutils-bootstrap
 
 
-.PHONY: all-stagefeedback-bfd maybe-all-stagefeedback-bfd
-.PHONY: clean-stagefeedback-bfd maybe-clean-stagefeedback-bfd
-maybe-all-stagefeedback-bfd:
-maybe-clean-stagefeedback-bfd:
-@if bfd-bootstrap
-maybe-all-stagefeedback-bfd: all-stagefeedback-bfd
-all-stagefeedback: all-stagefeedback-bfd
-TARGET-stagefeedback-bfd = $(TARGET-bfd)
-all-stagefeedback-bfd: configure-stagefeedback-bfd
+.PHONY: all-stagefeedback-binutils maybe-all-stagefeedback-binutils
+.PHONY: clean-stagefeedback-binutils maybe-clean-stagefeedback-binutils
+maybe-all-stagefeedback-binutils:
+maybe-clean-stagefeedback-binutils:
+@if binutils-bootstrap
+maybe-all-stagefeedback-binutils: all-stagefeedback-binutils
+all-stagefeedback: all-stagefeedback-binutils
+TARGET-stagefeedback-binutils = $(TARGET-binutils)
+all-stagefeedback-binutils: configure-stagefeedback-binutils
        @[ $(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)/bfd && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/binutils && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stagefeedback-bfd)
+               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-binutils)
 
-maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
-clean-stagefeedback: clean-stagefeedback-bfd
-clean-stagefeedback-bfd:
+maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
+clean-stagefeedback: clean-stagefeedback-binutils
+clean-stagefeedback-binutils:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-bfd/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stagefeedback-binutils/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       cd $(HOST_SUBDIR)/bfd && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif bfd-bootstrap
+       cd $(HOST_SUBDIR)/binutils && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif binutils-bootstrap
 
 
 
 
 
-.PHONY: check-bfd maybe-check-bfd
-maybe-check-bfd:
-@if bfd
-maybe-check-bfd: check-bfd
+.PHONY: check-binutils maybe-check-binutils
+maybe-check-binutils:
+@if binutils
+maybe-check-binutils: check-binutils
 
-check-bfd:
+check-binutils:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/bfd && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/binutils && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
-@endif bfd
+@endif binutils
 
-.PHONY: install-bfd maybe-install-bfd
-maybe-install-bfd:
-@if bfd
-maybe-install-bfd: install-bfd
+.PHONY: install-binutils maybe-install-binutils
+maybe-install-binutils:
+@if binutils
+maybe-install-binutils: install-binutils
 
-install-bfd: installdirs
+install-binutils: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/bfd && \
+       (cd $(HOST_SUBDIR)/binutils && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif bfd
+@endif binutils
+
+.PHONY: install-strip-binutils maybe-install-strip-binutils
+maybe-install-strip-binutils:
+@if binutils
+maybe-install-strip-binutils: install-strip-binutils
+
+install-strip-binutils: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/binutils && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif binutils
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-bfd info-bfd
-maybe-info-bfd:
-@if bfd
-maybe-info-bfd: info-bfd
+.PHONY: maybe-info-binutils info-binutils
+maybe-info-binutils:
+@if binutils
+maybe-info-binutils: info-binutils
 
-info-bfd: \
-    configure-bfd 
-       @[ -f ./bfd/Makefile ] || exit 0; \
+info-binutils: \
+    configure-binutils 
+       @[ -f ./binutils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bfd" ; \
-       (cd $(HOST_SUBDIR)/bfd && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -5495,24 +5546,24 @@ info-bfd: \
                  info) \
          || exit 1
 
-@endif bfd
+@endif binutils
 
-.PHONY: maybe-dvi-bfd dvi-bfd
-maybe-dvi-bfd:
-@if bfd
-maybe-dvi-bfd: dvi-bfd
+.PHONY: maybe-dvi-binutils dvi-binutils
+maybe-dvi-binutils:
+@if binutils
+maybe-dvi-binutils: dvi-binutils
 
-dvi-bfd: \
-    configure-bfd 
-       @[ -f ./bfd/Makefile ] || exit 0; \
+dvi-binutils: \
+    configure-binutils 
+       @[ -f ./binutils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bfd" ; \
-       (cd $(HOST_SUBDIR)/bfd && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -5520,24 +5571,24 @@ dvi-bfd: \
                  dvi) \
          || exit 1
 
-@endif bfd
+@endif binutils
 
-.PHONY: maybe-pdf-bfd pdf-bfd
-maybe-pdf-bfd:
-@if bfd
-maybe-pdf-bfd: pdf-bfd
+.PHONY: maybe-pdf-binutils pdf-binutils
+maybe-pdf-binutils:
+@if binutils
+maybe-pdf-binutils: pdf-binutils
 
-pdf-bfd: \
-    configure-bfd 
-       @[ -f ./bfd/Makefile ] || exit 0; \
+pdf-binutils: \
+    configure-binutils 
+       @[ -f ./binutils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bfd" ; \
-       (cd $(HOST_SUBDIR)/bfd && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -5545,24 +5596,24 @@ pdf-bfd: \
                  pdf) \
          || exit 1
 
-@endif bfd
+@endif binutils
 
-.PHONY: maybe-html-bfd html-bfd
-maybe-html-bfd:
-@if bfd
-maybe-html-bfd: html-bfd
+.PHONY: maybe-html-binutils html-binutils
+maybe-html-binutils:
+@if binutils
+maybe-html-binutils: html-binutils
 
-html-bfd: \
-    configure-bfd 
-       @[ -f ./bfd/Makefile ] || exit 0; \
+html-binutils: \
+    configure-binutils 
+       @[ -f ./binutils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bfd" ; \
-       (cd $(HOST_SUBDIR)/bfd && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -5570,24 +5621,24 @@ html-bfd: \
                  html) \
          || exit 1
 
-@endif bfd
+@endif binutils
 
-.PHONY: maybe-TAGS-bfd TAGS-bfd
-maybe-TAGS-bfd:
-@if bfd
-maybe-TAGS-bfd: TAGS-bfd
+.PHONY: maybe-TAGS-binutils TAGS-binutils
+maybe-TAGS-binutils:
+@if binutils
+maybe-TAGS-binutils: TAGS-binutils
 
-TAGS-bfd: \
-    configure-bfd 
-       @[ -f ./bfd/Makefile ] || exit 0; \
+TAGS-binutils: \
+    configure-binutils 
+       @[ -f ./binutils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bfd" ; \
-       (cd $(HOST_SUBDIR)/bfd && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -5595,25 +5646,25 @@ TAGS-bfd: \
                  TAGS) \
          || exit 1
 
-@endif bfd
+@endif binutils
 
-.PHONY: maybe-install-info-bfd install-info-bfd
-maybe-install-info-bfd:
-@if bfd
-maybe-install-info-bfd: install-info-bfd
+.PHONY: maybe-install-info-binutils install-info-binutils
+maybe-install-info-binutils:
+@if binutils
+maybe-install-info-binutils: install-info-binutils
 
-install-info-bfd: \
-    configure-bfd \
-    info-bfd 
-       @[ -f ./bfd/Makefile ] || exit 0; \
+install-info-binutils: \
+    configure-binutils \
+    info-binutils 
+       @[ -f ./binutils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bfd" ; \
-       (cd $(HOST_SUBDIR)/bfd && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -5621,25 +5672,25 @@ install-info-bfd: \
                  install-info) \
          || exit 1
 
-@endif bfd
+@endif binutils
 
-.PHONY: maybe-install-pdf-bfd install-pdf-bfd
-maybe-install-pdf-bfd:
-@if bfd
-maybe-install-pdf-bfd: install-pdf-bfd
+.PHONY: maybe-install-pdf-binutils install-pdf-binutils
+maybe-install-pdf-binutils:
+@if binutils
+maybe-install-pdf-binutils: install-pdf-binutils
 
-install-pdf-bfd: \
-    configure-bfd \
-    pdf-bfd 
-       @[ -f ./bfd/Makefile ] || exit 0; \
+install-pdf-binutils: \
+    configure-binutils \
+    pdf-binutils 
+       @[ -f ./binutils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bfd" ; \
-       (cd $(HOST_SUBDIR)/bfd && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -5647,25 +5698,25 @@ install-pdf-bfd: \
                  install-pdf) \
          || exit 1
 
-@endif bfd
+@endif binutils
 
-.PHONY: maybe-install-html-bfd install-html-bfd
-maybe-install-html-bfd:
-@if bfd
-maybe-install-html-bfd: install-html-bfd
+.PHONY: maybe-install-html-binutils install-html-binutils
+maybe-install-html-binutils:
+@if binutils
+maybe-install-html-binutils: install-html-binutils
 
-install-html-bfd: \
-    configure-bfd \
-    html-bfd 
-       @[ -f ./bfd/Makefile ] || exit 0; \
+install-html-binutils: \
+    configure-binutils \
+    html-binutils 
+       @[ -f ./binutils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bfd" ; \
-       (cd $(HOST_SUBDIR)/bfd && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -5673,24 +5724,24 @@ install-html-bfd: \
                  install-html) \
          || exit 1
 
-@endif bfd
+@endif binutils
 
-.PHONY: maybe-installcheck-bfd installcheck-bfd
-maybe-installcheck-bfd:
-@if bfd
-maybe-installcheck-bfd: installcheck-bfd
+.PHONY: maybe-installcheck-binutils installcheck-binutils
+maybe-installcheck-binutils:
+@if binutils
+maybe-installcheck-binutils: installcheck-binutils
 
-installcheck-bfd: \
-    configure-bfd 
-       @[ -f ./bfd/Makefile ] || exit 0; \
+installcheck-binutils: \
+    configure-binutils 
+       @[ -f ./binutils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bfd" ; \
-       (cd $(HOST_SUBDIR)/bfd && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -5698,23 +5749,23 @@ installcheck-bfd: \
                  installcheck) \
          || exit 1
 
-@endif bfd
+@endif binutils
 
-.PHONY: maybe-mostlyclean-bfd mostlyclean-bfd
-maybe-mostlyclean-bfd:
-@if bfd
-maybe-mostlyclean-bfd: mostlyclean-bfd
+.PHONY: maybe-mostlyclean-binutils mostlyclean-binutils
+maybe-mostlyclean-binutils:
+@if binutils
+maybe-mostlyclean-binutils: mostlyclean-binutils
 
-mostlyclean-bfd: 
-       @[ -f ./bfd/Makefile ] || exit 0; \
+mostlyclean-binutils: 
+       @[ -f ./binutils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bfd" ; \
-       (cd $(HOST_SUBDIR)/bfd && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -5722,23 +5773,23 @@ mostlyclean-bfd:
                  mostlyclean) \
          || exit 1
 
-@endif bfd
+@endif binutils
 
-.PHONY: maybe-clean-bfd clean-bfd
-maybe-clean-bfd:
-@if bfd
-maybe-clean-bfd: clean-bfd
+.PHONY: maybe-clean-binutils clean-binutils
+maybe-clean-binutils:
+@if binutils
+maybe-clean-binutils: clean-binutils
 
-clean-bfd: 
-       @[ -f ./bfd/Makefile ] || exit 0; \
+clean-binutils: 
+       @[ -f ./binutils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bfd" ; \
-       (cd $(HOST_SUBDIR)/bfd && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -5746,23 +5797,23 @@ clean-bfd:
                  clean) \
          || exit 1
 
-@endif bfd
+@endif binutils
 
-.PHONY: maybe-distclean-bfd distclean-bfd
-maybe-distclean-bfd:
-@if bfd
-maybe-distclean-bfd: distclean-bfd
+.PHONY: maybe-distclean-binutils distclean-binutils
+maybe-distclean-binutils:
+@if binutils
+maybe-distclean-binutils: distclean-binutils
 
-distclean-bfd: 
-       @[ -f ./bfd/Makefile ] || exit 0; \
+distclean-binutils: 
+       @[ -f ./binutils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bfd" ; \
-       (cd $(HOST_SUBDIR)/bfd && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -5770,23 +5821,23 @@ distclean-bfd:
                  distclean) \
          || exit 1
 
-@endif bfd
+@endif binutils
 
-.PHONY: maybe-maintainer-clean-bfd maintainer-clean-bfd
-maybe-maintainer-clean-bfd:
-@if bfd
-maybe-maintainer-clean-bfd: maintainer-clean-bfd
+.PHONY: maybe-maintainer-clean-binutils maintainer-clean-binutils
+maybe-maintainer-clean-binutils:
+@if binutils
+maybe-maintainer-clean-binutils: maintainer-clean-binutils
 
-maintainer-clean-bfd: 
-       @[ -f ./bfd/Makefile ] || exit 0; \
+maintainer-clean-binutils: 
+       @[ -f ./binutils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bfd" ; \
-       (cd $(HOST_SUBDIR)/bfd && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -5794,688 +5845,158 @@ maintainer-clean-bfd:
                  maintainer-clean) \
          || exit 1
 
-@endif bfd
+@endif binutils
 
 
 
-.PHONY: configure-opcodes maybe-configure-opcodes
-maybe-configure-opcodes:
+.PHONY: configure-bison maybe-configure-bison
+maybe-configure-bison:
 @if gcc-bootstrap
-configure-opcodes: stage_current
+configure-bison: stage_current
 @endif gcc-bootstrap
-@if opcodes
-maybe-configure-opcodes: configure-opcodes
-configure-opcodes: 
+@if bison
+maybe-configure-bison: configure-bison
+configure-bison: 
+       @: $(MAKE); $(unstage)
        @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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/opcodes; \
-       cd "$(HOST_SUBDIR)/opcodes" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/bison/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/bison; \
+       cd "$(HOST_SUBDIR)/bison" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/bison/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(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 opcodes
+@endif bison
 
 
 
-.PHONY: configure-stage1-opcodes maybe-configure-stage1-opcodes
-maybe-configure-stage1-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stage1-opcodes: configure-stage1-opcodes
-configure-stage1-opcodes:
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+
+
+.PHONY: all-bison maybe-all-bison
+maybe-all-bison:
+@if gcc-bootstrap
+all-bison: stage_current
+@endif gcc-bootstrap
+@if bison
+TARGET-bison=all
+maybe-all-bison: all-bison
+all-bison: configure-bison
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
        $(HOST_EXPORTS)  \
-       CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-          \
-         --disable-intermodule $(STAGE1_CHECKING)        --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif opcodes-bootstrap
+       (cd $(HOST_SUBDIR)/bison && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-bison))
+@endif bison
 
-.PHONY: configure-stage2-opcodes maybe-configure-stage2-opcodes
-maybe-configure-stage2-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stage2-opcodes: configure-stage2-opcodes
-configure-stage2-opcodes:
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif opcodes-bootstrap
 
-.PHONY: configure-stageb2g0-opcodes maybe-configure-stageb2g0-opcodes
-maybe-configure-stageb2g0-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stageb2g0-opcodes: configure-stageb2g0-opcodes
-configure-stageb2g0-opcodes:
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
-       echo Configuring stage b2g0 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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif opcodes-bootstrap
 
-.PHONY: configure-stage3-opcodes maybe-configure-stage3-opcodes
-maybe-configure-stage3-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stage3-opcodes: configure-stage3-opcodes
-configure-stage3-opcodes:
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif opcodes-bootstrap
 
-.PHONY: configure-stageb3g2-opcodes maybe-configure-stageb3g2-opcodes
-maybe-configure-stageb3g2-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stageb3g2-opcodes: configure-stageb3g2-opcodes
-configure-stageb3g2-opcodes:
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
-       echo Configuring stage b3g2 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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif opcodes-bootstrap
+.PHONY: check-bison maybe-check-bison
+maybe-check-bison:
+@if bison
+maybe-check-bison: check-bison
 
-.PHONY: configure-stage4-opcodes maybe-configure-stage4-opcodes
-maybe-configure-stage4-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stage4-opcodes: configure-stage4-opcodes
-configure-stage4-opcodes:
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif opcodes-bootstrap
+# This module is only tested in a native toolchain.
+check-bison:
+       @: $(MAKE); $(unstage)
+       @if [ '$(host)' = '$(target)' ]; then \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+         $(HOST_EXPORTS)  \
+         (cd $(HOST_SUBDIR)/bison && \
+           $(MAKE) $(FLAGS_TO_PASS)  check)
+       fi
 
-.PHONY: configure-stageprofile-opcodes maybe-configure-stageprofile-opcodes
-maybe-configure-stageprofile-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stageprofile-opcodes: configure-stageprofile-opcodes
-configure-stageprofile-opcodes:
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+@endif bison
+
+.PHONY: install-bison maybe-install-bison
+maybe-install-bison:
+@if bison
+maybe-install-bison: install-bison
+
+install-bison: installdirs
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif opcodes-bootstrap
+       (cd $(HOST_SUBDIR)/bison && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-.PHONY: configure-stagefeedback-opcodes maybe-configure-stagefeedback-opcodes
-maybe-configure-stagefeedback-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stagefeedback-opcodes: configure-stagefeedback-opcodes
-configure-stagefeedback-opcodes:
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+@endif bison
+
+.PHONY: install-strip-bison maybe-install-strip-bison
+maybe-install-strip-bison:
+@if bison
+maybe-install-strip-bison: install-strip-bison
+
+install-strip-bison: installdirs
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif opcodes-bootstrap
-
+       (cd $(HOST_SUBDIR)/bison && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
+@endif bison
 
+# Other targets (info, dvi, pdf, etc.)
 
+.PHONY: maybe-info-bison info-bison
+maybe-info-bison:
+@if bison
+maybe-info-bison: info-bison
 
-.PHONY: all-opcodes maybe-all-opcodes
-maybe-all-opcodes:
-@if gcc-bootstrap
-all-opcodes: stage_current
-@endif gcc-bootstrap
-@if opcodes
-TARGET-opcodes=all
-maybe-all-opcodes: all-opcodes
-all-opcodes: configure-opcodes
-       @r=`${PWD_COMMAND}`; export r; \
+info-bison: \
+    configure-bison 
+       @: $(MAKE); $(unstage)
+       @[ -f ./bison/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/opcodes && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-opcodes))
-@endif opcodes
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       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}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 info) \
+         || exit 1
 
+@endif bison
 
+.PHONY: maybe-dvi-bison dvi-bison
+maybe-dvi-bison:
+@if bison
+maybe-dvi-bison: dvi-bison
 
-.PHONY: all-stage1-opcodes maybe-all-stage1-opcodes
-.PHONY: clean-stage1-opcodes maybe-clean-stage1-opcodes
-maybe-all-stage1-opcodes:
-maybe-clean-stage1-opcodes:
-@if opcodes-bootstrap
-maybe-all-stage1-opcodes: all-stage1-opcodes
-all-stage1: all-stage1-opcodes
-TARGET-stage1-opcodes = $(TARGET-opcodes)
-all-stage1-opcodes: configure-stage1-opcodes
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-               LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
-               $(TARGET-stage1-opcodes)
-
-maybe-clean-stage1-opcodes: clean-stage1-opcodes
-clean-stage1: clean-stage1-opcodes
-clean-stage1-opcodes:
-       @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage1-opcodes/Makefile ] || exit 0; \
-         $(MAKE) stage1-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
-@endif opcodes-bootstrap
-
-
-.PHONY: all-stage2-opcodes maybe-all-stage2-opcodes
-.PHONY: clean-stage2-opcodes maybe-clean-stage2-opcodes
-maybe-all-stage2-opcodes:
-maybe-clean-stage2-opcodes:
-@if opcodes-bootstrap
-maybe-all-stage2-opcodes: all-stage2-opcodes
-all-stage2: all-stage2-opcodes
-TARGET-stage2-opcodes = $(TARGET-opcodes)
-all-stage2-opcodes: configure-stage2-opcodes
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage2-opcodes)
-
-maybe-clean-stage2-opcodes: clean-stage2-opcodes
-clean-stage2: clean-stage2-opcodes
-clean-stage2-opcodes:
-       @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage2-opcodes/Makefile ] || exit 0; \
-         $(MAKE) stage2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif opcodes-bootstrap
-
-
-.PHONY: all-stageb2g0-opcodes maybe-all-stageb2g0-opcodes
-.PHONY: clean-stageb2g0-opcodes maybe-clean-stageb2g0-opcodes
-maybe-all-stageb2g0-opcodes:
-maybe-clean-stageb2g0-opcodes:
-@if opcodes-bootstrap
-maybe-all-stageb2g0-opcodes: all-stageb2g0-opcodes
-all-stageb2g0: all-stageb2g0-opcodes
-TARGET-stageb2g0-opcodes = $(TARGET-opcodes)
-all-stageb2g0-opcodes: configure-stageb2g0-opcodes
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb2g0-opcodes)
-
-maybe-clean-stageb2g0-opcodes: clean-stageb2g0-opcodes
-clean-stageb2g0: clean-stageb2g0-opcodes
-clean-stageb2g0-opcodes:
-       @if [ $(current_stage) = stageb2g0 ]; then \
-         [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb2g0-opcodes/Makefile ] || exit 0; \
-         $(MAKE) stageb2g0-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif opcodes-bootstrap
-
-
-.PHONY: all-stage3-opcodes maybe-all-stage3-opcodes
-.PHONY: clean-stage3-opcodes maybe-clean-stage3-opcodes
-maybe-all-stage3-opcodes:
-maybe-clean-stage3-opcodes:
-@if opcodes-bootstrap
-maybe-all-stage3-opcodes: all-stage3-opcodes
-all-stage3: all-stage3-opcodes
-TARGET-stage3-opcodes = $(TARGET-opcodes)
-all-stage3-opcodes: configure-stage3-opcodes
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage3-opcodes)
-
-maybe-clean-stage3-opcodes: clean-stage3-opcodes
-clean-stage3: clean-stage3-opcodes
-clean-stage3-opcodes:
-       @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage3-opcodes/Makefile ] || exit 0; \
-         $(MAKE) stage3-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif opcodes-bootstrap
-
-
-.PHONY: all-stageb3g2-opcodes maybe-all-stageb3g2-opcodes
-.PHONY: clean-stageb3g2-opcodes maybe-clean-stageb3g2-opcodes
-maybe-all-stageb3g2-opcodes:
-maybe-clean-stageb3g2-opcodes:
-@if opcodes-bootstrap
-maybe-all-stageb3g2-opcodes: all-stageb3g2-opcodes
-all-stageb3g2: all-stageb3g2-opcodes
-TARGET-stageb3g2-opcodes = $(TARGET-opcodes)
-all-stageb3g2-opcodes: configure-stageb3g2-opcodes
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb3g2-opcodes)
-
-maybe-clean-stageb3g2-opcodes: clean-stageb3g2-opcodes
-clean-stageb3g2: clean-stageb3g2-opcodes
-clean-stageb3g2-opcodes:
-       @if [ $(current_stage) = stageb3g2 ]; then \
-         [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb3g2-opcodes/Makefile ] || exit 0; \
-         $(MAKE) stageb3g2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif opcodes-bootstrap
-
-
-.PHONY: all-stage4-opcodes maybe-all-stage4-opcodes
-.PHONY: clean-stage4-opcodes maybe-clean-stage4-opcodes
-maybe-all-stage4-opcodes:
-maybe-clean-stage4-opcodes:
-@if opcodes-bootstrap
-maybe-all-stage4-opcodes: all-stage4-opcodes
-all-stage4: all-stage4-opcodes
-TARGET-stage4-opcodes = $(TARGET-opcodes)
-all-stage4-opcodes: configure-stage4-opcodes
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-               LIBCFLAGS="$(STAGE4_CFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage4-opcodes)
-
-maybe-clean-stage4-opcodes: clean-stage4-opcodes
-clean-stage4: clean-stage4-opcodes
-clean-stage4-opcodes:
-       @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage4-opcodes/Makefile ] || exit 0; \
-         $(MAKE) stage4-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif opcodes-bootstrap
-
-
-.PHONY: all-stageprofile-opcodes maybe-all-stageprofile-opcodes
-.PHONY: clean-stageprofile-opcodes maybe-clean-stageprofile-opcodes
-maybe-all-stageprofile-opcodes:
-maybe-clean-stageprofile-opcodes:
-@if opcodes-bootstrap
-maybe-all-stageprofile-opcodes: all-stageprofile-opcodes
-all-stageprofile: all-stageprofile-opcodes
-TARGET-stageprofile-opcodes = $(TARGET-opcodes)
-all-stageprofile-opcodes: configure-stageprofile-opcodes
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageprofile-opcodes)
-
-maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
-clean-stageprofile: clean-stageprofile-opcodes
-clean-stageprofile-opcodes:
-       @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageprofile-opcodes/Makefile ] || exit 0; \
-         $(MAKE) stageprofile-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif opcodes-bootstrap
-
-
-.PHONY: all-stagefeedback-opcodes maybe-all-stagefeedback-opcodes
-.PHONY: clean-stagefeedback-opcodes maybe-clean-stagefeedback-opcodes
-maybe-all-stagefeedback-opcodes:
-maybe-clean-stagefeedback-opcodes:
-@if opcodes-bootstrap
-maybe-all-stagefeedback-opcodes: all-stagefeedback-opcodes
-all-stagefeedback: all-stagefeedback-opcodes
-TARGET-stagefeedback-opcodes = $(TARGET-opcodes)
-all-stagefeedback-opcodes: configure-stagefeedback-opcodes
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stagefeedback-opcodes)
-
-maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
-clean-stagefeedback: clean-stagefeedback-opcodes
-clean-stagefeedback-opcodes:
-       @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-opcodes/Makefile ] || exit 0; \
-         $(MAKE) stagefeedback-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/opcodes && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif opcodes-bootstrap
-
-
-
-
-
-.PHONY: check-opcodes maybe-check-opcodes
-maybe-check-opcodes:
-@if opcodes
-maybe-check-opcodes: check-opcodes
-
-check-opcodes:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/opcodes && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif opcodes
-
-.PHONY: install-opcodes maybe-install-opcodes
-maybe-install-opcodes:
-@if opcodes
-maybe-install-opcodes: install-opcodes
-
-install-opcodes: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/opcodes && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif opcodes
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-opcodes info-opcodes
-maybe-info-opcodes:
-@if opcodes
-maybe-info-opcodes: info-opcodes
-
-info-opcodes: \
-    configure-opcodes 
-       @[ -f ./opcodes/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 opcodes" ; \
-       (cd $(HOST_SUBDIR)/opcodes && \
-         $(MAKE) $(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 opcodes
-
-.PHONY: maybe-dvi-opcodes dvi-opcodes
-maybe-dvi-opcodes:
-@if opcodes
-maybe-dvi-opcodes: dvi-opcodes
-
-dvi-opcodes: \
-    configure-opcodes 
-       @[ -f ./opcodes/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+dvi-bison: \
+    configure-bison 
+       @: $(MAKE); $(unstage)
+       @[ -f ./bison/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 opcodes" ; \
-       (cd $(HOST_SUBDIR)/opcodes && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -6483,24 +6004,25 @@ dvi-opcodes: \
                  dvi) \
          || exit 1
 
-@endif opcodes
+@endif bison
 
-.PHONY: maybe-pdf-opcodes pdf-opcodes
-maybe-pdf-opcodes:
-@if opcodes
-maybe-pdf-opcodes: pdf-opcodes
+.PHONY: maybe-pdf-bison pdf-bison
+maybe-pdf-bison:
+@if bison
+maybe-pdf-bison: pdf-bison
 
-pdf-opcodes: \
-    configure-opcodes 
-       @[ -f ./opcodes/Makefile ] || exit 0; \
+pdf-bison: \
+    configure-bison 
+       @: $(MAKE); $(unstage)
+       @[ -f ./bison/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 opcodes" ; \
-       (cd $(HOST_SUBDIR)/opcodes && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -6508,24 +6030,25 @@ pdf-opcodes: \
                  pdf) \
          || exit 1
 
-@endif opcodes
+@endif bison
 
-.PHONY: maybe-html-opcodes html-opcodes
-maybe-html-opcodes:
-@if opcodes
-maybe-html-opcodes: html-opcodes
+.PHONY: maybe-html-bison html-bison
+maybe-html-bison:
+@if bison
+maybe-html-bison: html-bison
 
-html-opcodes: \
-    configure-opcodes 
-       @[ -f ./opcodes/Makefile ] || exit 0; \
+html-bison: \
+    configure-bison 
+       @: $(MAKE); $(unstage)
+       @[ -f ./bison/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 opcodes" ; \
-       (cd $(HOST_SUBDIR)/opcodes && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -6533,24 +6056,25 @@ html-opcodes: \
                  html) \
          || exit 1
 
-@endif opcodes
+@endif bison
 
-.PHONY: maybe-TAGS-opcodes TAGS-opcodes
-maybe-TAGS-opcodes:
-@if opcodes
-maybe-TAGS-opcodes: TAGS-opcodes
+.PHONY: maybe-TAGS-bison TAGS-bison
+maybe-TAGS-bison:
+@if bison
+maybe-TAGS-bison: TAGS-bison
 
-TAGS-opcodes: \
-    configure-opcodes 
-       @[ -f ./opcodes/Makefile ] || exit 0; \
+TAGS-bison: \
+    configure-bison 
+       @: $(MAKE); $(unstage)
+       @[ -f ./bison/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 opcodes" ; \
-       (cd $(HOST_SUBDIR)/opcodes && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -6558,25 +6082,26 @@ TAGS-opcodes: \
                  TAGS) \
          || exit 1
 
-@endif opcodes
+@endif bison
 
-.PHONY: maybe-install-info-opcodes install-info-opcodes
-maybe-install-info-opcodes:
-@if opcodes
-maybe-install-info-opcodes: install-info-opcodes
+.PHONY: maybe-install-info-bison install-info-bison
+maybe-install-info-bison:
+@if bison
+maybe-install-info-bison: install-info-bison
 
-install-info-opcodes: \
-    configure-opcodes \
-    info-opcodes 
-       @[ -f ./opcodes/Makefile ] || exit 0; \
+install-info-bison: \
+    configure-bison \
+    info-bison 
+       @: $(MAKE); $(unstage)
+       @[ -f ./bison/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 opcodes" ; \
-       (cd $(HOST_SUBDIR)/opcodes && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -6584,25 +6109,26 @@ install-info-opcodes: \
                  install-info) \
          || exit 1
 
-@endif opcodes
+@endif bison
 
-.PHONY: maybe-install-pdf-opcodes install-pdf-opcodes
-maybe-install-pdf-opcodes:
-@if opcodes
-maybe-install-pdf-opcodes: install-pdf-opcodes
+.PHONY: maybe-install-pdf-bison install-pdf-bison
+maybe-install-pdf-bison:
+@if bison
+maybe-install-pdf-bison: install-pdf-bison
 
-install-pdf-opcodes: \
-    configure-opcodes \
-    pdf-opcodes 
-       @[ -f ./opcodes/Makefile ] || exit 0; \
+install-pdf-bison: \
+    configure-bison \
+    pdf-bison 
+       @: $(MAKE); $(unstage)
+       @[ -f ./bison/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 opcodes" ; \
-       (cd $(HOST_SUBDIR)/opcodes && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -6610,25 +6136,26 @@ install-pdf-opcodes: \
                  install-pdf) \
          || exit 1
 
-@endif opcodes
+@endif bison
 
-.PHONY: maybe-install-html-opcodes install-html-opcodes
-maybe-install-html-opcodes:
-@if opcodes
-maybe-install-html-opcodes: install-html-opcodes
+.PHONY: maybe-install-html-bison install-html-bison
+maybe-install-html-bison:
+@if bison
+maybe-install-html-bison: install-html-bison
 
-install-html-opcodes: \
-    configure-opcodes \
-    html-opcodes 
-       @[ -f ./opcodes/Makefile ] || exit 0; \
+install-html-bison: \
+    configure-bison \
+    html-bison 
+       @: $(MAKE); $(unstage)
+       @[ -f ./bison/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 opcodes" ; \
-       (cd $(HOST_SUBDIR)/opcodes && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -6636,24 +6163,25 @@ install-html-opcodes: \
                  install-html) \
          || exit 1
 
-@endif opcodes
+@endif bison
 
-.PHONY: maybe-installcheck-opcodes installcheck-opcodes
-maybe-installcheck-opcodes:
-@if opcodes
-maybe-installcheck-opcodes: installcheck-opcodes
+.PHONY: maybe-installcheck-bison installcheck-bison
+maybe-installcheck-bison:
+@if bison
+maybe-installcheck-bison: installcheck-bison
 
-installcheck-opcodes: \
-    configure-opcodes 
-       @[ -f ./opcodes/Makefile ] || exit 0; \
+installcheck-bison: \
+    configure-bison 
+       @: $(MAKE); $(unstage)
+       @[ -f ./bison/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 opcodes" ; \
-       (cd $(HOST_SUBDIR)/opcodes && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -6661,23 +6189,24 @@ installcheck-opcodes: \
                  installcheck) \
          || exit 1
 
-@endif opcodes
+@endif bison
 
-.PHONY: maybe-mostlyclean-opcodes mostlyclean-opcodes
-maybe-mostlyclean-opcodes:
-@if opcodes
-maybe-mostlyclean-opcodes: mostlyclean-opcodes
+.PHONY: maybe-mostlyclean-bison mostlyclean-bison
+maybe-mostlyclean-bison:
+@if bison
+maybe-mostlyclean-bison: mostlyclean-bison
 
-mostlyclean-opcodes: 
-       @[ -f ./opcodes/Makefile ] || exit 0; \
+mostlyclean-bison: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./bison/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 opcodes" ; \
-       (cd $(HOST_SUBDIR)/opcodes && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -6685,23 +6214,24 @@ mostlyclean-opcodes:
                  mostlyclean) \
          || exit 1
 
-@endif opcodes
+@endif bison
 
-.PHONY: maybe-clean-opcodes clean-opcodes
-maybe-clean-opcodes:
-@if opcodes
-maybe-clean-opcodes: clean-opcodes
+.PHONY: maybe-clean-bison clean-bison
+maybe-clean-bison:
+@if bison
+maybe-clean-bison: clean-bison
 
-clean-opcodes: 
-       @[ -f ./opcodes/Makefile ] || exit 0; \
+clean-bison: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./bison/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 opcodes" ; \
-       (cd $(HOST_SUBDIR)/opcodes && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -6709,23 +6239,24 @@ clean-opcodes:
                  clean) \
          || exit 1
 
-@endif opcodes
+@endif bison
 
-.PHONY: maybe-distclean-opcodes distclean-opcodes
-maybe-distclean-opcodes:
-@if opcodes
-maybe-distclean-opcodes: distclean-opcodes
+.PHONY: maybe-distclean-bison distclean-bison
+maybe-distclean-bison:
+@if bison
+maybe-distclean-bison: distclean-bison
 
-distclean-opcodes: 
-       @[ -f ./opcodes/Makefile ] || exit 0; \
+distclean-bison: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./bison/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 opcodes" ; \
-       (cd $(HOST_SUBDIR)/opcodes && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -6733,23 +6264,24 @@ distclean-opcodes:
                  distclean) \
          || exit 1
 
-@endif opcodes
+@endif bison
 
-.PHONY: maybe-maintainer-clean-opcodes maintainer-clean-opcodes
-maybe-maintainer-clean-opcodes:
-@if opcodes
-maybe-maintainer-clean-opcodes: maintainer-clean-opcodes
+.PHONY: maybe-maintainer-clean-bison maintainer-clean-bison
+maybe-maintainer-clean-bison:
+@if bison
+maybe-maintainer-clean-bison: maintainer-clean-bison
 
-maintainer-clean-opcodes: 
-       @[ -f ./opcodes/Makefile ] || exit 0; \
+maintainer-clean-bison: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./bison/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 opcodes" ; \
-       (cd $(HOST_SUBDIR)/opcodes && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -6757,663 +6289,129 @@ maintainer-clean-opcodes:
                  maintainer-clean) \
          || exit 1
 
-@endif opcodes
+@endif bison
 
 
 
-.PHONY: configure-binutils maybe-configure-binutils
-maybe-configure-binutils:
+.PHONY: configure-cgen maybe-configure-cgen
+maybe-configure-cgen:
 @if gcc-bootstrap
-configure-binutils: stage_current
+configure-cgen: stage_current
 @endif gcc-bootstrap
-@if binutils
-maybe-configure-binutils: configure-binutils
-configure-binutils: 
+@if cgen
+maybe-configure-cgen: configure-cgen
+configure-cgen: 
+       @: $(MAKE); $(unstage)
        @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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/binutils; \
-       cd "$(HOST_SUBDIR)/binutils" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/cgen/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cgen; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/cgen; \
+       cd "$(HOST_SUBDIR)/cgen" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/cgen/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(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 binutils
+@endif cgen
 
 
 
-.PHONY: configure-stage1-binutils maybe-configure-stage1-binutils
-maybe-configure-stage1-binutils:
-@if binutils-bootstrap
-maybe-configure-stage1-binutils: configure-stage1-binutils
-configure-stage1-binutils:
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
+
+
+.PHONY: all-cgen maybe-all-cgen
+maybe-all-cgen:
+@if gcc-bootstrap
+all-cgen: stage_current
+@endif gcc-bootstrap
+@if cgen
+TARGET-cgen=all
+maybe-all-cgen: all-cgen
+all-cgen: configure-cgen
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
        $(HOST_EXPORTS)  \
-       CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-          \
-         --disable-intermodule $(STAGE1_CHECKING)        --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif binutils-bootstrap
-
-.PHONY: configure-stage2-binutils maybe-configure-stage2-binutils
-maybe-configure-stage2-binutils:
-@if binutils-bootstrap
-maybe-configure-stage2-binutils: configure-stage2-binutils
-configure-stage2-binutils:
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif binutils-bootstrap
-
-.PHONY: configure-stageb2g0-binutils maybe-configure-stageb2g0-binutils
-maybe-configure-stageb2g0-binutils:
-@if binutils-bootstrap
-maybe-configure-stageb2g0-binutils: configure-stageb2g0-binutils
-configure-stageb2g0-binutils:
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
-       echo Configuring stage b2g0 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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif binutils-bootstrap
-
-.PHONY: configure-stage3-binutils maybe-configure-stage3-binutils
-maybe-configure-stage3-binutils:
-@if binutils-bootstrap
-maybe-configure-stage3-binutils: configure-stage3-binutils
-configure-stage3-binutils:
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif binutils-bootstrap
-
-.PHONY: configure-stageb3g2-binutils maybe-configure-stageb3g2-binutils
-maybe-configure-stageb3g2-binutils:
-@if binutils-bootstrap
-maybe-configure-stageb3g2-binutils: configure-stageb3g2-binutils
-configure-stageb3g2-binutils:
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
-       echo Configuring stage b3g2 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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif binutils-bootstrap
-
-.PHONY: configure-stage4-binutils maybe-configure-stage4-binutils
-maybe-configure-stage4-binutils:
-@if binutils-bootstrap
-maybe-configure-stage4-binutils: configure-stage4-binutils
-configure-stage4-binutils:
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif binutils-bootstrap
-
-.PHONY: configure-stageprofile-binutils maybe-configure-stageprofile-binutils
-maybe-configure-stageprofile-binutils:
-@if binutils-bootstrap
-maybe-configure-stageprofile-binutils: configure-stageprofile-binutils
-configure-stageprofile-binutils:
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif binutils-bootstrap
-
-.PHONY: configure-stagefeedback-binutils maybe-configure-stagefeedback-binutils
-maybe-configure-stagefeedback-binutils:
-@if binutils-bootstrap
-maybe-configure-stagefeedback-binutils: configure-stagefeedback-binutils
-configure-stagefeedback-binutils:
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif binutils-bootstrap
-
-
-
-
-
-.PHONY: all-binutils maybe-all-binutils
-maybe-all-binutils:
-@if gcc-bootstrap
-all-binutils: stage_current
-@endif gcc-bootstrap
-@if binutils
-TARGET-binutils=all
-maybe-all-binutils: all-binutils
-all-binutils: configure-binutils
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/binutils && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-binutils))
-@endif binutils
-
-
-
-.PHONY: all-stage1-binutils maybe-all-stage1-binutils
-.PHONY: clean-stage1-binutils maybe-clean-stage1-binutils
-maybe-all-stage1-binutils:
-maybe-clean-stage1-binutils:
-@if binutils-bootstrap
-maybe-all-stage1-binutils: all-stage1-binutils
-all-stage1: all-stage1-binutils
-TARGET-stage1-binutils = $(TARGET-binutils)
-all-stage1-binutils: configure-stage1-binutils
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-               LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
-               $(TARGET-stage1-binutils)
-
-maybe-clean-stage1-binutils: clean-stage1-binutils
-clean-stage1: clean-stage1-binutils
-clean-stage1-binutils:
-       @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage1-binutils/Makefile ] || exit 0; \
-         $(MAKE) stage1-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
-@endif binutils-bootstrap
-
-
-.PHONY: all-stage2-binutils maybe-all-stage2-binutils
-.PHONY: clean-stage2-binutils maybe-clean-stage2-binutils
-maybe-all-stage2-binutils:
-maybe-clean-stage2-binutils:
-@if binutils-bootstrap
-maybe-all-stage2-binutils: all-stage2-binutils
-all-stage2: all-stage2-binutils
-TARGET-stage2-binutils = $(TARGET-binutils)
-all-stage2-binutils: configure-stage2-binutils
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage2-binutils)
-
-maybe-clean-stage2-binutils: clean-stage2-binutils
-clean-stage2: clean-stage2-binutils
-clean-stage2-binutils:
-       @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage2-binutils/Makefile ] || exit 0; \
-         $(MAKE) stage2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif binutils-bootstrap
-
-
-.PHONY: all-stageb2g0-binutils maybe-all-stageb2g0-binutils
-.PHONY: clean-stageb2g0-binutils maybe-clean-stageb2g0-binutils
-maybe-all-stageb2g0-binutils:
-maybe-clean-stageb2g0-binutils:
-@if binutils-bootstrap
-maybe-all-stageb2g0-binutils: all-stageb2g0-binutils
-all-stageb2g0: all-stageb2g0-binutils
-TARGET-stageb2g0-binutils = $(TARGET-binutils)
-all-stageb2g0-binutils: configure-stageb2g0-binutils
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb2g0-binutils)
-
-maybe-clean-stageb2g0-binutils: clean-stageb2g0-binutils
-clean-stageb2g0: clean-stageb2g0-binutils
-clean-stageb2g0-binutils:
-       @if [ $(current_stage) = stageb2g0 ]; then \
-         [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb2g0-binutils/Makefile ] || exit 0; \
-         $(MAKE) stageb2g0-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif binutils-bootstrap
-
-
-.PHONY: all-stage3-binutils maybe-all-stage3-binutils
-.PHONY: clean-stage3-binutils maybe-clean-stage3-binutils
-maybe-all-stage3-binutils:
-maybe-clean-stage3-binutils:
-@if binutils-bootstrap
-maybe-all-stage3-binutils: all-stage3-binutils
-all-stage3: all-stage3-binutils
-TARGET-stage3-binutils = $(TARGET-binutils)
-all-stage3-binutils: configure-stage3-binutils
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage3-binutils)
-
-maybe-clean-stage3-binutils: clean-stage3-binutils
-clean-stage3: clean-stage3-binutils
-clean-stage3-binutils:
-       @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage3-binutils/Makefile ] || exit 0; \
-         $(MAKE) stage3-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif binutils-bootstrap
-
-
-.PHONY: all-stageb3g2-binutils maybe-all-stageb3g2-binutils
-.PHONY: clean-stageb3g2-binutils maybe-clean-stageb3g2-binutils
-maybe-all-stageb3g2-binutils:
-maybe-clean-stageb3g2-binutils:
-@if binutils-bootstrap
-maybe-all-stageb3g2-binutils: all-stageb3g2-binutils
-all-stageb3g2: all-stageb3g2-binutils
-TARGET-stageb3g2-binutils = $(TARGET-binutils)
-all-stageb3g2-binutils: configure-stageb3g2-binutils
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb3g2-binutils)
-
-maybe-clean-stageb3g2-binutils: clean-stageb3g2-binutils
-clean-stageb3g2: clean-stageb3g2-binutils
-clean-stageb3g2-binutils:
-       @if [ $(current_stage) = stageb3g2 ]; then \
-         [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb3g2-binutils/Makefile ] || exit 0; \
-         $(MAKE) stageb3g2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif binutils-bootstrap
-
-
-.PHONY: all-stage4-binutils maybe-all-stage4-binutils
-.PHONY: clean-stage4-binutils maybe-clean-stage4-binutils
-maybe-all-stage4-binutils:
-maybe-clean-stage4-binutils:
-@if binutils-bootstrap
-maybe-all-stage4-binutils: all-stage4-binutils
-all-stage4: all-stage4-binutils
-TARGET-stage4-binutils = $(TARGET-binutils)
-all-stage4-binutils: configure-stage4-binutils
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-               LIBCFLAGS="$(STAGE4_CFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage4-binutils)
-
-maybe-clean-stage4-binutils: clean-stage4-binutils
-clean-stage4: clean-stage4-binutils
-clean-stage4-binutils:
-       @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage4-binutils/Makefile ] || exit 0; \
-         $(MAKE) stage4-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif binutils-bootstrap
+       (cd $(HOST_SUBDIR)/cgen && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-cgen))
+@endif cgen
 
 
-.PHONY: all-stageprofile-binutils maybe-all-stageprofile-binutils
-.PHONY: clean-stageprofile-binutils maybe-clean-stageprofile-binutils
-maybe-all-stageprofile-binutils:
-maybe-clean-stageprofile-binutils:
-@if binutils-bootstrap
-maybe-all-stageprofile-binutils: all-stageprofile-binutils
-all-stageprofile: all-stageprofile-binutils
-TARGET-stageprofile-binutils = $(TARGET-binutils)
-all-stageprofile-binutils: configure-stageprofile-binutils
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageprofile-binutils)
 
-maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
-clean-stageprofile: clean-stageprofile-binutils
-clean-stageprofile-binutils:
-       @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageprofile-binutils/Makefile ] || exit 0; \
-         $(MAKE) stageprofile-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif binutils-bootstrap
 
+.PHONY: check-cgen maybe-check-cgen
+maybe-check-cgen:
+@if cgen
+maybe-check-cgen: check-cgen
 
-.PHONY: all-stagefeedback-binutils maybe-all-stagefeedback-binutils
-.PHONY: clean-stagefeedback-binutils maybe-clean-stagefeedback-binutils
-maybe-all-stagefeedback-binutils:
-maybe-clean-stagefeedback-binutils:
-@if binutils-bootstrap
-maybe-all-stagefeedback-binutils: all-stagefeedback-binutils
-all-stagefeedback: all-stagefeedback-binutils
-TARGET-stagefeedback-binutils = $(TARGET-binutils)
-all-stagefeedback-binutils: configure-stagefeedback-binutils
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+check-cgen:
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stagefeedback-binutils)
-
-maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
-clean-stagefeedback: clean-stagefeedback-binutils
-clean-stagefeedback-binutils:
-       @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-binutils/Makefile ] || exit 0; \
-         $(MAKE) stagefeedback-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif binutils-bootstrap
-
-
-
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/cgen && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
 
+@endif cgen
 
-.PHONY: check-binutils maybe-check-binutils
-maybe-check-binutils:
-@if binutils
-maybe-check-binutils: check-binutils
+.PHONY: install-cgen maybe-install-cgen
+maybe-install-cgen:
+@if cgen
+maybe-install-cgen: install-cgen
 
-check-binutils:
+install-cgen: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/binutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       (cd $(HOST_SUBDIR)/cgen && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif binutils
+@endif cgen
 
-.PHONY: install-binutils maybe-install-binutils
-maybe-install-binutils:
-@if binutils
-maybe-install-binutils: install-binutils
+.PHONY: install-strip-cgen maybe-install-strip-cgen
+maybe-install-strip-cgen:
+@if cgen
+maybe-install-strip-cgen: install-strip-cgen
 
-install-binutils: installdirs
+install-strip-cgen: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/binutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+       (cd $(HOST_SUBDIR)/cgen && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif binutils
+@endif cgen
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-binutils info-binutils
-maybe-info-binutils:
-@if binutils
-maybe-info-binutils: info-binutils
+.PHONY: maybe-info-cgen info-cgen
+maybe-info-cgen:
+@if cgen
+maybe-info-cgen: info-cgen
 
-info-binutils: \
-    configure-binutils 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+info-cgen: \
+    configure-cgen 
+       @: $(MAKE); $(unstage)
+       @[ -f ./cgen/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -7421,24 +6419,25 @@ info-binutils: \
                  info) \
          || exit 1
 
-@endif binutils
+@endif cgen
 
-.PHONY: maybe-dvi-binutils dvi-binutils
-maybe-dvi-binutils:
-@if binutils
-maybe-dvi-binutils: dvi-binutils
+.PHONY: maybe-dvi-cgen dvi-cgen
+maybe-dvi-cgen:
+@if cgen
+maybe-dvi-cgen: dvi-cgen
 
-dvi-binutils: \
-    configure-binutils 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+dvi-cgen: \
+    configure-cgen 
+       @: $(MAKE); $(unstage)
+       @[ -f ./cgen/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -7446,24 +6445,25 @@ dvi-binutils: \
                  dvi) \
          || exit 1
 
-@endif binutils
+@endif cgen
 
-.PHONY: maybe-pdf-binutils pdf-binutils
-maybe-pdf-binutils:
-@if binutils
-maybe-pdf-binutils: pdf-binutils
+.PHONY: maybe-pdf-cgen pdf-cgen
+maybe-pdf-cgen:
+@if cgen
+maybe-pdf-cgen: pdf-cgen
 
-pdf-binutils: \
-    configure-binutils 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+pdf-cgen: \
+    configure-cgen 
+       @: $(MAKE); $(unstage)
+       @[ -f ./cgen/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -7471,24 +6471,25 @@ pdf-binutils: \
                  pdf) \
          || exit 1
 
-@endif binutils
+@endif cgen
 
-.PHONY: maybe-html-binutils html-binutils
-maybe-html-binutils:
-@if binutils
-maybe-html-binutils: html-binutils
+.PHONY: maybe-html-cgen html-cgen
+maybe-html-cgen:
+@if cgen
+maybe-html-cgen: html-cgen
 
-html-binutils: \
-    configure-binutils 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+html-cgen: \
+    configure-cgen 
+       @: $(MAKE); $(unstage)
+       @[ -f ./cgen/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -7496,24 +6497,25 @@ html-binutils: \
                  html) \
          || exit 1
 
-@endif binutils
+@endif cgen
 
-.PHONY: maybe-TAGS-binutils TAGS-binutils
-maybe-TAGS-binutils:
-@if binutils
-maybe-TAGS-binutils: TAGS-binutils
+.PHONY: maybe-TAGS-cgen TAGS-cgen
+maybe-TAGS-cgen:
+@if cgen
+maybe-TAGS-cgen: TAGS-cgen
 
-TAGS-binutils: \
-    configure-binutils 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+TAGS-cgen: \
+    configure-cgen 
+       @: $(MAKE); $(unstage)
+       @[ -f ./cgen/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -7521,25 +6523,26 @@ TAGS-binutils: \
                  TAGS) \
          || exit 1
 
-@endif binutils
+@endif cgen
 
-.PHONY: maybe-install-info-binutils install-info-binutils
-maybe-install-info-binutils:
-@if binutils
-maybe-install-info-binutils: install-info-binutils
+.PHONY: maybe-install-info-cgen install-info-cgen
+maybe-install-info-cgen:
+@if cgen
+maybe-install-info-cgen: install-info-cgen
 
-install-info-binutils: \
-    configure-binutils \
-    info-binutils 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+install-info-cgen: \
+    configure-cgen \
+    info-cgen 
+       @: $(MAKE); $(unstage)
+       @[ -f ./cgen/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -7547,25 +6550,26 @@ install-info-binutils: \
                  install-info) \
          || exit 1
 
-@endif binutils
+@endif cgen
 
-.PHONY: maybe-install-pdf-binutils install-pdf-binutils
-maybe-install-pdf-binutils:
-@if binutils
-maybe-install-pdf-binutils: install-pdf-binutils
+.PHONY: maybe-install-pdf-cgen install-pdf-cgen
+maybe-install-pdf-cgen:
+@if cgen
+maybe-install-pdf-cgen: install-pdf-cgen
 
-install-pdf-binutils: \
-    configure-binutils \
-    pdf-binutils 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+install-pdf-cgen: \
+    configure-cgen \
+    pdf-cgen 
+       @: $(MAKE); $(unstage)
+       @[ -f ./cgen/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -7573,25 +6577,26 @@ install-pdf-binutils: \
                  install-pdf) \
          || exit 1
 
-@endif binutils
+@endif cgen
 
-.PHONY: maybe-install-html-binutils install-html-binutils
-maybe-install-html-binutils:
-@if binutils
-maybe-install-html-binutils: install-html-binutils
+.PHONY: maybe-install-html-cgen install-html-cgen
+maybe-install-html-cgen:
+@if cgen
+maybe-install-html-cgen: install-html-cgen
 
-install-html-binutils: \
-    configure-binutils \
-    html-binutils 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+install-html-cgen: \
+    configure-cgen \
+    html-cgen 
+       @: $(MAKE); $(unstage)
+       @[ -f ./cgen/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -7599,24 +6604,25 @@ install-html-binutils: \
                  install-html) \
          || exit 1
 
-@endif binutils
+@endif cgen
 
-.PHONY: maybe-installcheck-binutils installcheck-binutils
-maybe-installcheck-binutils:
-@if binutils
-maybe-installcheck-binutils: installcheck-binutils
+.PHONY: maybe-installcheck-cgen installcheck-cgen
+maybe-installcheck-cgen:
+@if cgen
+maybe-installcheck-cgen: installcheck-cgen
 
-installcheck-binutils: \
-    configure-binutils 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+installcheck-cgen: \
+    configure-cgen 
+       @: $(MAKE); $(unstage)
+       @[ -f ./cgen/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -7624,23 +6630,24 @@ installcheck-binutils: \
                  installcheck) \
          || exit 1
 
-@endif binutils
+@endif cgen
 
-.PHONY: maybe-mostlyclean-binutils mostlyclean-binutils
-maybe-mostlyclean-binutils:
-@if binutils
-maybe-mostlyclean-binutils: mostlyclean-binutils
+.PHONY: maybe-mostlyclean-cgen mostlyclean-cgen
+maybe-mostlyclean-cgen:
+@if cgen
+maybe-mostlyclean-cgen: mostlyclean-cgen
 
-mostlyclean-binutils: 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+mostlyclean-cgen: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./cgen/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -7648,23 +6655,24 @@ mostlyclean-binutils:
                  mostlyclean) \
          || exit 1
 
-@endif binutils
+@endif cgen
 
-.PHONY: maybe-clean-binutils clean-binutils
-maybe-clean-binutils:
-@if binutils
-maybe-clean-binutils: clean-binutils
+.PHONY: maybe-clean-cgen clean-cgen
+maybe-clean-cgen:
+@if cgen
+maybe-clean-cgen: clean-cgen
 
-clean-binutils: 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+clean-cgen: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./cgen/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -7672,23 +6680,24 @@ clean-binutils:
                  clean) \
          || exit 1
 
-@endif binutils
+@endif cgen
 
-.PHONY: maybe-distclean-binutils distclean-binutils
-maybe-distclean-binutils:
-@if binutils
-maybe-distclean-binutils: distclean-binutils
+.PHONY: maybe-distclean-cgen distclean-cgen
+maybe-distclean-cgen:
+@if cgen
+maybe-distclean-cgen: distclean-cgen
 
-distclean-binutils: 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+distclean-cgen: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./cgen/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -7696,23 +6705,24 @@ distclean-binutils:
                  distclean) \
          || exit 1
 
-@endif binutils
+@endif cgen
 
-.PHONY: maybe-maintainer-clean-binutils maintainer-clean-binutils
-maybe-maintainer-clean-binutils:
-@if binutils
-maybe-maintainer-clean-binutils: maintainer-clean-binutils
+.PHONY: maybe-maintainer-clean-cgen maintainer-clean-cgen
+maybe-maintainer-clean-cgen:
+@if cgen
+maybe-maintainer-clean-cgen: maintainer-clean-cgen
 
-maintainer-clean-binutils: 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+maintainer-clean-cgen: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./cgen/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -7720,116 +6730,129 @@ maintainer-clean-binutils:
                  maintainer-clean) \
          || exit 1
 
-@endif binutils
+@endif cgen
 
 
 
-.PHONY: configure-bison maybe-configure-bison
-maybe-configure-bison:
+.PHONY: configure-dejagnu maybe-configure-dejagnu
+maybe-configure-dejagnu:
 @if gcc-bootstrap
-configure-bison: stage_current
+configure-dejagnu: stage_current
 @endif gcc-bootstrap
-@if bison
-maybe-configure-bison: configure-bison
-configure-bison: 
+@if dejagnu
+maybe-configure-dejagnu: configure-dejagnu
+configure-dejagnu: 
        @: $(MAKE); $(unstage)
        @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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/bison; \
-       cd "$(HOST_SUBDIR)/bison" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/dejagnu/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dejagnu; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/dejagnu; \
+       cd "$(HOST_SUBDIR)/dejagnu" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/bison/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/dejagnu/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bison"; \
-       libsrcdir="$$s/bison"; \
-       $(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 bison
+@endif dejagnu
 
 
 
 
 
-.PHONY: all-bison maybe-all-bison
-maybe-all-bison:
+.PHONY: all-dejagnu maybe-all-dejagnu
+maybe-all-dejagnu:
 @if gcc-bootstrap
-all-bison: stage_current
+all-dejagnu: stage_current
 @endif gcc-bootstrap
-@if bison
-TARGET-bison=all
-maybe-all-bison: all-bison
-all-bison: configure-bison
+@if dejagnu
+TARGET-dejagnu=all
+maybe-all-dejagnu: all-dejagnu
+all-dejagnu: configure-dejagnu
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/bison && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-bison))
-@endif bison
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/dejagnu && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-dejagnu))
+@endif dejagnu
 
 
 
 
-.PHONY: check-bison maybe-check-bison
-maybe-check-bison:
-@if bison
-maybe-check-bison: check-bison
+.PHONY: check-dejagnu maybe-check-dejagnu
+maybe-check-dejagnu:
+@if dejagnu
+maybe-check-dejagnu: check-dejagnu
 
-# This module is only tested in a native toolchain.
-check-bison:
+check-dejagnu:
        @: $(MAKE); $(unstage)
-       @if [ '$(host)' = '$(target)' ] ; then \
-         r=`${PWD_COMMAND}`; export r; \
-         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(HOST_EXPORTS) \
-         (cd $(HOST_SUBDIR)/bison && \
-           $(MAKE) $(FLAGS_TO_PASS)  check); \
-       fi
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/dejagnu && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif bison
+@endif dejagnu
 
-.PHONY: install-bison maybe-install-bison
-maybe-install-bison:
-@if bison
-maybe-install-bison: install-bison
+.PHONY: install-dejagnu maybe-install-dejagnu
+maybe-install-dejagnu:
+@if dejagnu
+maybe-install-dejagnu: install-dejagnu
 
-install-bison: installdirs
+install-dejagnu: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/bison && \
+       (cd $(HOST_SUBDIR)/dejagnu && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif bison
+@endif dejagnu
+
+.PHONY: install-strip-dejagnu maybe-install-strip-dejagnu
+maybe-install-strip-dejagnu:
+@if dejagnu
+maybe-install-strip-dejagnu: install-strip-dejagnu
+
+install-strip-dejagnu: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/dejagnu && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif dejagnu
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-bison info-bison
-maybe-info-bison:
-@if bison
-maybe-info-bison: info-bison
+.PHONY: maybe-info-dejagnu info-dejagnu
+maybe-info-dejagnu:
+@if dejagnu
+maybe-info-dejagnu: info-dejagnu
 
-info-bison: \
-    configure-bison 
+info-dejagnu: \
+    configure-dejagnu 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/Makefile ] || exit 0; \
+       @[ -f ./dejagnu/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -7837,25 +6860,25 @@ info-bison: \
                  info) \
          || exit 1
 
-@endif bison
+@endif dejagnu
 
-.PHONY: maybe-dvi-bison dvi-bison
-maybe-dvi-bison:
-@if bison
-maybe-dvi-bison: dvi-bison
+.PHONY: maybe-dvi-dejagnu dvi-dejagnu
+maybe-dvi-dejagnu:
+@if dejagnu
+maybe-dvi-dejagnu: dvi-dejagnu
 
-dvi-bison: \
-    configure-bison 
+dvi-dejagnu: \
+    configure-dejagnu 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/Makefile ] || exit 0; \
+       @[ -f ./dejagnu/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -7863,25 +6886,25 @@ dvi-bison: \
                  dvi) \
          || exit 1
 
-@endif bison
+@endif dejagnu
 
-.PHONY: maybe-pdf-bison pdf-bison
-maybe-pdf-bison:
-@if bison
-maybe-pdf-bison: pdf-bison
+.PHONY: maybe-pdf-dejagnu pdf-dejagnu
+maybe-pdf-dejagnu:
+@if dejagnu
+maybe-pdf-dejagnu: pdf-dejagnu
 
-pdf-bison: \
-    configure-bison 
+pdf-dejagnu: \
+    configure-dejagnu 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/Makefile ] || exit 0; \
+       @[ -f ./dejagnu/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -7889,25 +6912,25 @@ pdf-bison: \
                  pdf) \
          || exit 1
 
-@endif bison
+@endif dejagnu
 
-.PHONY: maybe-html-bison html-bison
-maybe-html-bison:
-@if bison
-maybe-html-bison: html-bison
+.PHONY: maybe-html-dejagnu html-dejagnu
+maybe-html-dejagnu:
+@if dejagnu
+maybe-html-dejagnu: html-dejagnu
 
-html-bison: \
-    configure-bison 
+html-dejagnu: \
+    configure-dejagnu 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/Makefile ] || exit 0; \
+       @[ -f ./dejagnu/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -7915,25 +6938,25 @@ html-bison: \
                  html) \
          || exit 1
 
-@endif bison
+@endif dejagnu
 
-.PHONY: maybe-TAGS-bison TAGS-bison
-maybe-TAGS-bison:
-@if bison
-maybe-TAGS-bison: TAGS-bison
+.PHONY: maybe-TAGS-dejagnu TAGS-dejagnu
+maybe-TAGS-dejagnu:
+@if dejagnu
+maybe-TAGS-dejagnu: TAGS-dejagnu
 
-TAGS-bison: \
-    configure-bison 
+TAGS-dejagnu: \
+    configure-dejagnu 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/Makefile ] || exit 0; \
+       @[ -f ./dejagnu/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -7941,26 +6964,26 @@ TAGS-bison: \
                  TAGS) \
          || exit 1
 
-@endif bison
+@endif dejagnu
 
-.PHONY: maybe-install-info-bison install-info-bison
-maybe-install-info-bison:
-@if bison
-maybe-install-info-bison: install-info-bison
+.PHONY: maybe-install-info-dejagnu install-info-dejagnu
+maybe-install-info-dejagnu:
+@if dejagnu
+maybe-install-info-dejagnu: install-info-dejagnu
 
-install-info-bison: \
-    configure-bison \
-    info-bison 
+install-info-dejagnu: \
+    configure-dejagnu \
+    info-dejagnu 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/Makefile ] || exit 0; \
+       @[ -f ./dejagnu/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -7968,26 +6991,26 @@ install-info-bison: \
                  install-info) \
          || exit 1
 
-@endif bison
+@endif dejagnu
 
-.PHONY: maybe-install-pdf-bison install-pdf-bison
-maybe-install-pdf-bison:
-@if bison
-maybe-install-pdf-bison: install-pdf-bison
+.PHONY: maybe-install-pdf-dejagnu install-pdf-dejagnu
+maybe-install-pdf-dejagnu:
+@if dejagnu
+maybe-install-pdf-dejagnu: install-pdf-dejagnu
 
-install-pdf-bison: \
-    configure-bison \
-    pdf-bison 
+install-pdf-dejagnu: \
+    configure-dejagnu \
+    pdf-dejagnu 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/Makefile ] || exit 0; \
+       @[ -f ./dejagnu/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -7995,26 +7018,26 @@ install-pdf-bison: \
                  install-pdf) \
          || exit 1
 
-@endif bison
+@endif dejagnu
 
-.PHONY: maybe-install-html-bison install-html-bison
-maybe-install-html-bison:
-@if bison
-maybe-install-html-bison: install-html-bison
+.PHONY: maybe-install-html-dejagnu install-html-dejagnu
+maybe-install-html-dejagnu:
+@if dejagnu
+maybe-install-html-dejagnu: install-html-dejagnu
 
-install-html-bison: \
-    configure-bison \
-    html-bison 
+install-html-dejagnu: \
+    configure-dejagnu \
+    html-dejagnu 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/Makefile ] || exit 0; \
+       @[ -f ./dejagnu/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8022,25 +7045,25 @@ install-html-bison: \
                  install-html) \
          || exit 1
 
-@endif bison
+@endif dejagnu
 
-.PHONY: maybe-installcheck-bison installcheck-bison
-maybe-installcheck-bison:
-@if bison
-maybe-installcheck-bison: installcheck-bison
+.PHONY: maybe-installcheck-dejagnu installcheck-dejagnu
+maybe-installcheck-dejagnu:
+@if dejagnu
+maybe-installcheck-dejagnu: installcheck-dejagnu
 
-installcheck-bison: \
-    configure-bison 
+installcheck-dejagnu: \
+    configure-dejagnu 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/Makefile ] || exit 0; \
+       @[ -f ./dejagnu/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8048,24 +7071,24 @@ installcheck-bison: \
                  installcheck) \
          || exit 1
 
-@endif bison
+@endif dejagnu
 
-.PHONY: maybe-mostlyclean-bison mostlyclean-bison
-maybe-mostlyclean-bison:
-@if bison
-maybe-mostlyclean-bison: mostlyclean-bison
+.PHONY: maybe-mostlyclean-dejagnu mostlyclean-dejagnu
+maybe-mostlyclean-dejagnu:
+@if dejagnu
+maybe-mostlyclean-dejagnu: mostlyclean-dejagnu
 
-mostlyclean-bison: 
+mostlyclean-dejagnu: 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/Makefile ] || exit 0; \
+       @[ -f ./dejagnu/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8073,24 +7096,24 @@ mostlyclean-bison:
                  mostlyclean) \
          || exit 1
 
-@endif bison
+@endif dejagnu
 
-.PHONY: maybe-clean-bison clean-bison
-maybe-clean-bison:
-@if bison
-maybe-clean-bison: clean-bison
+.PHONY: maybe-clean-dejagnu clean-dejagnu
+maybe-clean-dejagnu:
+@if dejagnu
+maybe-clean-dejagnu: clean-dejagnu
 
-clean-bison: 
+clean-dejagnu: 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/Makefile ] || exit 0; \
+       @[ -f ./dejagnu/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8098,24 +7121,24 @@ clean-bison:
                  clean) \
          || exit 1
 
-@endif bison
+@endif dejagnu
 
-.PHONY: maybe-distclean-bison distclean-bison
-maybe-distclean-bison:
-@if bison
-maybe-distclean-bison: distclean-bison
+.PHONY: maybe-distclean-dejagnu distclean-dejagnu
+maybe-distclean-dejagnu:
+@if dejagnu
+maybe-distclean-dejagnu: distclean-dejagnu
 
-distclean-bison: 
+distclean-dejagnu: 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/Makefile ] || exit 0; \
+       @[ -f ./dejagnu/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8123,24 +7146,24 @@ distclean-bison:
                  distclean) \
          || exit 1
 
-@endif bison
+@endif dejagnu
 
-.PHONY: maybe-maintainer-clean-bison maintainer-clean-bison
-maybe-maintainer-clean-bison:
-@if bison
-maybe-maintainer-clean-bison: maintainer-clean-bison
+.PHONY: maybe-maintainer-clean-dejagnu maintainer-clean-dejagnu
+maybe-maintainer-clean-dejagnu:
+@if dejagnu
+maybe-maintainer-clean-dejagnu: maintainer-clean-dejagnu
 
-maintainer-clean-bison: 
+maintainer-clean-dejagnu: 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/Makefile ] || exit 0; \
+       @[ -f ./dejagnu/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8148,116 +7171,129 @@ maintainer-clean-bison:
                  maintainer-clean) \
          || exit 1
 
-@endif bison
+@endif dejagnu
 
 
 
-.PHONY: configure-byacc maybe-configure-byacc
-maybe-configure-byacc:
+.PHONY: configure-etc maybe-configure-etc
+maybe-configure-etc:
 @if gcc-bootstrap
-configure-byacc: stage_current
+configure-etc: stage_current
 @endif gcc-bootstrap
-@if byacc
-maybe-configure-byacc: configure-byacc
-configure-byacc: 
+@if etc
+maybe-configure-etc: configure-etc
+configure-etc: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/byacc/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/byacc ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/byacc; \
-       cd "$(HOST_SUBDIR)/byacc" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/etc/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/etc; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/etc; \
+       cd "$(HOST_SUBDIR)/etc" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/byacc/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/etc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/byacc"; \
-       libsrcdir="$$s/byacc"; \
-       $(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 byacc
+@endif etc
 
 
 
 
 
-.PHONY: all-byacc maybe-all-byacc
-maybe-all-byacc:
+.PHONY: all-etc maybe-all-etc
+maybe-all-etc:
 @if gcc-bootstrap
-all-byacc: stage_current
+all-etc: stage_current
 @endif gcc-bootstrap
-@if byacc
-TARGET-byacc=all
-maybe-all-byacc: all-byacc
-all-byacc: configure-byacc
+@if etc
+TARGET-etc=all
+maybe-all-etc: all-etc
+all-etc: configure-etc
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/byacc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-byacc))
-@endif byacc
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/etc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-etc))
+@endif etc
 
 
 
 
-.PHONY: check-byacc maybe-check-byacc
-maybe-check-byacc:
-@if byacc
-maybe-check-byacc: check-byacc
+.PHONY: check-etc maybe-check-etc
+maybe-check-etc:
+@if etc
+maybe-check-etc: check-etc
 
-# This module is only tested in a native toolchain.
-check-byacc:
+check-etc:
        @: $(MAKE); $(unstage)
-       @if [ '$(host)' = '$(target)' ] ; then \
-         r=`${PWD_COMMAND}`; export r; \
-         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(HOST_EXPORTS) \
-         (cd $(HOST_SUBDIR)/byacc && \
-           $(MAKE) $(FLAGS_TO_PASS)  check); \
-       fi
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/etc && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif byacc
+@endif etc
 
-.PHONY: install-byacc maybe-install-byacc
-maybe-install-byacc:
-@if byacc
-maybe-install-byacc: install-byacc
+.PHONY: install-etc maybe-install-etc
+maybe-install-etc:
+@if etc
+maybe-install-etc: install-etc
 
-install-byacc: installdirs
+install-etc: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/byacc && \
+       (cd $(HOST_SUBDIR)/etc && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif byacc
+@endif etc
+
+.PHONY: install-strip-etc maybe-install-strip-etc
+maybe-install-strip-etc:
+@if etc
+maybe-install-strip-etc: install-strip-etc
+
+install-strip-etc: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/etc && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif etc
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-byacc info-byacc
-maybe-info-byacc:
-@if byacc
-maybe-info-byacc: info-byacc
+.PHONY: maybe-info-etc info-etc
+maybe-info-etc:
+@if etc
+maybe-info-etc: info-etc
 
-info-byacc: \
-    configure-byacc 
+info-etc: \
+    configure-etc 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/Makefile ] || exit 0; \
+       @[ -f ./etc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8265,25 +7301,25 @@ info-byacc: \
                  info) \
          || exit 1
 
-@endif byacc
+@endif etc
 
-.PHONY: maybe-dvi-byacc dvi-byacc
-maybe-dvi-byacc:
-@if byacc
-maybe-dvi-byacc: dvi-byacc
+.PHONY: maybe-dvi-etc dvi-etc
+maybe-dvi-etc:
+@if etc
+maybe-dvi-etc: dvi-etc
 
-dvi-byacc: \
-    configure-byacc 
+dvi-etc: \
+    configure-etc 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/Makefile ] || exit 0; \
+       @[ -f ./etc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8291,25 +7327,25 @@ dvi-byacc: \
                  dvi) \
          || exit 1
 
-@endif byacc
+@endif etc
 
-.PHONY: maybe-pdf-byacc pdf-byacc
-maybe-pdf-byacc:
-@if byacc
-maybe-pdf-byacc: pdf-byacc
+.PHONY: maybe-pdf-etc pdf-etc
+maybe-pdf-etc:
+@if etc
+maybe-pdf-etc: pdf-etc
 
-pdf-byacc: \
-    configure-byacc 
+pdf-etc: \
+    configure-etc 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/Makefile ] || exit 0; \
+       @[ -f ./etc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8317,25 +7353,25 @@ pdf-byacc: \
                  pdf) \
          || exit 1
 
-@endif byacc
+@endif etc
 
-.PHONY: maybe-html-byacc html-byacc
-maybe-html-byacc:
-@if byacc
-maybe-html-byacc: html-byacc
+.PHONY: maybe-html-etc html-etc
+maybe-html-etc:
+@if etc
+maybe-html-etc: html-etc
 
-html-byacc: \
-    configure-byacc 
+html-etc: \
+    configure-etc 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/Makefile ] || exit 0; \
+       @[ -f ./etc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8343,25 +7379,25 @@ html-byacc: \
                  html) \
          || exit 1
 
-@endif byacc
+@endif etc
 
-.PHONY: maybe-TAGS-byacc TAGS-byacc
-maybe-TAGS-byacc:
-@if byacc
-maybe-TAGS-byacc: TAGS-byacc
+.PHONY: maybe-TAGS-etc TAGS-etc
+maybe-TAGS-etc:
+@if etc
+maybe-TAGS-etc: TAGS-etc
 
-TAGS-byacc: \
-    configure-byacc 
+TAGS-etc: \
+    configure-etc 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/Makefile ] || exit 0; \
+       @[ -f ./etc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8369,26 +7405,26 @@ TAGS-byacc: \
                  TAGS) \
          || exit 1
 
-@endif byacc
+@endif etc
 
-.PHONY: maybe-install-info-byacc install-info-byacc
-maybe-install-info-byacc:
-@if byacc
-maybe-install-info-byacc: install-info-byacc
+.PHONY: maybe-install-info-etc install-info-etc
+maybe-install-info-etc:
+@if etc
+maybe-install-info-etc: install-info-etc
 
-install-info-byacc: \
-    configure-byacc \
-    info-byacc 
+install-info-etc: \
+    configure-etc \
+    info-etc 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/Makefile ] || exit 0; \
+       @[ -f ./etc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8396,26 +7432,26 @@ install-info-byacc: \
                  install-info) \
          || exit 1
 
-@endif byacc
+@endif etc
 
-.PHONY: maybe-install-pdf-byacc install-pdf-byacc
-maybe-install-pdf-byacc:
-@if byacc
-maybe-install-pdf-byacc: install-pdf-byacc
+.PHONY: maybe-install-pdf-etc install-pdf-etc
+maybe-install-pdf-etc:
+@if etc
+maybe-install-pdf-etc: install-pdf-etc
 
-install-pdf-byacc: \
-    configure-byacc \
-    pdf-byacc 
+install-pdf-etc: \
+    configure-etc \
+    pdf-etc 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/Makefile ] || exit 0; \
+       @[ -f ./etc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8423,26 +7459,26 @@ install-pdf-byacc: \
                  install-pdf) \
          || exit 1
 
-@endif byacc
+@endif etc
 
-.PHONY: maybe-install-html-byacc install-html-byacc
-maybe-install-html-byacc:
-@if byacc
-maybe-install-html-byacc: install-html-byacc
+.PHONY: maybe-install-html-etc install-html-etc
+maybe-install-html-etc:
+@if etc
+maybe-install-html-etc: install-html-etc
 
-install-html-byacc: \
-    configure-byacc \
-    html-byacc 
+install-html-etc: \
+    configure-etc \
+    html-etc 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/Makefile ] || exit 0; \
+       @[ -f ./etc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8450,25 +7486,25 @@ install-html-byacc: \
                  install-html) \
          || exit 1
 
-@endif byacc
+@endif etc
 
-.PHONY: maybe-installcheck-byacc installcheck-byacc
-maybe-installcheck-byacc:
-@if byacc
-maybe-installcheck-byacc: installcheck-byacc
+.PHONY: maybe-installcheck-etc installcheck-etc
+maybe-installcheck-etc:
+@if etc
+maybe-installcheck-etc: installcheck-etc
 
-installcheck-byacc: \
-    configure-byacc 
+installcheck-etc: \
+    configure-etc 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/Makefile ] || exit 0; \
+       @[ -f ./etc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8476,24 +7512,24 @@ installcheck-byacc: \
                  installcheck) \
          || exit 1
 
-@endif byacc
+@endif etc
 
-.PHONY: maybe-mostlyclean-byacc mostlyclean-byacc
-maybe-mostlyclean-byacc:
-@if byacc
-maybe-mostlyclean-byacc: mostlyclean-byacc
+.PHONY: maybe-mostlyclean-etc mostlyclean-etc
+maybe-mostlyclean-etc:
+@if etc
+maybe-mostlyclean-etc: mostlyclean-etc
 
-mostlyclean-byacc: 
+mostlyclean-etc: 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/Makefile ] || exit 0; \
+       @[ -f ./etc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8501,24 +7537,24 @@ mostlyclean-byacc:
                  mostlyclean) \
          || exit 1
 
-@endif byacc
-
-.PHONY: maybe-clean-byacc clean-byacc
-maybe-clean-byacc:
-@if byacc
-maybe-clean-byacc: clean-byacc
+@endif etc
 
-clean-byacc: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./byacc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: maybe-clean-etc clean-etc
+maybe-clean-etc:
+@if etc
+maybe-clean-etc: clean-etc
+
+clean-etc: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./etc/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8526,24 +7562,24 @@ clean-byacc:
                  clean) \
          || exit 1
 
-@endif byacc
+@endif etc
 
-.PHONY: maybe-distclean-byacc distclean-byacc
-maybe-distclean-byacc:
-@if byacc
-maybe-distclean-byacc: distclean-byacc
+.PHONY: maybe-distclean-etc distclean-etc
+maybe-distclean-etc:
+@if etc
+maybe-distclean-etc: distclean-etc
 
-distclean-byacc: 
+distclean-etc: 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/Makefile ] || exit 0; \
+       @[ -f ./etc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8551,24 +7587,24 @@ distclean-byacc:
                  distclean) \
          || exit 1
 
-@endif byacc
+@endif etc
 
-.PHONY: maybe-maintainer-clean-byacc maintainer-clean-byacc
-maybe-maintainer-clean-byacc:
-@if byacc
-maybe-maintainer-clean-byacc: maintainer-clean-byacc
+.PHONY: maybe-maintainer-clean-etc maintainer-clean-etc
+maybe-maintainer-clean-etc:
+@if etc
+maybe-maintainer-clean-etc: maintainer-clean-etc
 
-maintainer-clean-byacc: 
+maintainer-clean-etc: 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/Makefile ] || exit 0; \
+       @[ -f ./etc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8576,113 +7612,132 @@ maintainer-clean-byacc:
                  maintainer-clean) \
          || exit 1
 
-@endif byacc
+@endif etc
 
 
 
-.PHONY: configure-bzip2 maybe-configure-bzip2
-maybe-configure-bzip2:
+.PHONY: configure-fastjar maybe-configure-fastjar
+maybe-configure-fastjar:
 @if gcc-bootstrap
-configure-bzip2: stage_current
+configure-fastjar: stage_current
 @endif gcc-bootstrap
-@if bzip2
-maybe-configure-bzip2: configure-bzip2
-configure-bzip2: 
+@if fastjar
+maybe-configure-fastjar: configure-fastjar
+configure-fastjar: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/bzip2/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bzip2 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/bzip2; \
-       cd "$(HOST_SUBDIR)/bzip2" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/fastjar/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fastjar; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/fastjar; \
+       cd "$(HOST_SUBDIR)/fastjar" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/bzip2/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/fastjar/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bzip2"; \
-       libsrcdir="$$s/bzip2"; \
-       $(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 bzip2
+@endif fastjar
 
 
 
 
 
-.PHONY: all-bzip2 maybe-all-bzip2
-maybe-all-bzip2:
+.PHONY: all-fastjar maybe-all-fastjar
+maybe-all-fastjar:
 @if gcc-bootstrap
-all-bzip2: stage_current
+all-fastjar: stage_current
 @endif gcc-bootstrap
-@if bzip2
-TARGET-bzip2=all
-maybe-all-bzip2: all-bzip2
-all-bzip2: configure-bzip2
+@if fastjar
+TARGET-fastjar=all
+maybe-all-fastjar: all-fastjar
+all-fastjar: configure-fastjar
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/bzip2 && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-bzip2))
-@endif bzip2
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/fastjar && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-fastjar))
+@endif fastjar
 
 
 
 
-.PHONY: check-bzip2 maybe-check-bzip2
-maybe-check-bzip2:
-@if bzip2
-maybe-check-bzip2: check-bzip2
+.PHONY: check-fastjar maybe-check-fastjar
+maybe-check-fastjar:
+@if fastjar
+maybe-check-fastjar: check-fastjar
+
+# This module is only tested in a native toolchain.
+check-fastjar:
+       @: $(MAKE); $(unstage)
+       @if [ '$(host)' = '$(target)' ]; then \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+         $(HOST_EXPORTS)  \
+         (cd $(HOST_SUBDIR)/fastjar && \
+           $(MAKE) $(FLAGS_TO_PASS)  check)
+       fi
+
+@endif fastjar
+
+.PHONY: install-fastjar maybe-install-fastjar
+maybe-install-fastjar:
+@if fastjar
+maybe-install-fastjar: install-fastjar
 
-check-bzip2:
+install-fastjar: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/bzip2 && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       (cd $(HOST_SUBDIR)/fastjar && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif bzip2
+@endif fastjar
 
-.PHONY: install-bzip2 maybe-install-bzip2
-maybe-install-bzip2:
-@if bzip2
-maybe-install-bzip2: install-bzip2
+.PHONY: install-strip-fastjar maybe-install-strip-fastjar
+maybe-install-strip-fastjar:
+@if fastjar
+maybe-install-strip-fastjar: install-strip-fastjar
 
-install-bzip2: installdirs
+install-strip-fastjar: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/bzip2 && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+       (cd $(HOST_SUBDIR)/fastjar && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif bzip2
+@endif fastjar
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-bzip2 info-bzip2
-maybe-info-bzip2:
-@if bzip2
-maybe-info-bzip2: info-bzip2
+.PHONY: maybe-info-fastjar info-fastjar
+maybe-info-fastjar:
+@if fastjar
+maybe-info-fastjar: info-fastjar
 
-info-bzip2: \
-    configure-bzip2 
+info-fastjar: \
+    configure-fastjar 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -f ./fastjar/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8690,25 +7745,25 @@ info-bzip2: \
                  info) \
          || exit 1
 
-@endif bzip2
+@endif fastjar
 
-.PHONY: maybe-dvi-bzip2 dvi-bzip2
-maybe-dvi-bzip2:
-@if bzip2
-maybe-dvi-bzip2: dvi-bzip2
+.PHONY: maybe-dvi-fastjar dvi-fastjar
+maybe-dvi-fastjar:
+@if fastjar
+maybe-dvi-fastjar: dvi-fastjar
 
-dvi-bzip2: \
-    configure-bzip2 
+dvi-fastjar: \
+    configure-fastjar 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -f ./fastjar/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8716,25 +7771,25 @@ dvi-bzip2: \
                  dvi) \
          || exit 1
 
-@endif bzip2
+@endif fastjar
 
-.PHONY: maybe-pdf-bzip2 pdf-bzip2
-maybe-pdf-bzip2:
-@if bzip2
-maybe-pdf-bzip2: pdf-bzip2
+.PHONY: maybe-pdf-fastjar pdf-fastjar
+maybe-pdf-fastjar:
+@if fastjar
+maybe-pdf-fastjar: pdf-fastjar
 
-pdf-bzip2: \
-    configure-bzip2 
+pdf-fastjar: \
+    configure-fastjar 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -f ./fastjar/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8742,25 +7797,25 @@ pdf-bzip2: \
                  pdf) \
          || exit 1
 
-@endif bzip2
+@endif fastjar
 
-.PHONY: maybe-html-bzip2 html-bzip2
-maybe-html-bzip2:
-@if bzip2
-maybe-html-bzip2: html-bzip2
+.PHONY: maybe-html-fastjar html-fastjar
+maybe-html-fastjar:
+@if fastjar
+maybe-html-fastjar: html-fastjar
 
-html-bzip2: \
-    configure-bzip2 
+html-fastjar: \
+    configure-fastjar 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -f ./fastjar/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8768,25 +7823,25 @@ html-bzip2: \
                  html) \
          || exit 1
 
-@endif bzip2
+@endif fastjar
 
-.PHONY: maybe-TAGS-bzip2 TAGS-bzip2
-maybe-TAGS-bzip2:
-@if bzip2
-maybe-TAGS-bzip2: TAGS-bzip2
+.PHONY: maybe-TAGS-fastjar TAGS-fastjar
+maybe-TAGS-fastjar:
+@if fastjar
+maybe-TAGS-fastjar: TAGS-fastjar
 
-TAGS-bzip2: \
-    configure-bzip2 
+TAGS-fastjar: \
+    configure-fastjar 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -f ./fastjar/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8794,26 +7849,26 @@ TAGS-bzip2: \
                  TAGS) \
          || exit 1
 
-@endif bzip2
+@endif fastjar
 
-.PHONY: maybe-install-info-bzip2 install-info-bzip2
-maybe-install-info-bzip2:
-@if bzip2
-maybe-install-info-bzip2: install-info-bzip2
+.PHONY: maybe-install-info-fastjar install-info-fastjar
+maybe-install-info-fastjar:
+@if fastjar
+maybe-install-info-fastjar: install-info-fastjar
 
-install-info-bzip2: \
-    configure-bzip2 \
-    info-bzip2 
+install-info-fastjar: \
+    configure-fastjar \
+    info-fastjar 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -f ./fastjar/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8821,26 +7876,26 @@ install-info-bzip2: \
                  install-info) \
          || exit 1
 
-@endif bzip2
+@endif fastjar
 
-.PHONY: maybe-install-pdf-bzip2 install-pdf-bzip2
-maybe-install-pdf-bzip2:
-@if bzip2
-maybe-install-pdf-bzip2: install-pdf-bzip2
+.PHONY: maybe-install-pdf-fastjar install-pdf-fastjar
+maybe-install-pdf-fastjar:
+@if fastjar
+maybe-install-pdf-fastjar: install-pdf-fastjar
 
-install-pdf-bzip2: \
-    configure-bzip2 \
-    pdf-bzip2 
+install-pdf-fastjar: \
+    configure-fastjar \
+    pdf-fastjar 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -f ./fastjar/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8848,26 +7903,26 @@ install-pdf-bzip2: \
                  install-pdf) \
          || exit 1
 
-@endif bzip2
+@endif fastjar
 
-.PHONY: maybe-install-html-bzip2 install-html-bzip2
-maybe-install-html-bzip2:
-@if bzip2
-maybe-install-html-bzip2: install-html-bzip2
+.PHONY: maybe-install-html-fastjar install-html-fastjar
+maybe-install-html-fastjar:
+@if fastjar
+maybe-install-html-fastjar: install-html-fastjar
 
-install-html-bzip2: \
-    configure-bzip2 \
-    html-bzip2 
+install-html-fastjar: \
+    configure-fastjar \
+    html-fastjar 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -f ./fastjar/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8875,25 +7930,25 @@ install-html-bzip2: \
                  install-html) \
          || exit 1
 
-@endif bzip2
+@endif fastjar
 
-.PHONY: maybe-installcheck-bzip2 installcheck-bzip2
-maybe-installcheck-bzip2:
-@if bzip2
-maybe-installcheck-bzip2: installcheck-bzip2
+.PHONY: maybe-installcheck-fastjar installcheck-fastjar
+maybe-installcheck-fastjar:
+@if fastjar
+maybe-installcheck-fastjar: installcheck-fastjar
 
-installcheck-bzip2: \
-    configure-bzip2 
+installcheck-fastjar: \
+    configure-fastjar 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -f ./fastjar/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8901,24 +7956,24 @@ installcheck-bzip2: \
                  installcheck) \
          || exit 1
 
-@endif bzip2
+@endif fastjar
 
-.PHONY: maybe-mostlyclean-bzip2 mostlyclean-bzip2
-maybe-mostlyclean-bzip2:
-@if bzip2
-maybe-mostlyclean-bzip2: mostlyclean-bzip2
+.PHONY: maybe-mostlyclean-fastjar mostlyclean-fastjar
+maybe-mostlyclean-fastjar:
+@if fastjar
+maybe-mostlyclean-fastjar: mostlyclean-fastjar
 
-mostlyclean-bzip2: 
+mostlyclean-fastjar: 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -f ./fastjar/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8926,24 +7981,24 @@ mostlyclean-bzip2:
                  mostlyclean) \
          || exit 1
 
-@endif bzip2
+@endif fastjar
 
-.PHONY: maybe-clean-bzip2 clean-bzip2
-maybe-clean-bzip2:
-@if bzip2
-maybe-clean-bzip2: clean-bzip2
+.PHONY: maybe-clean-fastjar clean-fastjar
+maybe-clean-fastjar:
+@if fastjar
+maybe-clean-fastjar: clean-fastjar
 
-clean-bzip2: 
+clean-fastjar: 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -f ./fastjar/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8951,24 +8006,24 @@ clean-bzip2:
                  clean) \
          || exit 1
 
-@endif bzip2
+@endif fastjar
 
-.PHONY: maybe-distclean-bzip2 distclean-bzip2
-maybe-distclean-bzip2:
-@if bzip2
-maybe-distclean-bzip2: distclean-bzip2
+.PHONY: maybe-distclean-fastjar distclean-fastjar
+maybe-distclean-fastjar:
+@if fastjar
+maybe-distclean-fastjar: distclean-fastjar
 
-distclean-bzip2: 
+distclean-fastjar: 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -f ./fastjar/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -8976,24 +8031,24 @@ distclean-bzip2:
                  distclean) \
          || exit 1
 
-@endif bzip2
+@endif fastjar
 
-.PHONY: maybe-maintainer-clean-bzip2 maintainer-clean-bzip2
-maybe-maintainer-clean-bzip2:
-@if bzip2
-maybe-maintainer-clean-bzip2: maintainer-clean-bzip2
+.PHONY: maybe-maintainer-clean-fastjar maintainer-clean-fastjar
+maybe-maintainer-clean-fastjar:
+@if fastjar
+maybe-maintainer-clean-fastjar: maintainer-clean-fastjar
 
-maintainer-clean-bzip2: 
+maintainer-clean-fastjar: 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -f ./fastjar/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9001,113 +8056,580 @@ maintainer-clean-bzip2:
                  maintainer-clean) \
          || exit 1
 
-@endif bzip2
+@endif fastjar
 
 
 
-.PHONY: configure-dejagnu maybe-configure-dejagnu
-maybe-configure-dejagnu:
+.PHONY: configure-fixincludes maybe-configure-fixincludes
+maybe-configure-fixincludes:
 @if gcc-bootstrap
-configure-dejagnu: stage_current
+configure-fixincludes: stage_current
 @endif gcc-bootstrap
-@if dejagnu
-maybe-configure-dejagnu: configure-dejagnu
-configure-dejagnu: 
-       @: $(MAKE); $(unstage)
+@if fixincludes
+maybe-configure-fixincludes: configure-fixincludes
+configure-fixincludes: 
        @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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/dejagnu; \
-       cd "$(HOST_SUBDIR)/dejagnu" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/fixincludes; \
+       cd "$(HOST_SUBDIR)/fixincludes" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/dejagnu/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/dejagnu"; \
-       libsrcdir="$$s/dejagnu"; \
-       $(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 dejagnu
+@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-dejagnu maybe-all-dejagnu
-maybe-all-dejagnu:
+.PHONY: all-fixincludes maybe-all-fixincludes
+maybe-all-fixincludes:
 @if gcc-bootstrap
-all-dejagnu: stage_current
+all-fixincludes: stage_current
 @endif gcc-bootstrap
-@if dejagnu
-TARGET-dejagnu=all
-maybe-all-dejagnu: all-dejagnu
-all-dejagnu: configure-dejagnu
-       @: $(MAKE); $(unstage)
+@if fixincludes
+TARGET-fixincludes=all
+maybe-all-fixincludes: all-fixincludes
+all-fixincludes: configure-fixincludes
        @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) $(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) \
-       (cd $(HOST_SUBDIR)/dejagnu && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-dejagnu))
-@endif dejagnu
+       $(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-dejagnu maybe-check-dejagnu
-maybe-check-dejagnu:
-@if dejagnu
-maybe-check-dejagnu: check-dejagnu
 
-check-dejagnu:
+.PHONY: check-fixincludes maybe-check-fixincludes
+maybe-check-fixincludes:
+@if fixincludes
+maybe-check-fixincludes: check-fixincludes
+
+check-fixincludes:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/dejagnu && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/fixincludes && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
-@endif dejagnu
+@endif fixincludes
 
-.PHONY: install-dejagnu maybe-install-dejagnu
-maybe-install-dejagnu:
-@if dejagnu
-maybe-install-dejagnu: install-dejagnu
+.PHONY: install-fixincludes maybe-install-fixincludes
+maybe-install-fixincludes:
+@if fixincludes
+maybe-install-fixincludes: install-fixincludes
 
-install-dejagnu: installdirs
+install-fixincludes: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/dejagnu && \
+       (cd $(HOST_SUBDIR)/fixincludes && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif dejagnu
+@endif fixincludes
+
+.PHONY: install-strip-fixincludes maybe-install-strip-fixincludes
+maybe-install-strip-fixincludes:
+@if fixincludes
+maybe-install-strip-fixincludes: install-strip-fixincludes
+
+install-strip-fixincludes: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/fixincludes && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif fixincludes
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-dejagnu info-dejagnu
-maybe-info-dejagnu:
-@if dejagnu
-maybe-info-dejagnu: info-dejagnu
+.PHONY: maybe-info-fixincludes info-fixincludes
+maybe-info-fixincludes:
+@if fixincludes
+maybe-info-fixincludes: info-fixincludes
 
-info-dejagnu: \
-    configure-dejagnu 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dejagnu/Makefile ] || exit 0; \
+info-fixincludes: \
+    configure-fixincludes 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dejagnu" ; \
-       (cd $(HOST_SUBDIR)/dejagnu && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9115,25 +8637,24 @@ info-dejagnu: \
                  info) \
          || exit 1
 
-@endif dejagnu
+@endif fixincludes
 
-.PHONY: maybe-dvi-dejagnu dvi-dejagnu
-maybe-dvi-dejagnu:
-@if dejagnu
-maybe-dvi-dejagnu: dvi-dejagnu
+.PHONY: maybe-dvi-fixincludes dvi-fixincludes
+maybe-dvi-fixincludes:
+@if fixincludes
+maybe-dvi-fixincludes: dvi-fixincludes
 
-dvi-dejagnu: \
-    configure-dejagnu 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dejagnu/Makefile ] || exit 0; \
+dvi-fixincludes: \
+    configure-fixincludes 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dejagnu" ; \
-       (cd $(HOST_SUBDIR)/dejagnu && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9141,25 +8662,24 @@ dvi-dejagnu: \
                  dvi) \
          || exit 1
 
-@endif dejagnu
+@endif fixincludes
 
-.PHONY: maybe-pdf-dejagnu pdf-dejagnu
-maybe-pdf-dejagnu:
-@if dejagnu
-maybe-pdf-dejagnu: pdf-dejagnu
+.PHONY: maybe-pdf-fixincludes pdf-fixincludes
+maybe-pdf-fixincludes:
+@if fixincludes
+maybe-pdf-fixincludes: pdf-fixincludes
 
-pdf-dejagnu: \
-    configure-dejagnu 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dejagnu/Makefile ] || exit 0; \
+pdf-fixincludes: \
+    configure-fixincludes 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dejagnu" ; \
-       (cd $(HOST_SUBDIR)/dejagnu && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9167,25 +8687,24 @@ pdf-dejagnu: \
                  pdf) \
          || exit 1
 
-@endif dejagnu
+@endif fixincludes
 
-.PHONY: maybe-html-dejagnu html-dejagnu
-maybe-html-dejagnu:
-@if dejagnu
-maybe-html-dejagnu: html-dejagnu
+.PHONY: maybe-html-fixincludes html-fixincludes
+maybe-html-fixincludes:
+@if fixincludes
+maybe-html-fixincludes: html-fixincludes
 
-html-dejagnu: \
-    configure-dejagnu 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dejagnu/Makefile ] || exit 0; \
+html-fixincludes: \
+    configure-fixincludes 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dejagnu" ; \
-       (cd $(HOST_SUBDIR)/dejagnu && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9193,52 +8712,35 @@ html-dejagnu: \
                  html) \
          || exit 1
 
-@endif dejagnu
+@endif fixincludes
 
-.PHONY: maybe-TAGS-dejagnu TAGS-dejagnu
-maybe-TAGS-dejagnu:
-@if dejagnu
-maybe-TAGS-dejagnu: TAGS-dejagnu
+.PHONY: maybe-TAGS-fixincludes TAGS-fixincludes
+maybe-TAGS-fixincludes:
+@if fixincludes
+maybe-TAGS-fixincludes: TAGS-fixincludes
 
-TAGS-dejagnu: \
-    configure-dejagnu 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dejagnu/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dejagnu" ; \
-       (cd $(HOST_SUBDIR)/dejagnu && \
-         $(MAKE) $(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
+# fixincludes doesn't support TAGS.
+TAGS-fixincludes:
 
-@endif dejagnu
+@endif fixincludes
 
-.PHONY: maybe-install-info-dejagnu install-info-dejagnu
-maybe-install-info-dejagnu:
-@if dejagnu
-maybe-install-info-dejagnu: install-info-dejagnu
+.PHONY: maybe-install-info-fixincludes install-info-fixincludes
+maybe-install-info-fixincludes:
+@if fixincludes
+maybe-install-info-fixincludes: install-info-fixincludes
 
-install-info-dejagnu: \
-    configure-dejagnu \
-    info-dejagnu 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dejagnu/Makefile ] || exit 0; \
+install-info-fixincludes: \
+    configure-fixincludes \
+    info-fixincludes 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dejagnu" ; \
-       (cd $(HOST_SUBDIR)/dejagnu && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9246,26 +8748,25 @@ install-info-dejagnu: \
                  install-info) \
          || exit 1
 
-@endif dejagnu
+@endif fixincludes
 
-.PHONY: maybe-install-pdf-dejagnu install-pdf-dejagnu
-maybe-install-pdf-dejagnu:
-@if dejagnu
-maybe-install-pdf-dejagnu: install-pdf-dejagnu
+.PHONY: maybe-install-pdf-fixincludes install-pdf-fixincludes
+maybe-install-pdf-fixincludes:
+@if fixincludes
+maybe-install-pdf-fixincludes: install-pdf-fixincludes
 
-install-pdf-dejagnu: \
-    configure-dejagnu \
-    pdf-dejagnu 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dejagnu/Makefile ] || exit 0; \
+install-pdf-fixincludes: \
+    configure-fixincludes \
+    pdf-fixincludes 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dejagnu" ; \
-       (cd $(HOST_SUBDIR)/dejagnu && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9273,26 +8774,25 @@ install-pdf-dejagnu: \
                  install-pdf) \
          || exit 1
 
-@endif dejagnu
+@endif fixincludes
 
-.PHONY: maybe-install-html-dejagnu install-html-dejagnu
-maybe-install-html-dejagnu:
-@if dejagnu
-maybe-install-html-dejagnu: install-html-dejagnu
+.PHONY: maybe-install-html-fixincludes install-html-fixincludes
+maybe-install-html-fixincludes:
+@if fixincludes
+maybe-install-html-fixincludes: install-html-fixincludes
 
-install-html-dejagnu: \
-    configure-dejagnu \
-    html-dejagnu 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dejagnu/Makefile ] || exit 0; \
+install-html-fixincludes: \
+    configure-fixincludes \
+    html-fixincludes 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dejagnu" ; \
-       (cd $(HOST_SUBDIR)/dejagnu && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9300,25 +8800,24 @@ install-html-dejagnu: \
                  install-html) \
          || exit 1
 
-@endif dejagnu
+@endif fixincludes
 
-.PHONY: maybe-installcheck-dejagnu installcheck-dejagnu
-maybe-installcheck-dejagnu:
-@if dejagnu
-maybe-installcheck-dejagnu: installcheck-dejagnu
+.PHONY: maybe-installcheck-fixincludes installcheck-fixincludes
+maybe-installcheck-fixincludes:
+@if fixincludes
+maybe-installcheck-fixincludes: installcheck-fixincludes
 
-installcheck-dejagnu: \
-    configure-dejagnu 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dejagnu/Makefile ] || exit 0; \
+installcheck-fixincludes: \
+    configure-fixincludes 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dejagnu" ; \
-       (cd $(HOST_SUBDIR)/dejagnu && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9326,24 +8825,23 @@ installcheck-dejagnu: \
                  installcheck) \
          || exit 1
 
-@endif dejagnu
+@endif fixincludes
 
-.PHONY: maybe-mostlyclean-dejagnu mostlyclean-dejagnu
-maybe-mostlyclean-dejagnu:
-@if dejagnu
-maybe-mostlyclean-dejagnu: mostlyclean-dejagnu
+.PHONY: maybe-mostlyclean-fixincludes mostlyclean-fixincludes
+maybe-mostlyclean-fixincludes:
+@if fixincludes
+maybe-mostlyclean-fixincludes: mostlyclean-fixincludes
 
-mostlyclean-dejagnu: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dejagnu/Makefile ] || exit 0; \
+mostlyclean-fixincludes: 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dejagnu" ; \
-       (cd $(HOST_SUBDIR)/dejagnu && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9351,24 +8849,23 @@ mostlyclean-dejagnu:
                  mostlyclean) \
          || exit 1
 
-@endif dejagnu
+@endif fixincludes
 
-.PHONY: maybe-clean-dejagnu clean-dejagnu
-maybe-clean-dejagnu:
-@if dejagnu
-maybe-clean-dejagnu: clean-dejagnu
+.PHONY: maybe-clean-fixincludes clean-fixincludes
+maybe-clean-fixincludes:
+@if fixincludes
+maybe-clean-fixincludes: clean-fixincludes
 
-clean-dejagnu: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dejagnu/Makefile ] || exit 0; \
+clean-fixincludes: 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dejagnu" ; \
-       (cd $(HOST_SUBDIR)/dejagnu && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9376,24 +8873,23 @@ clean-dejagnu:
                  clean) \
          || exit 1
 
-@endif dejagnu
+@endif fixincludes
 
-.PHONY: maybe-distclean-dejagnu distclean-dejagnu
-maybe-distclean-dejagnu:
-@if dejagnu
-maybe-distclean-dejagnu: distclean-dejagnu
+.PHONY: maybe-distclean-fixincludes distclean-fixincludes
+maybe-distclean-fixincludes:
+@if fixincludes
+maybe-distclean-fixincludes: distclean-fixincludes
 
-distclean-dejagnu: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dejagnu/Makefile ] || exit 0; \
+distclean-fixincludes: 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dejagnu" ; \
-       (cd $(HOST_SUBDIR)/dejagnu && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9401,24 +8897,23 @@ distclean-dejagnu:
                  distclean) \
          || exit 1
 
-@endif dejagnu
+@endif fixincludes
 
-.PHONY: maybe-maintainer-clean-dejagnu maintainer-clean-dejagnu
-maybe-maintainer-clean-dejagnu:
-@if dejagnu
-maybe-maintainer-clean-dejagnu: maintainer-clean-dejagnu
+.PHONY: maybe-maintainer-clean-fixincludes maintainer-clean-fixincludes
+maybe-maintainer-clean-fixincludes:
+@if fixincludes
+maybe-maintainer-clean-fixincludes: maintainer-clean-fixincludes
 
-maintainer-clean-dejagnu: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dejagnu/Makefile ] || exit 0; \
+maintainer-clean-fixincludes: 
+       @[ -f ./fixincludes/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dejagnu" ; \
-       (cd $(HOST_SUBDIR)/dejagnu && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9426,113 +8921,132 @@ maintainer-clean-dejagnu:
                  maintainer-clean) \
          || exit 1
 
-@endif dejagnu
+@endif fixincludes
 
 
 
-.PHONY: configure-diff maybe-configure-diff
-maybe-configure-diff:
+.PHONY: configure-flex maybe-configure-flex
+maybe-configure-flex:
 @if gcc-bootstrap
-configure-diff: stage_current
+configure-flex: stage_current
 @endif gcc-bootstrap
-@if diff
-maybe-configure-diff: configure-diff
-configure-diff: 
+@if flex
+maybe-configure-flex: configure-flex
+configure-flex: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/diff/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/diff ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/diff; \
-       cd "$(HOST_SUBDIR)/diff" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/flex/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/flex; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/flex; \
+       cd "$(HOST_SUBDIR)/flex" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/diff/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/flex/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/diff"; \
-       libsrcdir="$$s/diff"; \
-       $(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 diff
+@endif flex
 
 
 
 
 
-.PHONY: all-diff maybe-all-diff
-maybe-all-diff:
+.PHONY: all-flex maybe-all-flex
+maybe-all-flex:
 @if gcc-bootstrap
-all-diff: stage_current
+all-flex: stage_current
 @endif gcc-bootstrap
-@if diff
-TARGET-diff=all
-maybe-all-diff: all-diff
-all-diff: configure-diff
+@if flex
+TARGET-flex=all
+maybe-all-flex: all-flex
+all-flex: configure-flex
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/diff && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-diff))
-@endif diff
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/flex && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-flex))
+@endif flex
+
+
+
 
+.PHONY: check-flex maybe-check-flex
+maybe-check-flex:
+@if flex
+maybe-check-flex: check-flex
 
+# This module is only tested in a native toolchain.
+check-flex:
+       @: $(MAKE); $(unstage)
+       @if [ '$(host)' = '$(target)' ]; then \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+         $(HOST_EXPORTS)  \
+         (cd $(HOST_SUBDIR)/flex && \
+           $(MAKE) $(FLAGS_TO_PASS)  check)
+       fi
 
+@endif flex
 
-.PHONY: check-diff maybe-check-diff
-maybe-check-diff:
-@if diff
-maybe-check-diff: check-diff
+.PHONY: install-flex maybe-install-flex
+maybe-install-flex:
+@if flex
+maybe-install-flex: install-flex
 
-check-diff:
+install-flex: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/diff && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       (cd $(HOST_SUBDIR)/flex && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif diff
+@endif flex
 
-.PHONY: install-diff maybe-install-diff
-maybe-install-diff:
-@if diff
-maybe-install-diff: install-diff
+.PHONY: install-strip-flex maybe-install-strip-flex
+maybe-install-strip-flex:
+@if flex
+maybe-install-strip-flex: install-strip-flex
 
-install-diff: installdirs
+install-strip-flex: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/diff && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+       (cd $(HOST_SUBDIR)/flex && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif diff
+@endif flex
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-diff info-diff
-maybe-info-diff:
-@if diff
-maybe-info-diff: info-diff
+.PHONY: maybe-info-flex info-flex
+maybe-info-flex:
+@if flex
+maybe-info-flex: info-flex
 
-info-diff: \
-    configure-diff 
+info-flex: \
+    configure-flex 
        @: $(MAKE); $(unstage)
-       @[ -f ./diff/Makefile ] || exit 0; \
+       @[ -f ./flex/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9540,25 +9054,25 @@ info-diff: \
                  info) \
          || exit 1
 
-@endif diff
+@endif flex
 
-.PHONY: maybe-dvi-diff dvi-diff
-maybe-dvi-diff:
-@if diff
-maybe-dvi-diff: dvi-diff
+.PHONY: maybe-dvi-flex dvi-flex
+maybe-dvi-flex:
+@if flex
+maybe-dvi-flex: dvi-flex
 
-dvi-diff: \
-    configure-diff 
+dvi-flex: \
+    configure-flex 
        @: $(MAKE); $(unstage)
-       @[ -f ./diff/Makefile ] || exit 0; \
+       @[ -f ./flex/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9566,25 +9080,25 @@ dvi-diff: \
                  dvi) \
          || exit 1
 
-@endif diff
+@endif flex
 
-.PHONY: maybe-pdf-diff pdf-diff
-maybe-pdf-diff:
-@if diff
-maybe-pdf-diff: pdf-diff
+.PHONY: maybe-pdf-flex pdf-flex
+maybe-pdf-flex:
+@if flex
+maybe-pdf-flex: pdf-flex
 
-pdf-diff: \
-    configure-diff 
+pdf-flex: \
+    configure-flex 
        @: $(MAKE); $(unstage)
-       @[ -f ./diff/Makefile ] || exit 0; \
+       @[ -f ./flex/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9592,25 +9106,25 @@ pdf-diff: \
                  pdf) \
          || exit 1
 
-@endif diff
+@endif flex
 
-.PHONY: maybe-html-diff html-diff
-maybe-html-diff:
-@if diff
-maybe-html-diff: html-diff
+.PHONY: maybe-html-flex html-flex
+maybe-html-flex:
+@if flex
+maybe-html-flex: html-flex
 
-html-diff: \
-    configure-diff 
+html-flex: \
+    configure-flex 
        @: $(MAKE); $(unstage)
-       @[ -f ./diff/Makefile ] || exit 0; \
+       @[ -f ./flex/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9618,25 +9132,25 @@ html-diff: \
                  html) \
          || exit 1
 
-@endif diff
+@endif flex
 
-.PHONY: maybe-TAGS-diff TAGS-diff
-maybe-TAGS-diff:
-@if diff
-maybe-TAGS-diff: TAGS-diff
+.PHONY: maybe-TAGS-flex TAGS-flex
+maybe-TAGS-flex:
+@if flex
+maybe-TAGS-flex: TAGS-flex
 
-TAGS-diff: \
-    configure-diff 
+TAGS-flex: \
+    configure-flex 
        @: $(MAKE); $(unstage)
-       @[ -f ./diff/Makefile ] || exit 0; \
+       @[ -f ./flex/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9644,26 +9158,26 @@ TAGS-diff: \
                  TAGS) \
          || exit 1
 
-@endif diff
+@endif flex
 
-.PHONY: maybe-install-info-diff install-info-diff
-maybe-install-info-diff:
-@if diff
-maybe-install-info-diff: install-info-diff
+.PHONY: maybe-install-info-flex install-info-flex
+maybe-install-info-flex:
+@if flex
+maybe-install-info-flex: install-info-flex
 
-install-info-diff: \
-    configure-diff \
-    info-diff 
+install-info-flex: \
+    configure-flex \
+    info-flex 
        @: $(MAKE); $(unstage)
-       @[ -f ./diff/Makefile ] || exit 0; \
+       @[ -f ./flex/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9671,26 +9185,26 @@ install-info-diff: \
                  install-info) \
          || exit 1
 
-@endif diff
+@endif flex
 
-.PHONY: maybe-install-pdf-diff install-pdf-diff
-maybe-install-pdf-diff:
-@if diff
-maybe-install-pdf-diff: install-pdf-diff
+.PHONY: maybe-install-pdf-flex install-pdf-flex
+maybe-install-pdf-flex:
+@if flex
+maybe-install-pdf-flex: install-pdf-flex
 
-install-pdf-diff: \
-    configure-diff \
-    pdf-diff 
+install-pdf-flex: \
+    configure-flex \
+    pdf-flex 
        @: $(MAKE); $(unstage)
-       @[ -f ./diff/Makefile ] || exit 0; \
+       @[ -f ./flex/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9698,26 +9212,26 @@ install-pdf-diff: \
                  install-pdf) \
          || exit 1
 
-@endif diff
+@endif flex
 
-.PHONY: maybe-install-html-diff install-html-diff
-maybe-install-html-diff:
-@if diff
-maybe-install-html-diff: install-html-diff
+.PHONY: maybe-install-html-flex install-html-flex
+maybe-install-html-flex:
+@if flex
+maybe-install-html-flex: install-html-flex
 
-install-html-diff: \
-    configure-diff \
-    html-diff 
+install-html-flex: \
+    configure-flex \
+    html-flex 
        @: $(MAKE); $(unstage)
-       @[ -f ./diff/Makefile ] || exit 0; \
+       @[ -f ./flex/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9725,25 +9239,25 @@ install-html-diff: \
                  install-html) \
          || exit 1
 
-@endif diff
+@endif flex
 
-.PHONY: maybe-installcheck-diff installcheck-diff
-maybe-installcheck-diff:
-@if diff
-maybe-installcheck-diff: installcheck-diff
+.PHONY: maybe-installcheck-flex installcheck-flex
+maybe-installcheck-flex:
+@if flex
+maybe-installcheck-flex: installcheck-flex
 
-installcheck-diff: \
-    configure-diff 
+installcheck-flex: \
+    configure-flex 
        @: $(MAKE); $(unstage)
-       @[ -f ./diff/Makefile ] || exit 0; \
+       @[ -f ./flex/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9751,24 +9265,24 @@ installcheck-diff: \
                  installcheck) \
          || exit 1
 
-@endif diff
+@endif flex
 
-.PHONY: maybe-mostlyclean-diff mostlyclean-diff
-maybe-mostlyclean-diff:
-@if diff
-maybe-mostlyclean-diff: mostlyclean-diff
+.PHONY: maybe-mostlyclean-flex mostlyclean-flex
+maybe-mostlyclean-flex:
+@if flex
+maybe-mostlyclean-flex: mostlyclean-flex
 
-mostlyclean-diff: 
+mostlyclean-flex: 
        @: $(MAKE); $(unstage)
-       @[ -f ./diff/Makefile ] || exit 0; \
+       @[ -f ./flex/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9776,24 +9290,24 @@ mostlyclean-diff:
                  mostlyclean) \
          || exit 1
 
-@endif diff
+@endif flex
 
-.PHONY: maybe-clean-diff clean-diff
-maybe-clean-diff:
-@if diff
-maybe-clean-diff: clean-diff
+.PHONY: maybe-clean-flex clean-flex
+maybe-clean-flex:
+@if flex
+maybe-clean-flex: clean-flex
 
-clean-diff: 
+clean-flex: 
        @: $(MAKE); $(unstage)
-       @[ -f ./diff/Makefile ] || exit 0; \
+       @[ -f ./flex/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9801,24 +9315,24 @@ clean-diff:
                  clean) \
          || exit 1
 
-@endif diff
+@endif flex
 
-.PHONY: maybe-distclean-diff distclean-diff
-maybe-distclean-diff:
-@if diff
-maybe-distclean-diff: distclean-diff
+.PHONY: maybe-distclean-flex distclean-flex
+maybe-distclean-flex:
+@if flex
+maybe-distclean-flex: distclean-flex
 
-distclean-diff: 
+distclean-flex: 
        @: $(MAKE); $(unstage)
-       @[ -f ./diff/Makefile ] || exit 0; \
+       @[ -f ./flex/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9826,24 +9340,24 @@ distclean-diff:
                  distclean) \
          || exit 1
 
-@endif diff
+@endif flex
 
-.PHONY: maybe-maintainer-clean-diff maintainer-clean-diff
-maybe-maintainer-clean-diff:
-@if diff
-maybe-maintainer-clean-diff: maintainer-clean-diff
+.PHONY: maybe-maintainer-clean-flex maintainer-clean-flex
+maybe-maintainer-clean-flex:
+@if flex
+maybe-maintainer-clean-flex: maintainer-clean-flex
 
-maintainer-clean-diff: 
+maintainer-clean-flex: 
        @: $(MAKE); $(unstage)
-       @[ -f ./diff/Makefile ] || exit 0; \
+       @[ -f ./flex/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9851,107 +9365,580 @@ maintainer-clean-diff:
                  maintainer-clean) \
          || exit 1
 
-@endif diff
+@endif flex
 
 
 
-.PHONY: configure-dosutils maybe-configure-dosutils
-maybe-configure-dosutils:
+.PHONY: configure-gas maybe-configure-gas
+maybe-configure-gas:
 @if gcc-bootstrap
-configure-dosutils: stage_current
+configure-gas: stage_current
 @endif gcc-bootstrap
-@if dosutils
-maybe-configure-dosutils: configure-dosutils
-configure-dosutils: 
-       @: $(MAKE); $(unstage)
+@if gas
+maybe-configure-gas: configure-gas
+configure-gas: 
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/dosutils/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dosutils ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/dosutils; \
-       cd "$(HOST_SUBDIR)/dosutils" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/gas; \
+       cd "$(HOST_SUBDIR)/gas" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/dosutils/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/dosutils"; \
-       libsrcdir="$$s/dosutils"; \
-       $(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 dosutils
+@endif gas
 
 
 
+.PHONY: configure-stage1-gas maybe-configure-stage1-gas
+maybe-configure-stage1-gas:
+@if gas-bootstrap
+maybe-configure-stage1-gas: configure-stage1-gas
+configure-stage1-gas:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/gas/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)/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; \
+       module_srcdir=gas; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif gas-bootstrap
 
+.PHONY: configure-stage2-gas maybe-configure-stage2-gas
+maybe-configure-stage2-gas:
+@if gas-bootstrap
+maybe-configure-stage2-gas: configure-stage2-gas
+configure-stage2-gas:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/gas/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)/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; \
+       module_srcdir=gas; \
+       $(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 gas-bootstrap
 
-.PHONY: all-dosutils maybe-all-dosutils
-maybe-all-dosutils:
-@if gcc-bootstrap
-all-dosutils: stage_current
-@endif gcc-bootstrap
-@if dosutils
-TARGET-dosutils=all
-maybe-all-dosutils: all-dosutils
-all-dosutils: configure-dosutils
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage3-gas maybe-configure-stage3-gas
+maybe-configure-stage3-gas:
+@if gas-bootstrap
+maybe-configure-stage3-gas: configure-stage3-gas
+configure-stage3-gas:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/dosutils && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-dosutils))
-@endif dosutils
+       $(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)/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; \
+       module_srcdir=gas; \
+       $(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 gas-bootstrap
 
+.PHONY: configure-stage4-gas maybe-configure-stage4-gas
+maybe-configure-stage4-gas:
+@if gas-bootstrap
+maybe-configure-stage4-gas: configure-stage4-gas
+configure-stage4-gas:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/gas/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)/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; \
+       module_srcdir=gas; \
+       $(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 gas-bootstrap
 
+.PHONY: configure-stageprofile-gas maybe-configure-stageprofile-gas
+maybe-configure-stageprofile-gas:
+@if gas-bootstrap
+maybe-configure-stageprofile-gas: configure-stageprofile-gas
+configure-stageprofile-gas:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/gas/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)/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; \
+       module_srcdir=gas; \
+       $(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 gas-bootstrap
 
+.PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas
+maybe-configure-stagefeedback-gas:
+@if gas-bootstrap
+maybe-configure-stagefeedback-gas: configure-stagefeedback-gas
+configure-stagefeedback-gas:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/gas/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)/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; \
+       module_srcdir=gas; \
+       $(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 gas-bootstrap
 
-.PHONY: check-dosutils maybe-check-dosutils
-maybe-check-dosutils:
-@if dosutils
-maybe-check-dosutils: check-dosutils
 
-check-dosutils:
 
-@endif dosutils
 
-.PHONY: install-dosutils maybe-install-dosutils
-maybe-install-dosutils:
-@if dosutils
-maybe-install-dosutils: install-dosutils
 
-install-dosutils: installdirs
-       @: $(MAKE); $(unstage)
+.PHONY: all-gas maybe-all-gas
+maybe-all-gas:
+@if gcc-bootstrap
+all-gas: stage_current
+@endif gcc-bootstrap
+@if gas
+TARGET-gas=all
+maybe-all-gas: all-gas
+all-gas: configure-gas
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/dosutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif dosutils
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gas && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-gas))
+@endif gas
 
-# Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-dosutils info-dosutils
-maybe-info-dosutils:
-@if dosutils
-maybe-info-dosutils: info-dosutils
 
-info-dosutils: \
-    configure-dosutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stage1-gas maybe-all-stage1-gas
+.PHONY: clean-stage1-gas maybe-clean-stage1-gas
+maybe-all-stage1-gas:
+maybe-clean-stage1-gas:
+@if gas-bootstrap
+maybe-all-stage1-gas: all-stage1-gas
+all-stage1: all-stage1-gas
+TARGET-stage1-gas = $(TARGET-gas)
+all-stage1-gas: configure-stage1-gas
+       @[ $(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)/gas && \
+        \
+       $(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-gas)
+
+maybe-clean-stage1-gas: clean-stage1-gas
+clean-stage1: clean-stage1-gas
+clean-stage1-gas:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-gas/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif gas-bootstrap
+
+
+.PHONY: all-stage2-gas maybe-all-stage2-gas
+.PHONY: clean-stage2-gas maybe-clean-stage2-gas
+maybe-all-stage2-gas:
+maybe-clean-stage2-gas:
+@if gas-bootstrap
+maybe-all-stage2-gas: all-stage2-gas
+all-stage2: all-stage2-gas
+TARGET-stage2-gas = $(TARGET-gas)
+all-stage2-gas: configure-stage2-gas
+       @[ $(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)/gas && \
+        \
+       $(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-gas)
+
+maybe-clean-stage2-gas: clean-stage2-gas
+clean-stage2: clean-stage2-gas
+clean-stage2-gas:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-gas/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif gas-bootstrap
+
+
+.PHONY: all-stage3-gas maybe-all-stage3-gas
+.PHONY: clean-stage3-gas maybe-clean-stage3-gas
+maybe-all-stage3-gas:
+maybe-clean-stage3-gas:
+@if gas-bootstrap
+maybe-all-stage3-gas: all-stage3-gas
+all-stage3: all-stage3-gas
+TARGET-stage3-gas = $(TARGET-gas)
+all-stage3-gas: configure-stage3-gas
+       @[ $(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)/gas && \
+        \
+       $(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-gas)
+
+maybe-clean-stage3-gas: clean-stage3-gas
+clean-stage3: clean-stage3-gas
+clean-stage3-gas:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-gas/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif gas-bootstrap
+
+
+.PHONY: all-stage4-gas maybe-all-stage4-gas
+.PHONY: clean-stage4-gas maybe-clean-stage4-gas
+maybe-all-stage4-gas:
+maybe-clean-stage4-gas:
+@if gas-bootstrap
+maybe-all-stage4-gas: all-stage4-gas
+all-stage4: all-stage4-gas
+TARGET-stage4-gas = $(TARGET-gas)
+all-stage4-gas: configure-stage4-gas
+       @[ $(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)/gas && \
+        \
+       $(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-gas)
+
+maybe-clean-stage4-gas: clean-stage4-gas
+clean-stage4: clean-stage4-gas
+clean-stage4-gas:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-gas/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif gas-bootstrap
+
+
+.PHONY: all-stageprofile-gas maybe-all-stageprofile-gas
+.PHONY: clean-stageprofile-gas maybe-clean-stageprofile-gas
+maybe-all-stageprofile-gas:
+maybe-clean-stageprofile-gas:
+@if gas-bootstrap
+maybe-all-stageprofile-gas: all-stageprofile-gas
+all-stageprofile: all-stageprofile-gas
+TARGET-stageprofile-gas = $(TARGET-gas)
+all-stageprofile-gas: configure-stageprofile-gas
+       @[ $(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)/gas && \
+        \
+       $(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-gas)
+
+maybe-clean-stageprofile-gas: clean-stageprofile-gas
+clean-stageprofile: clean-stageprofile-gas
+clean-stageprofile-gas:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-gas/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif gas-bootstrap
+
+
+.PHONY: all-stagefeedback-gas maybe-all-stagefeedback-gas
+.PHONY: clean-stagefeedback-gas maybe-clean-stagefeedback-gas
+maybe-all-stagefeedback-gas:
+maybe-clean-stagefeedback-gas:
+@if gas-bootstrap
+maybe-all-stagefeedback-gas: all-stagefeedback-gas
+all-stagefeedback: all-stagefeedback-gas
+TARGET-stagefeedback-gas = $(TARGET-gas)
+all-stagefeedback-gas: configure-stagefeedback-gas
+       @[ $(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)/gas && \
+        \
+       $(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-gas)
+
+maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
+clean-stagefeedback: clean-stagefeedback-gas
+clean-stagefeedback-gas:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-gas/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/gas && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif gas-bootstrap
+
+
+
+
+
+.PHONY: check-gas maybe-check-gas
+maybe-check-gas:
+@if gas
+maybe-check-gas: check-gas
+
+check-gas:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gas && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
+
+@endif gas
+
+.PHONY: install-gas maybe-install-gas
+maybe-install-gas:
+@if gas
+maybe-install-gas: install-gas
+
+install-gas: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gas && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif gas
+
+.PHONY: install-strip-gas maybe-install-strip-gas
+maybe-install-strip-gas:
+@if gas
+maybe-install-strip-gas: install-strip-gas
+
+install-strip-gas: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gas && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif gas
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-gas info-gas
+maybe-info-gas:
+@if gas
+maybe-info-gas: info-gas
+
+info-gas: \
+    configure-gas 
+       @[ -f ./gas/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dosutils" ; \
-       (cd $(HOST_SUBDIR)/dosutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9959,25 +9946,24 @@ info-dosutils: \
                  info) \
          || exit 1
 
-@endif dosutils
+@endif gas
 
-.PHONY: maybe-dvi-dosutils dvi-dosutils
-maybe-dvi-dosutils:
-@if dosutils
-maybe-dvi-dosutils: dvi-dosutils
+.PHONY: maybe-dvi-gas dvi-gas
+maybe-dvi-gas:
+@if gas
+maybe-dvi-gas: dvi-gas
 
-dvi-dosutils: \
-    configure-dosutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
+dvi-gas: \
+    configure-gas 
+       @[ -f ./gas/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dosutils" ; \
-       (cd $(HOST_SUBDIR)/dosutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -9985,25 +9971,24 @@ dvi-dosutils: \
                  dvi) \
          || exit 1
 
-@endif dosutils
+@endif gas
 
-.PHONY: maybe-pdf-dosutils pdf-dosutils
-maybe-pdf-dosutils:
-@if dosutils
-maybe-pdf-dosutils: pdf-dosutils
+.PHONY: maybe-pdf-gas pdf-gas
+maybe-pdf-gas:
+@if gas
+maybe-pdf-gas: pdf-gas
 
-pdf-dosutils: \
-    configure-dosutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
+pdf-gas: \
+    configure-gas 
+       @[ -f ./gas/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dosutils" ; \
-       (cd $(HOST_SUBDIR)/dosutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -10011,25 +9996,24 @@ pdf-dosutils: \
                  pdf) \
          || exit 1
 
-@endif dosutils
+@endif gas
 
-.PHONY: maybe-html-dosutils html-dosutils
-maybe-html-dosutils:
-@if dosutils
-maybe-html-dosutils: html-dosutils
+.PHONY: maybe-html-gas html-gas
+maybe-html-gas:
+@if gas
+maybe-html-gas: html-gas
 
-html-dosutils: \
-    configure-dosutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
+html-gas: \
+    configure-gas 
+       @[ -f ./gas/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dosutils" ; \
-       (cd $(HOST_SUBDIR)/dosutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -10037,25 +10021,24 @@ html-dosutils: \
                  html) \
          || exit 1
 
-@endif dosutils
+@endif gas
 
-.PHONY: maybe-TAGS-dosutils TAGS-dosutils
-maybe-TAGS-dosutils:
-@if dosutils
-maybe-TAGS-dosutils: TAGS-dosutils
+.PHONY: maybe-TAGS-gas TAGS-gas
+maybe-TAGS-gas:
+@if gas
+maybe-TAGS-gas: TAGS-gas
 
-TAGS-dosutils: \
-    configure-dosutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
+TAGS-gas: \
+    configure-gas 
+       @[ -f ./gas/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dosutils" ; \
-       (cd $(HOST_SUBDIR)/dosutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -10063,26 +10046,25 @@ TAGS-dosutils: \
                  TAGS) \
          || exit 1
 
-@endif dosutils
+@endif gas
 
-.PHONY: maybe-install-info-dosutils install-info-dosutils
-maybe-install-info-dosutils:
-@if dosutils
-maybe-install-info-dosutils: install-info-dosutils
+.PHONY: maybe-install-info-gas install-info-gas
+maybe-install-info-gas:
+@if gas
+maybe-install-info-gas: install-info-gas
 
-install-info-dosutils: \
-    configure-dosutils \
-    info-dosutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
+install-info-gas: \
+    configure-gas \
+    info-gas 
+       @[ -f ./gas/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dosutils" ; \
-       (cd $(HOST_SUBDIR)/dosutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -10090,26 +10072,25 @@ install-info-dosutils: \
                  install-info) \
          || exit 1
 
-@endif dosutils
+@endif gas
 
-.PHONY: maybe-install-pdf-dosutils install-pdf-dosutils
-maybe-install-pdf-dosutils:
-@if dosutils
-maybe-install-pdf-dosutils: install-pdf-dosutils
+.PHONY: maybe-install-pdf-gas install-pdf-gas
+maybe-install-pdf-gas:
+@if gas
+maybe-install-pdf-gas: install-pdf-gas
 
-install-pdf-dosutils: \
-    configure-dosutils \
-    pdf-dosutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
+install-pdf-gas: \
+    configure-gas \
+    pdf-gas 
+       @[ -f ./gas/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dosutils" ; \
-       (cd $(HOST_SUBDIR)/dosutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -10117,26 +10098,25 @@ install-pdf-dosutils: \
                  install-pdf) \
          || exit 1
 
-@endif dosutils
+@endif gas
 
-.PHONY: maybe-install-html-dosutils install-html-dosutils
-maybe-install-html-dosutils:
-@if dosutils
-maybe-install-html-dosutils: install-html-dosutils
+.PHONY: maybe-install-html-gas install-html-gas
+maybe-install-html-gas:
+@if gas
+maybe-install-html-gas: install-html-gas
 
-install-html-dosutils: \
-    configure-dosutils \
-    html-dosutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
+install-html-gas: \
+    configure-gas \
+    html-gas 
+       @[ -f ./gas/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dosutils" ; \
-       (cd $(HOST_SUBDIR)/dosutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -10144,25 +10124,24 @@ install-html-dosutils: \
                  install-html) \
          || exit 1
 
-@endif dosutils
+@endif gas
 
-.PHONY: maybe-installcheck-dosutils installcheck-dosutils
-maybe-installcheck-dosutils:
-@if dosutils
-maybe-installcheck-dosutils: installcheck-dosutils
+.PHONY: maybe-installcheck-gas installcheck-gas
+maybe-installcheck-gas:
+@if gas
+maybe-installcheck-gas: installcheck-gas
 
-installcheck-dosutils: \
-    configure-dosutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
+installcheck-gas: \
+    configure-gas 
+       @[ -f ./gas/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dosutils" ; \
-       (cd $(HOST_SUBDIR)/dosutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -10170,24 +10149,23 @@ installcheck-dosutils: \
                  installcheck) \
          || exit 1
 
-@endif dosutils
+@endif gas
 
-.PHONY: maybe-mostlyclean-dosutils mostlyclean-dosutils
-maybe-mostlyclean-dosutils:
-@if dosutils
-maybe-mostlyclean-dosutils: mostlyclean-dosutils
+.PHONY: maybe-mostlyclean-gas mostlyclean-gas
+maybe-mostlyclean-gas:
+@if gas
+maybe-mostlyclean-gas: mostlyclean-gas
 
-mostlyclean-dosutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
+mostlyclean-gas: 
+       @[ -f ./gas/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dosutils" ; \
-       (cd $(HOST_SUBDIR)/dosutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -10195,24 +10173,23 @@ mostlyclean-dosutils:
                  mostlyclean) \
          || exit 1
 
-@endif dosutils
+@endif gas
 
-.PHONY: maybe-clean-dosutils clean-dosutils
-maybe-clean-dosutils:
-@if dosutils
-maybe-clean-dosutils: clean-dosutils
+.PHONY: maybe-clean-gas clean-gas
+maybe-clean-gas:
+@if gas
+maybe-clean-gas: clean-gas
 
-clean-dosutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
+clean-gas: 
+       @[ -f ./gas/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dosutils" ; \
-       (cd $(HOST_SUBDIR)/dosutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -10220,24 +10197,23 @@ clean-dosutils:
                  clean) \
          || exit 1
 
-@endif dosutils
+@endif gas
 
-.PHONY: maybe-distclean-dosutils distclean-dosutils
-maybe-distclean-dosutils:
-@if dosutils
-maybe-distclean-dosutils: distclean-dosutils
+.PHONY: maybe-distclean-gas distclean-gas
+maybe-distclean-gas:
+@if gas
+maybe-distclean-gas: distclean-gas
 
-distclean-dosutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
+distclean-gas: 
+       @[ -f ./gas/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dosutils" ; \
-       (cd $(HOST_SUBDIR)/dosutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -10245,24 +10221,23 @@ distclean-dosutils:
                  distclean) \
          || exit 1
 
-@endif dosutils
+@endif gas
 
-.PHONY: maybe-maintainer-clean-dosutils maintainer-clean-dosutils
-maybe-maintainer-clean-dosutils:
-@if dosutils
-maybe-maintainer-clean-dosutils: maintainer-clean-dosutils
+.PHONY: maybe-maintainer-clean-gas maintainer-clean-gas
+maybe-maintainer-clean-gas:
+@if gas
+maybe-maintainer-clean-gas: maintainer-clean-gas
 
-maintainer-clean-dosutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
+maintainer-clean-gas: 
+       @[ -f ./gas/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 dosutils" ; \
-       (cd $(HOST_SUBDIR)/dosutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -10270,139 +10245,605 @@ maintainer-clean-dosutils:
                  maintainer-clean) \
          || exit 1
 
-@endif dosutils
+@endif gas
 
 
 
-.PHONY: configure-etc maybe-configure-etc
-maybe-configure-etc:
+.PHONY: configure-gcc maybe-configure-gcc
+maybe-configure-gcc:
 @if gcc-bootstrap
-configure-etc: stage_current
+configure-gcc: stage_current
 @endif gcc-bootstrap
-@if etc
-maybe-configure-etc: configure-etc
-configure-etc: 
-       @: $(MAKE); $(unstage)
+@if gcc
+maybe-configure-gcc: configure-gcc
+configure-gcc: 
        @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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/etc; \
-       cd "$(HOST_SUBDIR)/etc" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/gcc; \
+       cd "$(HOST_SUBDIR)/gcc" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/etc/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/etc"; \
-       libsrcdir="$$s/etc"; \
-       $(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 etc
-
-
+@endif gcc
 
 
 
-.PHONY: all-etc maybe-all-etc
-maybe-all-etc:
+.PHONY: configure-stage1-gcc maybe-configure-stage1-gcc
+maybe-configure-stage1-gcc:
 @if gcc-bootstrap
-all-etc: stage_current
-@endif gcc-bootstrap
-@if etc
-TARGET-etc=all
-maybe-all-etc: all-etc
-all-etc: configure-etc
-       @: $(MAKE); $(unstage)
+maybe-configure-stage1-gcc: configure-stage1-gcc
+configure-stage1-gcc:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/etc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-etc))
-@endif etc
-
-
-
-
-.PHONY: check-etc maybe-check-etc
-maybe-check-etc:
-@if etc
-maybe-check-etc: check-etc
+       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; \
+       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; \
+       module_srcdir=gcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif gcc-bootstrap
 
-check-etc:
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage2-gcc maybe-configure-stage2-gcc
+maybe-configure-stage2-gcc:
+@if gcc-bootstrap
+maybe-configure-stage2-gcc: configure-stage2-gcc
+configure-stage2-gcc:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/etc && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif etc
-
-.PHONY: install-etc maybe-install-etc
-maybe-install-etc:
-@if etc
-maybe-install-etc: install-etc
+       $(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)/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; \
+       module_srcdir=gcc; \
+       $(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 gcc-bootstrap
 
-install-etc: installdirs
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage3-gcc maybe-configure-stage3-gcc
+maybe-configure-stage3-gcc:
+@if gcc-bootstrap
+maybe-configure-stage3-gcc: configure-stage3-gcc
+configure-stage3-gcc:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/etc && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif etc
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-etc info-etc
-maybe-info-etc:
-@if etc
-maybe-info-etc: info-etc
+       $(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)/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; \
+       module_srcdir=gcc; \
+       $(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 gcc-bootstrap
 
-info-etc: \
-    configure-etc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./etc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: configure-stage4-gcc maybe-configure-stage4-gcc
+maybe-configure-stage4-gcc:
+@if gcc-bootstrap
+maybe-configure-stage4-gcc: configure-stage4-gcc
+configure-stage4-gcc:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing info in etc" ; \
-       (cd $(HOST_SUBDIR)/etc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+       $(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)/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; \
+       module_srcdir=gcc; \
+       $(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 gcc-bootstrap
+
+.PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc
+maybe-configure-stageprofile-gcc:
+@if gcc-bootstrap
+maybe-configure-stageprofile-gcc: configure-stageprofile-gcc
+configure-stageprofile-gcc:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/gcc/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)/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; \
+       module_srcdir=gcc; \
+       $(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 gcc-bootstrap
+
+.PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc
+maybe-configure-stagefeedback-gcc:
+@if gcc-bootstrap
+maybe-configure-stagefeedback-gcc: configure-stagefeedback-gcc
+configure-stagefeedback-gcc:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/gcc/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)/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; \
+       module_srcdir=gcc; \
+       $(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 gcc-bootstrap
+
+
+
+
+
+.PHONY: all-gcc maybe-all-gcc
+maybe-all-gcc:
+@if gcc-bootstrap
+all-gcc: stage_current
+@endif gcc-bootstrap
+@if gcc
+TARGET-gcc=all
+maybe-all-gcc: all-gcc
+all-gcc: configure-gcc
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gcc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
+               $(TARGET-gcc))
+@endif gcc
+
+
+
+.PHONY: all-stage1-gcc maybe-all-stage1-gcc
+.PHONY: clean-stage1-gcc maybe-clean-stage1-gcc
+maybe-all-stage1-gcc:
+maybe-clean-stage1-gcc:
+@if gcc-bootstrap
+maybe-all-stage1-gcc: all-stage1-gcc
+all-stage1: all-stage1-gcc
+TARGET-stage1-gcc = $(TARGET-gcc)
+all-stage1-gcc: configure-stage1-gcc
+       @[ $(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)/gcc && \
+        \
+       $(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_GCC_FLAGS) \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
+               $(TARGET-stage1-gcc)
+
+maybe-clean-stage1-gcc: clean-stage1-gcc
+clean-stage1: clean-stage1-gcc
+clean-stage1-gcc:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-gcc/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+       $(STAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: all-stage2-gcc maybe-all-stage2-gcc
+.PHONY: clean-stage2-gcc maybe-clean-stage2-gcc
+maybe-all-stage2-gcc:
+maybe-clean-stage2-gcc:
+@if gcc-bootstrap
+maybe-all-stage2-gcc: all-stage2-gcc
+all-stage2: all-stage2-gcc
+TARGET-stage2-gcc = $(TARGET-gcc)
+all-stage2-gcc: configure-stage2-gcc
+       @[ $(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)/gcc && \
+        \
+       $(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_GCC_FLAGS) \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
+               $(TARGET-stage2-gcc)
+
+maybe-clean-stage2-gcc: clean-stage2-gcc
+clean-stage2: clean-stage2-gcc
+clean-stage2-gcc:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-gcc/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: all-stage3-gcc maybe-all-stage3-gcc
+.PHONY: clean-stage3-gcc maybe-clean-stage3-gcc
+maybe-all-stage3-gcc:
+maybe-clean-stage3-gcc:
+@if gcc-bootstrap
+maybe-all-stage3-gcc: all-stage3-gcc
+all-stage3: all-stage3-gcc
+TARGET-stage3-gcc = $(TARGET-gcc)
+all-stage3-gcc: configure-stage3-gcc
+       @[ $(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)/gcc && \
+        \
+       $(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_GCC_FLAGS) \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
+               $(TARGET-stage3-gcc)
+
+maybe-clean-stage3-gcc: clean-stage3-gcc
+clean-stage3: clean-stage3-gcc
+clean-stage3-gcc:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-gcc/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: all-stage4-gcc maybe-all-stage4-gcc
+.PHONY: clean-stage4-gcc maybe-clean-stage4-gcc
+maybe-all-stage4-gcc:
+maybe-clean-stage4-gcc:
+@if gcc-bootstrap
+maybe-all-stage4-gcc: all-stage4-gcc
+all-stage4: all-stage4-gcc
+TARGET-stage4-gcc = $(TARGET-gcc)
+all-stage4-gcc: configure-stage4-gcc
+       @[ $(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)/gcc && \
+        \
+       $(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_GCC_FLAGS) \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
+               $(TARGET-stage4-gcc)
+
+maybe-clean-stage4-gcc: clean-stage4-gcc
+clean-stage4: clean-stage4-gcc
+clean-stage4-gcc:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-gcc/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: all-stageprofile-gcc maybe-all-stageprofile-gcc
+.PHONY: clean-stageprofile-gcc maybe-clean-stageprofile-gcc
+maybe-all-stageprofile-gcc:
+maybe-clean-stageprofile-gcc:
+@if gcc-bootstrap
+maybe-all-stageprofile-gcc: all-stageprofile-gcc
+all-stageprofile: all-stageprofile-gcc
+TARGET-stageprofile-gcc = $(TARGET-gcc)
+all-stageprofile-gcc: configure-stageprofile-gcc
+       @[ $(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)/gcc && \
+        \
+       $(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_GCC_FLAGS) \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
+               $(TARGET-stageprofile-gcc)
+
+maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
+clean-stageprofile: clean-stageprofile-gcc
+clean-stageprofile-gcc:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-gcc/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: all-stagefeedback-gcc maybe-all-stagefeedback-gcc
+.PHONY: clean-stagefeedback-gcc maybe-clean-stagefeedback-gcc
+maybe-all-stagefeedback-gcc:
+maybe-clean-stagefeedback-gcc:
+@if gcc-bootstrap
+maybe-all-stagefeedback-gcc: all-stagefeedback-gcc
+all-stagefeedback: all-stagefeedback-gcc
+TARGET-stagefeedback-gcc = $(TARGET-gcc)
+all-stagefeedback-gcc: configure-stagefeedback-gcc
+       @[ $(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)/gcc && \
+        \
+       $(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_GCC_FLAGS) \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
+               $(TARGET-stagefeedback-gcc)
+
+maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
+clean-stagefeedback: clean-stagefeedback-gcc
+clean-stagefeedback-gcc:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-gcc/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/gcc && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+
+
+
+.PHONY: check-gcc maybe-check-gcc
+maybe-check-gcc:
+@if gcc
+maybe-check-gcc: check-gcc
+
+check-gcc:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gcc && \
+         $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_BOOTSTRAP_FLAGS) check)
+
+@endif gcc
+
+.PHONY: install-gcc maybe-install-gcc
+maybe-install-gcc:
+@if gcc
+maybe-install-gcc: install-gcc
+
+install-gcc: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gcc && \
+         $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) install)
+
+@endif gcc
+
+.PHONY: install-strip-gcc maybe-install-strip-gcc
+maybe-install-strip-gcc:
+@if gcc
+maybe-install-strip-gcc: install-strip-gcc
+
+install-strip-gcc: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gcc && \
+         $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) install-strip)
+
+@endif gcc
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-gcc info-gcc
+maybe-info-gcc:
+@if gcc
+maybe-info-gcc: info-gcc
+
+info-gcc: \
+    configure-gcc 
+       @[ -f ./gcc/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       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"; \
+       (cd $(HOST_SUBDIR)/gcc && \
+         $(MAKE) $(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 etc
+@endif gcc
 
-.PHONY: maybe-dvi-etc dvi-etc
-maybe-dvi-etc:
-@if etc
-maybe-dvi-etc: dvi-etc
+.PHONY: maybe-dvi-gcc dvi-gcc
+maybe-dvi-gcc:
+@if gcc
+maybe-dvi-gcc: dvi-gcc
 
-dvi-etc: \
-    configure-etc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./etc/Makefile ] || exit 0; \
+dvi-gcc: \
+    configure-gcc 
+       @[ -f ./gcc/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_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in etc" ; \
-       (cd $(HOST_SUBDIR)/etc && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -10410,25 +10851,24 @@ dvi-etc: \
                  dvi) \
          || exit 1
 
-@endif etc
+@endif gcc
 
-.PHONY: maybe-pdf-etc pdf-etc
-maybe-pdf-etc:
-@if etc
-maybe-pdf-etc: pdf-etc
+.PHONY: maybe-pdf-gcc pdf-gcc
+maybe-pdf-gcc:
+@if gcc
+maybe-pdf-gcc: pdf-gcc
 
-pdf-etc: \
-    configure-etc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./etc/Makefile ] || exit 0; \
+pdf-gcc: \
+    configure-gcc 
+       @[ -f ./gcc/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_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in etc" ; \
-       (cd $(HOST_SUBDIR)/etc && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -10436,25 +10876,24 @@ pdf-etc: \
                  pdf) \
          || exit 1
 
-@endif etc
+@endif gcc
 
-.PHONY: maybe-html-etc html-etc
-maybe-html-etc:
-@if etc
-maybe-html-etc: html-etc
+.PHONY: maybe-html-gcc html-gcc
+maybe-html-gcc:
+@if gcc
+maybe-html-gcc: html-gcc
 
-html-etc: \
-    configure-etc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./etc/Makefile ] || exit 0; \
+html-gcc: \
+    configure-gcc 
+       @[ -f ./gcc/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_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in etc" ; \
-       (cd $(HOST_SUBDIR)/etc && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -10462,25 +10901,24 @@ html-etc: \
                  html) \
          || exit 1
 
-@endif etc
+@endif gcc
 
-.PHONY: maybe-TAGS-etc TAGS-etc
-maybe-TAGS-etc:
-@if etc
-maybe-TAGS-etc: TAGS-etc
+.PHONY: maybe-TAGS-gcc TAGS-gcc
+maybe-TAGS-gcc:
+@if gcc
+maybe-TAGS-gcc: TAGS-gcc
 
-TAGS-etc: \
-    configure-etc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./etc/Makefile ] || exit 0; \
+TAGS-gcc: \
+    configure-gcc 
+       @[ -f ./gcc/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_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in etc" ; \
-       (cd $(HOST_SUBDIR)/etc && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -10488,26 +10926,25 @@ TAGS-etc: \
                  TAGS) \
          || exit 1
 
-@endif etc
+@endif gcc
 
-.PHONY: maybe-install-info-etc install-info-etc
-maybe-install-info-etc:
-@if etc
-maybe-install-info-etc: install-info-etc
+.PHONY: maybe-install-info-gcc install-info-gcc
+maybe-install-info-gcc:
+@if gcc
+maybe-install-info-gcc: install-info-gcc
 
-install-info-etc: \
-    configure-etc \
-    info-etc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./etc/Makefile ] || exit 0; \
+install-info-gcc: \
+    configure-gcc \
+    info-gcc 
+       @[ -f ./gcc/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_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in etc" ; \
-       (cd $(HOST_SUBDIR)/etc && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -10515,26 +10952,25 @@ install-info-etc: \
                  install-info) \
          || exit 1
 
-@endif etc
+@endif gcc
 
-.PHONY: maybe-install-pdf-etc install-pdf-etc
-maybe-install-pdf-etc:
-@if etc
-maybe-install-pdf-etc: install-pdf-etc
+.PHONY: maybe-install-pdf-gcc install-pdf-gcc
+maybe-install-pdf-gcc:
+@if gcc
+maybe-install-pdf-gcc: install-pdf-gcc
 
-install-pdf-etc: \
-    configure-etc \
-    pdf-etc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./etc/Makefile ] || exit 0; \
+install-pdf-gcc: \
+    configure-gcc \
+    pdf-gcc 
+       @[ -f ./gcc/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_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in etc" ; \
-       (cd $(HOST_SUBDIR)/etc && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -10542,26 +10978,25 @@ install-pdf-etc: \
                  install-pdf) \
          || exit 1
 
-@endif etc
+@endif gcc
 
-.PHONY: maybe-install-html-etc install-html-etc
-maybe-install-html-etc:
-@if etc
-maybe-install-html-etc: install-html-etc
+.PHONY: maybe-install-html-gcc install-html-gcc
+maybe-install-html-gcc:
+@if gcc
+maybe-install-html-gcc: install-html-gcc
 
-install-html-etc: \
-    configure-etc \
-    html-etc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./etc/Makefile ] || exit 0; \
+install-html-gcc: \
+    configure-gcc \
+    html-gcc 
+       @[ -f ./gcc/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_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in etc" ; \
-       (cd $(HOST_SUBDIR)/etc && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -10569,25 +11004,24 @@ install-html-etc: \
                  install-html) \
          || exit 1
 
-@endif etc
+@endif gcc
 
-.PHONY: maybe-installcheck-etc installcheck-etc
-maybe-installcheck-etc:
-@if etc
-maybe-installcheck-etc: installcheck-etc
+.PHONY: maybe-installcheck-gcc installcheck-gcc
+maybe-installcheck-gcc:
+@if gcc
+maybe-installcheck-gcc: installcheck-gcc
 
-installcheck-etc: \
-    configure-etc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./etc/Makefile ] || exit 0; \
+installcheck-gcc: \
+    configure-gcc 
+       @[ -f ./gcc/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_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in etc" ; \
-       (cd $(HOST_SUBDIR)/etc && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -10595,5340 +11029,23 @@ installcheck-etc: \
                  installcheck) \
          || exit 1
 
-@endif etc
-
-.PHONY: maybe-mostlyclean-etc mostlyclean-etc
-maybe-mostlyclean-etc:
-@if etc
-maybe-mostlyclean-etc: mostlyclean-etc
+@endif gcc
 
-mostlyclean-etc: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./etc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 etc" ; \
-       (cd $(HOST_SUBDIR)/etc && \
-         $(MAKE) $(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 etc
-
-.PHONY: maybe-clean-etc clean-etc
-maybe-clean-etc:
-@if etc
-maybe-clean-etc: clean-etc
-
-clean-etc: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./etc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 etc" ; \
-       (cd $(HOST_SUBDIR)/etc && \
-         $(MAKE) $(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 etc
-
-.PHONY: maybe-distclean-etc distclean-etc
-maybe-distclean-etc:
-@if etc
-maybe-distclean-etc: distclean-etc
-
-distclean-etc: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./etc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 etc" ; \
-       (cd $(HOST_SUBDIR)/etc && \
-         $(MAKE) $(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 etc
-
-.PHONY: maybe-maintainer-clean-etc maintainer-clean-etc
-maybe-maintainer-clean-etc:
-@if etc
-maybe-maintainer-clean-etc: maintainer-clean-etc
-
-maintainer-clean-etc: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./etc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 etc" ; \
-       (cd $(HOST_SUBDIR)/etc && \
-         $(MAKE) $(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 etc
-
-
-
-.PHONY: configure-fastjar maybe-configure-fastjar
-maybe-configure-fastjar:
-@if gcc-bootstrap
-configure-fastjar: stage_current
-@endif gcc-bootstrap
-@if fastjar
-maybe-configure-fastjar: configure-fastjar
-configure-fastjar: 
-       @: $(MAKE); $(unstage)
-       @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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/fastjar; \
-       cd "$(HOST_SUBDIR)/fastjar" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/fastjar/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/fastjar"; \
-       libsrcdir="$$s/fastjar"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif fastjar
-
-
-
-
-
-.PHONY: all-fastjar maybe-all-fastjar
-maybe-all-fastjar:
-@if gcc-bootstrap
-all-fastjar: stage_current
-@endif gcc-bootstrap
-@if fastjar
-TARGET-fastjar=all
-maybe-all-fastjar: all-fastjar
-all-fastjar: configure-fastjar
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/fastjar && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-fastjar))
-@endif fastjar
-
-
-
-
-.PHONY: check-fastjar maybe-check-fastjar
-maybe-check-fastjar:
-@if fastjar
-maybe-check-fastjar: check-fastjar
-
-# This module is only tested in a native toolchain.
-check-fastjar:
-       @: $(MAKE); $(unstage)
-       @if [ '$(host)' = '$(target)' ] ; then \
-         r=`${PWD_COMMAND}`; export r; \
-         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(HOST_EXPORTS) \
-         (cd $(HOST_SUBDIR)/fastjar && \
-           $(MAKE) $(FLAGS_TO_PASS)  check); \
-       fi
-
-@endif fastjar
-
-.PHONY: install-fastjar maybe-install-fastjar
-maybe-install-fastjar:
-@if fastjar
-maybe-install-fastjar: install-fastjar
-
-install-fastjar: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/fastjar && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif fastjar
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-fastjar info-fastjar
-maybe-info-fastjar:
-@if fastjar
-maybe-info-fastjar: info-fastjar
-
-info-fastjar: \
-    configure-fastjar 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fastjar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fastjar" ; \
-       (cd $(HOST_SUBDIR)/fastjar && \
-         $(MAKE) $(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 fastjar
-
-.PHONY: maybe-dvi-fastjar dvi-fastjar
-maybe-dvi-fastjar:
-@if fastjar
-maybe-dvi-fastjar: dvi-fastjar
-
-dvi-fastjar: \
-    configure-fastjar 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fastjar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fastjar" ; \
-       (cd $(HOST_SUBDIR)/fastjar && \
-         $(MAKE) $(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 fastjar
-
-.PHONY: maybe-pdf-fastjar pdf-fastjar
-maybe-pdf-fastjar:
-@if fastjar
-maybe-pdf-fastjar: pdf-fastjar
-
-pdf-fastjar: \
-    configure-fastjar 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fastjar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fastjar" ; \
-       (cd $(HOST_SUBDIR)/fastjar && \
-         $(MAKE) $(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 fastjar
-
-.PHONY: maybe-html-fastjar html-fastjar
-maybe-html-fastjar:
-@if fastjar
-maybe-html-fastjar: html-fastjar
-
-html-fastjar: \
-    configure-fastjar 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fastjar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fastjar" ; \
-       (cd $(HOST_SUBDIR)/fastjar && \
-         $(MAKE) $(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 fastjar
-
-.PHONY: maybe-TAGS-fastjar TAGS-fastjar
-maybe-TAGS-fastjar:
-@if fastjar
-maybe-TAGS-fastjar: TAGS-fastjar
-
-TAGS-fastjar: \
-    configure-fastjar 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fastjar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fastjar" ; \
-       (cd $(HOST_SUBDIR)/fastjar && \
-         $(MAKE) $(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 fastjar
-
-.PHONY: maybe-install-info-fastjar install-info-fastjar
-maybe-install-info-fastjar:
-@if fastjar
-maybe-install-info-fastjar: install-info-fastjar
-
-install-info-fastjar: \
-    configure-fastjar \
-    info-fastjar 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fastjar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fastjar" ; \
-       (cd $(HOST_SUBDIR)/fastjar && \
-         $(MAKE) $(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 fastjar
-
-.PHONY: maybe-install-pdf-fastjar install-pdf-fastjar
-maybe-install-pdf-fastjar:
-@if fastjar
-maybe-install-pdf-fastjar: install-pdf-fastjar
-
-install-pdf-fastjar: \
-    configure-fastjar \
-    pdf-fastjar 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fastjar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fastjar" ; \
-       (cd $(HOST_SUBDIR)/fastjar && \
-         $(MAKE) $(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 fastjar
-
-.PHONY: maybe-install-html-fastjar install-html-fastjar
-maybe-install-html-fastjar:
-@if fastjar
-maybe-install-html-fastjar: install-html-fastjar
-
-install-html-fastjar: \
-    configure-fastjar \
-    html-fastjar 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fastjar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fastjar" ; \
-       (cd $(HOST_SUBDIR)/fastjar && \
-         $(MAKE) $(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 fastjar
-
-.PHONY: maybe-installcheck-fastjar installcheck-fastjar
-maybe-installcheck-fastjar:
-@if fastjar
-maybe-installcheck-fastjar: installcheck-fastjar
-
-installcheck-fastjar: \
-    configure-fastjar 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fastjar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fastjar" ; \
-       (cd $(HOST_SUBDIR)/fastjar && \
-         $(MAKE) $(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 fastjar
-
-.PHONY: maybe-mostlyclean-fastjar mostlyclean-fastjar
-maybe-mostlyclean-fastjar:
-@if fastjar
-maybe-mostlyclean-fastjar: mostlyclean-fastjar
-
-mostlyclean-fastjar: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fastjar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fastjar" ; \
-       (cd $(HOST_SUBDIR)/fastjar && \
-         $(MAKE) $(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 fastjar
-
-.PHONY: maybe-clean-fastjar clean-fastjar
-maybe-clean-fastjar:
-@if fastjar
-maybe-clean-fastjar: clean-fastjar
-
-clean-fastjar: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fastjar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fastjar" ; \
-       (cd $(HOST_SUBDIR)/fastjar && \
-         $(MAKE) $(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 fastjar
-
-.PHONY: maybe-distclean-fastjar distclean-fastjar
-maybe-distclean-fastjar:
-@if fastjar
-maybe-distclean-fastjar: distclean-fastjar
-
-distclean-fastjar: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fastjar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fastjar" ; \
-       (cd $(HOST_SUBDIR)/fastjar && \
-         $(MAKE) $(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 fastjar
-
-.PHONY: maybe-maintainer-clean-fastjar maintainer-clean-fastjar
-maybe-maintainer-clean-fastjar:
-@if fastjar
-maybe-maintainer-clean-fastjar: maintainer-clean-fastjar
-
-maintainer-clean-fastjar: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fastjar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fastjar" ; \
-       (cd $(HOST_SUBDIR)/fastjar && \
-         $(MAKE) $(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 fastjar
-
-
-
-.PHONY: configure-fileutils maybe-configure-fileutils
-maybe-configure-fileutils:
-@if gcc-bootstrap
-configure-fileutils: stage_current
-@endif gcc-bootstrap
-@if fileutils
-maybe-configure-fileutils: configure-fileutils
-configure-fileutils: 
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/fileutils/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fileutils ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/fileutils; \
-       cd "$(HOST_SUBDIR)/fileutils" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/fileutils/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/fileutils"; \
-       libsrcdir="$$s/fileutils"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif fileutils
-
-
-
-
-
-.PHONY: all-fileutils maybe-all-fileutils
-maybe-all-fileutils:
-@if gcc-bootstrap
-all-fileutils: stage_current
-@endif gcc-bootstrap
-@if fileutils
-TARGET-fileutils=all
-maybe-all-fileutils: all-fileutils
-all-fileutils: configure-fileutils
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/fileutils && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-fileutils))
-@endif fileutils
-
-
-
-
-.PHONY: check-fileutils maybe-check-fileutils
-maybe-check-fileutils:
-@if fileutils
-maybe-check-fileutils: check-fileutils
-
-check-fileutils:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/fileutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif fileutils
-
-.PHONY: install-fileutils maybe-install-fileutils
-maybe-install-fileutils:
-@if fileutils
-maybe-install-fileutils: install-fileutils
-
-install-fileutils: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/fileutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif fileutils
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-fileutils info-fileutils
-maybe-info-fileutils:
-@if fileutils
-maybe-info-fileutils: info-fileutils
-
-info-fileutils: \
-    configure-fileutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fileutils" ; \
-       (cd $(HOST_SUBDIR)/fileutils && \
-         $(MAKE) $(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 fileutils
-
-.PHONY: maybe-dvi-fileutils dvi-fileutils
-maybe-dvi-fileutils:
-@if fileutils
-maybe-dvi-fileutils: dvi-fileutils
-
-dvi-fileutils: \
-    configure-fileutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fileutils" ; \
-       (cd $(HOST_SUBDIR)/fileutils && \
-         $(MAKE) $(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 fileutils
-
-.PHONY: maybe-pdf-fileutils pdf-fileutils
-maybe-pdf-fileutils:
-@if fileutils
-maybe-pdf-fileutils: pdf-fileutils
-
-pdf-fileutils: \
-    configure-fileutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fileutils" ; \
-       (cd $(HOST_SUBDIR)/fileutils && \
-         $(MAKE) $(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 fileutils
-
-.PHONY: maybe-html-fileutils html-fileutils
-maybe-html-fileutils:
-@if fileutils
-maybe-html-fileutils: html-fileutils
-
-html-fileutils: \
-    configure-fileutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fileutils" ; \
-       (cd $(HOST_SUBDIR)/fileutils && \
-         $(MAKE) $(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 fileutils
-
-.PHONY: maybe-TAGS-fileutils TAGS-fileutils
-maybe-TAGS-fileutils:
-@if fileutils
-maybe-TAGS-fileutils: TAGS-fileutils
-
-TAGS-fileutils: \
-    configure-fileutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fileutils" ; \
-       (cd $(HOST_SUBDIR)/fileutils && \
-         $(MAKE) $(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 fileutils
-
-.PHONY: maybe-install-info-fileutils install-info-fileutils
-maybe-install-info-fileutils:
-@if fileutils
-maybe-install-info-fileutils: install-info-fileutils
-
-install-info-fileutils: \
-    configure-fileutils \
-    info-fileutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fileutils" ; \
-       (cd $(HOST_SUBDIR)/fileutils && \
-         $(MAKE) $(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 fileutils
-
-.PHONY: maybe-install-pdf-fileutils install-pdf-fileutils
-maybe-install-pdf-fileutils:
-@if fileutils
-maybe-install-pdf-fileutils: install-pdf-fileutils
-
-install-pdf-fileutils: \
-    configure-fileutils \
-    pdf-fileutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fileutils" ; \
-       (cd $(HOST_SUBDIR)/fileutils && \
-         $(MAKE) $(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 fileutils
-
-.PHONY: maybe-install-html-fileutils install-html-fileutils
-maybe-install-html-fileutils:
-@if fileutils
-maybe-install-html-fileutils: install-html-fileutils
-
-install-html-fileutils: \
-    configure-fileutils \
-    html-fileutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fileutils" ; \
-       (cd $(HOST_SUBDIR)/fileutils && \
-         $(MAKE) $(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 fileutils
-
-.PHONY: maybe-installcheck-fileutils installcheck-fileutils
-maybe-installcheck-fileutils:
-@if fileutils
-maybe-installcheck-fileutils: installcheck-fileutils
-
-installcheck-fileutils: \
-    configure-fileutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fileutils" ; \
-       (cd $(HOST_SUBDIR)/fileutils && \
-         $(MAKE) $(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 fileutils
-
-.PHONY: maybe-mostlyclean-fileutils mostlyclean-fileutils
-maybe-mostlyclean-fileutils:
-@if fileutils
-maybe-mostlyclean-fileutils: mostlyclean-fileutils
-
-mostlyclean-fileutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fileutils" ; \
-       (cd $(HOST_SUBDIR)/fileutils && \
-         $(MAKE) $(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 fileutils
-
-.PHONY: maybe-clean-fileutils clean-fileutils
-maybe-clean-fileutils:
-@if fileutils
-maybe-clean-fileutils: clean-fileutils
-
-clean-fileutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fileutils" ; \
-       (cd $(HOST_SUBDIR)/fileutils && \
-         $(MAKE) $(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 fileutils
-
-.PHONY: maybe-distclean-fileutils distclean-fileutils
-maybe-distclean-fileutils:
-@if fileutils
-maybe-distclean-fileutils: distclean-fileutils
-
-distclean-fileutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fileutils" ; \
-       (cd $(HOST_SUBDIR)/fileutils && \
-         $(MAKE) $(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 fileutils
-
-.PHONY: maybe-maintainer-clean-fileutils maintainer-clean-fileutils
-maybe-maintainer-clean-fileutils:
-@if fileutils
-maybe-maintainer-clean-fileutils: maintainer-clean-fileutils
-
-maintainer-clean-fileutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 fileutils" ; \
-       (cd $(HOST_SUBDIR)/fileutils && \
-         $(MAKE) $(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 fileutils
-
-
-
-.PHONY: configure-findutils maybe-configure-findutils
-maybe-configure-findutils:
-@if gcc-bootstrap
-configure-findutils: stage_current
-@endif gcc-bootstrap
-@if findutils
-maybe-configure-findutils: configure-findutils
-configure-findutils: 
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/findutils/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/findutils ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/findutils; \
-       cd "$(HOST_SUBDIR)/findutils" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/findutils/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/findutils"; \
-       libsrcdir="$$s/findutils"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif findutils
-
-
-
-
-
-.PHONY: all-findutils maybe-all-findutils
-maybe-all-findutils:
-@if gcc-bootstrap
-all-findutils: stage_current
-@endif gcc-bootstrap
-@if findutils
-TARGET-findutils=all
-maybe-all-findutils: all-findutils
-all-findutils: configure-findutils
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/findutils && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-findutils))
-@endif findutils
-
-
-
-
-.PHONY: check-findutils maybe-check-findutils
-maybe-check-findutils:
-@if findutils
-maybe-check-findutils: check-findutils
-
-check-findutils:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/findutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif findutils
-
-.PHONY: install-findutils maybe-install-findutils
-maybe-install-findutils:
-@if findutils
-maybe-install-findutils: install-findutils
-
-install-findutils: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/findutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif findutils
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-findutils info-findutils
-maybe-info-findutils:
-@if findutils
-maybe-info-findutils: info-findutils
-
-info-findutils: \
-    configure-findutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 findutils" ; \
-       (cd $(HOST_SUBDIR)/findutils && \
-         $(MAKE) $(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 findutils
-
-.PHONY: maybe-dvi-findutils dvi-findutils
-maybe-dvi-findutils:
-@if findutils
-maybe-dvi-findutils: dvi-findutils
-
-dvi-findutils: \
-    configure-findutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 findutils" ; \
-       (cd $(HOST_SUBDIR)/findutils && \
-         $(MAKE) $(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 findutils
-
-.PHONY: maybe-pdf-findutils pdf-findutils
-maybe-pdf-findutils:
-@if findutils
-maybe-pdf-findutils: pdf-findutils
-
-pdf-findutils: \
-    configure-findutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 findutils" ; \
-       (cd $(HOST_SUBDIR)/findutils && \
-         $(MAKE) $(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 findutils
-
-.PHONY: maybe-html-findutils html-findutils
-maybe-html-findutils:
-@if findutils
-maybe-html-findutils: html-findutils
-
-html-findutils: \
-    configure-findutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 findutils" ; \
-       (cd $(HOST_SUBDIR)/findutils && \
-         $(MAKE) $(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 findutils
-
-.PHONY: maybe-TAGS-findutils TAGS-findutils
-maybe-TAGS-findutils:
-@if findutils
-maybe-TAGS-findutils: TAGS-findutils
-
-TAGS-findutils: \
-    configure-findutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 findutils" ; \
-       (cd $(HOST_SUBDIR)/findutils && \
-         $(MAKE) $(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 findutils
-
-.PHONY: maybe-install-info-findutils install-info-findutils
-maybe-install-info-findutils:
-@if findutils
-maybe-install-info-findutils: install-info-findutils
-
-install-info-findutils: \
-    configure-findutils \
-    info-findutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 findutils" ; \
-       (cd $(HOST_SUBDIR)/findutils && \
-         $(MAKE) $(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 findutils
-
-.PHONY: maybe-install-pdf-findutils install-pdf-findutils
-maybe-install-pdf-findutils:
-@if findutils
-maybe-install-pdf-findutils: install-pdf-findutils
-
-install-pdf-findutils: \
-    configure-findutils \
-    pdf-findutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 findutils" ; \
-       (cd $(HOST_SUBDIR)/findutils && \
-         $(MAKE) $(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 findutils
-
-.PHONY: maybe-install-html-findutils install-html-findutils
-maybe-install-html-findutils:
-@if findutils
-maybe-install-html-findutils: install-html-findutils
-
-install-html-findutils: \
-    configure-findutils \
-    html-findutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 findutils" ; \
-       (cd $(HOST_SUBDIR)/findutils && \
-         $(MAKE) $(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 findutils
-
-.PHONY: maybe-installcheck-findutils installcheck-findutils
-maybe-installcheck-findutils:
-@if findutils
-maybe-installcheck-findutils: installcheck-findutils
-
-installcheck-findutils: \
-    configure-findutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 findutils" ; \
-       (cd $(HOST_SUBDIR)/findutils && \
-         $(MAKE) $(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 findutils
-
-.PHONY: maybe-mostlyclean-findutils mostlyclean-findutils
-maybe-mostlyclean-findutils:
-@if findutils
-maybe-mostlyclean-findutils: mostlyclean-findutils
-
-mostlyclean-findutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 findutils" ; \
-       (cd $(HOST_SUBDIR)/findutils && \
-         $(MAKE) $(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 findutils
-
-.PHONY: maybe-clean-findutils clean-findutils
-maybe-clean-findutils:
-@if findutils
-maybe-clean-findutils: clean-findutils
-
-clean-findutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 findutils" ; \
-       (cd $(HOST_SUBDIR)/findutils && \
-         $(MAKE) $(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 findutils
-
-.PHONY: maybe-distclean-findutils distclean-findutils
-maybe-distclean-findutils:
-@if findutils
-maybe-distclean-findutils: distclean-findutils
-
-distclean-findutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 findutils" ; \
-       (cd $(HOST_SUBDIR)/findutils && \
-         $(MAKE) $(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 findutils
-
-.PHONY: maybe-maintainer-clean-findutils maintainer-clean-findutils
-maybe-maintainer-clean-findutils:
-@if findutils
-maybe-maintainer-clean-findutils: maintainer-clean-findutils
-
-maintainer-clean-findutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 findutils" ; \
-       (cd $(HOST_SUBDIR)/findutils && \
-         $(MAKE) $(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 findutils
-
-
-
-.PHONY: configure-find maybe-configure-find
-maybe-configure-find:
-@if gcc-bootstrap
-configure-find: stage_current
-@endif gcc-bootstrap
-@if find
-maybe-configure-find: configure-find
-configure-find: 
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/find/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/find ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/find; \
-       cd "$(HOST_SUBDIR)/find" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/find/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/find"; \
-       libsrcdir="$$s/find"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif find
-
-
-
-
-
-.PHONY: all-find maybe-all-find
-maybe-all-find:
-@if gcc-bootstrap
-all-find: stage_current
-@endif gcc-bootstrap
-@if find
-TARGET-find=all
-maybe-all-find: all-find
-all-find: configure-find
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/find && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-find))
-@endif find
-
-
-
-
-.PHONY: check-find maybe-check-find
-maybe-check-find:
-@if find
-maybe-check-find: check-find
-
-check-find:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/find && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif find
-
-.PHONY: install-find maybe-install-find
-maybe-install-find:
-@if find
-maybe-install-find: install-find
-
-install-find: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/find && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif find
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-find info-find
-maybe-info-find:
-@if find
-maybe-info-find: info-find
-
-info-find: \
-    configure-find 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 find" ; \
-       (cd $(HOST_SUBDIR)/find && \
-         $(MAKE) $(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 find
-
-.PHONY: maybe-dvi-find dvi-find
-maybe-dvi-find:
-@if find
-maybe-dvi-find: dvi-find
-
-dvi-find: \
-    configure-find 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 find" ; \
-       (cd $(HOST_SUBDIR)/find && \
-         $(MAKE) $(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 find
-
-.PHONY: maybe-pdf-find pdf-find
-maybe-pdf-find:
-@if find
-maybe-pdf-find: pdf-find
-
-pdf-find: \
-    configure-find 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 find" ; \
-       (cd $(HOST_SUBDIR)/find && \
-         $(MAKE) $(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 find
-
-.PHONY: maybe-html-find html-find
-maybe-html-find:
-@if find
-maybe-html-find: html-find
-
-html-find: \
-    configure-find 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 find" ; \
-       (cd $(HOST_SUBDIR)/find && \
-         $(MAKE) $(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 find
-
-.PHONY: maybe-TAGS-find TAGS-find
-maybe-TAGS-find:
-@if find
-maybe-TAGS-find: TAGS-find
-
-TAGS-find: \
-    configure-find 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 find" ; \
-       (cd $(HOST_SUBDIR)/find && \
-         $(MAKE) $(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 find
-
-.PHONY: maybe-install-info-find install-info-find
-maybe-install-info-find:
-@if find
-maybe-install-info-find: install-info-find
-
-install-info-find: \
-    configure-find \
-    info-find 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 find" ; \
-       (cd $(HOST_SUBDIR)/find && \
-         $(MAKE) $(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 find
-
-.PHONY: maybe-install-pdf-find install-pdf-find
-maybe-install-pdf-find:
-@if find
-maybe-install-pdf-find: install-pdf-find
-
-install-pdf-find: \
-    configure-find \
-    pdf-find 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 find" ; \
-       (cd $(HOST_SUBDIR)/find && \
-         $(MAKE) $(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 find
-
-.PHONY: maybe-install-html-find install-html-find
-maybe-install-html-find:
-@if find
-maybe-install-html-find: install-html-find
-
-install-html-find: \
-    configure-find \
-    html-find 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 find" ; \
-       (cd $(HOST_SUBDIR)/find && \
-         $(MAKE) $(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 find
-
-.PHONY: maybe-installcheck-find installcheck-find
-maybe-installcheck-find:
-@if find
-maybe-installcheck-find: installcheck-find
-
-installcheck-find: \
-    configure-find 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 find" ; \
-       (cd $(HOST_SUBDIR)/find && \
-         $(MAKE) $(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 find
-
-.PHONY: maybe-mostlyclean-find mostlyclean-find
-maybe-mostlyclean-find:
-@if find
-maybe-mostlyclean-find: mostlyclean-find
-
-mostlyclean-find: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 find" ; \
-       (cd $(HOST_SUBDIR)/find && \
-         $(MAKE) $(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 find
-
-.PHONY: maybe-clean-find clean-find
-maybe-clean-find:
-@if find
-maybe-clean-find: clean-find
-
-clean-find: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 find" ; \
-       (cd $(HOST_SUBDIR)/find && \
-         $(MAKE) $(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 find
-
-.PHONY: maybe-distclean-find distclean-find
-maybe-distclean-find:
-@if find
-maybe-distclean-find: distclean-find
-
-distclean-find: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 find" ; \
-       (cd $(HOST_SUBDIR)/find && \
-         $(MAKE) $(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 find
-
-.PHONY: maybe-maintainer-clean-find maintainer-clean-find
-maybe-maintainer-clean-find:
-@if find
-maybe-maintainer-clean-find: maintainer-clean-find
-
-maintainer-clean-find: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 find" ; \
-       (cd $(HOST_SUBDIR)/find && \
-         $(MAKE) $(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 find
-
-
-
-.PHONY: configure-fixincludes maybe-configure-fixincludes
-maybe-configure-fixincludes:
-@if gcc-bootstrap
-configure-fixincludes: stage_current
-@endif gcc-bootstrap
-@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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(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; \
-       srcdiroption="--srcdir=$${topdir}/fixincludes"; \
-       libsrcdir="$$s/fixincludes"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif fixincludes
-
-
-
-
-
-.PHONY: all-fixincludes maybe-all-fixincludes
-maybe-all-fixincludes:
-@if gcc-bootstrap
-all-fixincludes: stage_current
-@endif gcc-bootstrap
-@if fixincludes
-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)  \
-               $(TARGET-fixincludes))
-@endif fixincludes
-
-
-
-
-.PHONY: check-fixincludes maybe-check-fixincludes
-maybe-check-fixincludes:
-@if fixincludes
-maybe-check-fixincludes: check-fixincludes
-
-check-fixincludes:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/fixincludes && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif fixincludes
-
-.PHONY: install-fixincludes maybe-install-fixincludes
-maybe-install-fixincludes:
-@if fixincludes
-maybe-install-fixincludes: install-fixincludes
-
-install-fixincludes: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/fixincludes && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif fixincludes
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-fixincludes info-fixincludes
-maybe-info-fixincludes:
-@if fixincludes
-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; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 info) \
-         || exit 1
-
-@endif fixincludes
-
-.PHONY: maybe-dvi-fixincludes dvi-fixincludes
-maybe-dvi-fixincludes:
-@if fixincludes
-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; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 dvi) \
-         || exit 1
-
-@endif fixincludes
-
-.PHONY: maybe-pdf-fixincludes pdf-fixincludes
-maybe-pdf-fixincludes:
-@if fixincludes
-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; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 pdf) \
-         || exit 1
-
-@endif fixincludes
-
-.PHONY: maybe-html-fixincludes html-fixincludes
-maybe-html-fixincludes:
-@if fixincludes
-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; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 html) \
-         || exit 1
-
-@endif fixincludes
-
-.PHONY: maybe-TAGS-fixincludes TAGS-fixincludes
-maybe-TAGS-fixincludes:
-@if fixincludes
-maybe-TAGS-fixincludes: TAGS-fixincludes
-
-# fixincludes doesn't support TAGS.
-TAGS-fixincludes:
-
-@endif fixincludes
-
-.PHONY: maybe-install-info-fixincludes install-info-fixincludes
-maybe-install-info-fixincludes:
-@if fixincludes
-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; \
-       $(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 fixincludes" ; \
-       (cd $(HOST_SUBDIR)/fixincludes && \
-         $(MAKE) $(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 fixincludes
-
-.PHONY: maybe-install-pdf-fixincludes install-pdf-fixincludes
-maybe-install-pdf-fixincludes:
-@if fixincludes
-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; \
-       $(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 fixincludes" ; \
-       (cd $(HOST_SUBDIR)/fixincludes && \
-         $(MAKE) $(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 fixincludes
-
-.PHONY: maybe-install-html-fixincludes install-html-fixincludes
-maybe-install-html-fixincludes:
-@if fixincludes
-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; \
-       $(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 fixincludes" ; \
-       (cd $(HOST_SUBDIR)/fixincludes && \
-         $(MAKE) $(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 fixincludes
-
-.PHONY: maybe-installcheck-fixincludes installcheck-fixincludes
-maybe-installcheck-fixincludes:
-@if fixincludes
-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; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 installcheck) \
-         || exit 1
-
-@endif fixincludes
-
-.PHONY: maybe-mostlyclean-fixincludes mostlyclean-fixincludes
-maybe-mostlyclean-fixincludes:
-@if 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; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 mostlyclean) \
-         || exit 1
-
-@endif fixincludes
-
-.PHONY: maybe-clean-fixincludes clean-fixincludes
-maybe-clean-fixincludes:
-@if 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; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 clean) \
-         || exit 1
-
-@endif fixincludes
-
-.PHONY: maybe-distclean-fixincludes distclean-fixincludes
-maybe-distclean-fixincludes:
-@if 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; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 distclean) \
-         || exit 1
-
-@endif fixincludes
-
-.PHONY: maybe-maintainer-clean-fixincludes maintainer-clean-fixincludes
-maybe-maintainer-clean-fixincludes:
-@if 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; \
-       $(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 fixincludes" ; \
-       (cd $(HOST_SUBDIR)/fixincludes && \
-         $(MAKE) $(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 fixincludes
-
-
-
-.PHONY: configure-flex maybe-configure-flex
-maybe-configure-flex:
-@if gcc-bootstrap
-configure-flex: stage_current
-@endif gcc-bootstrap
-@if flex
-maybe-configure-flex: configure-flex
-configure-flex: 
-       @: $(MAKE); $(unstage)
-       @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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/flex; \
-       cd "$(HOST_SUBDIR)/flex" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/flex/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/flex"; \
-       libsrcdir="$$s/flex"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif flex
-
-
-
-
-
-.PHONY: all-flex maybe-all-flex
-maybe-all-flex:
-@if gcc-bootstrap
-all-flex: stage_current
-@endif gcc-bootstrap
-@if flex
-TARGET-flex=all
-maybe-all-flex: all-flex
-all-flex: configure-flex
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/flex && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-flex))
-@endif flex
-
-
-
-
-.PHONY: check-flex maybe-check-flex
-maybe-check-flex:
-@if flex
-maybe-check-flex: check-flex
-
-# This module is only tested in a native toolchain.
-check-flex:
-       @: $(MAKE); $(unstage)
-       @if [ '$(host)' = '$(target)' ] ; then \
-         r=`${PWD_COMMAND}`; export r; \
-         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(HOST_EXPORTS) \
-         (cd $(HOST_SUBDIR)/flex && \
-           $(MAKE) $(FLAGS_TO_PASS)  check); \
-       fi
-
-@endif flex
-
-.PHONY: install-flex maybe-install-flex
-maybe-install-flex:
-@if flex
-maybe-install-flex: install-flex
-
-install-flex: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/flex && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif flex
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-flex info-flex
-maybe-info-flex:
-@if flex
-maybe-info-flex: info-flex
-
-info-flex: \
-    configure-flex 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 flex" ; \
-       (cd $(HOST_SUBDIR)/flex && \
-         $(MAKE) $(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 flex
-
-.PHONY: maybe-dvi-flex dvi-flex
-maybe-dvi-flex:
-@if flex
-maybe-dvi-flex: dvi-flex
-
-dvi-flex: \
-    configure-flex 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 flex" ; \
-       (cd $(HOST_SUBDIR)/flex && \
-         $(MAKE) $(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 flex
-
-.PHONY: maybe-pdf-flex pdf-flex
-maybe-pdf-flex:
-@if flex
-maybe-pdf-flex: pdf-flex
-
-pdf-flex: \
-    configure-flex 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 flex" ; \
-       (cd $(HOST_SUBDIR)/flex && \
-         $(MAKE) $(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 flex
-
-.PHONY: maybe-html-flex html-flex
-maybe-html-flex:
-@if flex
-maybe-html-flex: html-flex
-
-html-flex: \
-    configure-flex 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 flex" ; \
-       (cd $(HOST_SUBDIR)/flex && \
-         $(MAKE) $(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 flex
-
-.PHONY: maybe-TAGS-flex TAGS-flex
-maybe-TAGS-flex:
-@if flex
-maybe-TAGS-flex: TAGS-flex
-
-TAGS-flex: \
-    configure-flex 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 flex" ; \
-       (cd $(HOST_SUBDIR)/flex && \
-         $(MAKE) $(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 flex
-
-.PHONY: maybe-install-info-flex install-info-flex
-maybe-install-info-flex:
-@if flex
-maybe-install-info-flex: install-info-flex
-
-install-info-flex: \
-    configure-flex \
-    info-flex 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 flex" ; \
-       (cd $(HOST_SUBDIR)/flex && \
-         $(MAKE) $(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 flex
-
-.PHONY: maybe-install-pdf-flex install-pdf-flex
-maybe-install-pdf-flex:
-@if flex
-maybe-install-pdf-flex: install-pdf-flex
-
-install-pdf-flex: \
-    configure-flex \
-    pdf-flex 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 flex" ; \
-       (cd $(HOST_SUBDIR)/flex && \
-         $(MAKE) $(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 flex
-
-.PHONY: maybe-install-html-flex install-html-flex
-maybe-install-html-flex:
-@if flex
-maybe-install-html-flex: install-html-flex
-
-install-html-flex: \
-    configure-flex \
-    html-flex 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 flex" ; \
-       (cd $(HOST_SUBDIR)/flex && \
-         $(MAKE) $(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 flex
-
-.PHONY: maybe-installcheck-flex installcheck-flex
-maybe-installcheck-flex:
-@if flex
-maybe-installcheck-flex: installcheck-flex
-
-installcheck-flex: \
-    configure-flex 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 flex" ; \
-       (cd $(HOST_SUBDIR)/flex && \
-         $(MAKE) $(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 flex
-
-.PHONY: maybe-mostlyclean-flex mostlyclean-flex
-maybe-mostlyclean-flex:
-@if flex
-maybe-mostlyclean-flex: mostlyclean-flex
-
-mostlyclean-flex: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 flex" ; \
-       (cd $(HOST_SUBDIR)/flex && \
-         $(MAKE) $(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 flex
-
-.PHONY: maybe-clean-flex clean-flex
-maybe-clean-flex:
-@if flex
-maybe-clean-flex: clean-flex
-
-clean-flex: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 flex" ; \
-       (cd $(HOST_SUBDIR)/flex && \
-         $(MAKE) $(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 flex
-
-.PHONY: maybe-distclean-flex distclean-flex
-maybe-distclean-flex:
-@if flex
-maybe-distclean-flex: distclean-flex
-
-distclean-flex: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 flex" ; \
-       (cd $(HOST_SUBDIR)/flex && \
-         $(MAKE) $(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 flex
-
-.PHONY: maybe-maintainer-clean-flex maintainer-clean-flex
-maybe-maintainer-clean-flex:
-@if flex
-maybe-maintainer-clean-flex: maintainer-clean-flex
-
-maintainer-clean-flex: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 flex" ; \
-       (cd $(HOST_SUBDIR)/flex && \
-         $(MAKE) $(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 flex
-
-
-
-.PHONY: configure-gas maybe-configure-gas
-maybe-configure-gas:
-@if gcc-bootstrap
-configure-gas: stage_current
-@endif gcc-bootstrap
-@if gas
-maybe-configure-gas: configure-gas
-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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif gas
-
-
-
-.PHONY: configure-stage1-gas maybe-configure-stage1-gas
-maybe-configure-stage1-gas:
-@if gas-bootstrap
-maybe-configure-stage1-gas: configure-stage1-gas
-configure-stage1-gas:
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-       $(HOST_EXPORTS)  \
-       CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-          \
-         --disable-intermodule $(STAGE1_CHECKING)        --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif gas-bootstrap
-
-.PHONY: configure-stage2-gas maybe-configure-stage2-gas
-maybe-configure-stage2-gas:
-@if gas-bootstrap
-maybe-configure-stage2-gas: configure-stage2-gas
-configure-stage2-gas:
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif gas-bootstrap
-
-.PHONY: configure-stageb2g0-gas maybe-configure-stageb2g0-gas
-maybe-configure-stageb2g0-gas:
-@if gas-bootstrap
-maybe-configure-stageb2g0-gas: configure-stageb2g0-gas
-configure-stageb2g0-gas:
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
-       echo Configuring stage b2g0 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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif gas-bootstrap
-
-.PHONY: configure-stage3-gas maybe-configure-stage3-gas
-maybe-configure-stage3-gas:
-@if gas-bootstrap
-maybe-configure-stage3-gas: configure-stage3-gas
-configure-stage3-gas:
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif gas-bootstrap
-
-.PHONY: configure-stageb3g2-gas maybe-configure-stageb3g2-gas
-maybe-configure-stageb3g2-gas:
-@if gas-bootstrap
-maybe-configure-stageb3g2-gas: configure-stageb3g2-gas
-configure-stageb3g2-gas:
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
-       echo Configuring stage b3g2 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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif gas-bootstrap
-
-.PHONY: configure-stage4-gas maybe-configure-stage4-gas
-maybe-configure-stage4-gas:
-@if gas-bootstrap
-maybe-configure-stage4-gas: configure-stage4-gas
-configure-stage4-gas:
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif gas-bootstrap
-
-.PHONY: configure-stageprofile-gas maybe-configure-stageprofile-gas
-maybe-configure-stageprofile-gas:
-@if gas-bootstrap
-maybe-configure-stageprofile-gas: configure-stageprofile-gas
-configure-stageprofile-gas:
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif gas-bootstrap
-
-.PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas
-maybe-configure-stagefeedback-gas:
-@if gas-bootstrap
-maybe-configure-stagefeedback-gas: configure-stagefeedback-gas
-configure-stagefeedback-gas:
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif gas-bootstrap
-
-
-
-
-
-.PHONY: all-gas maybe-all-gas
-maybe-all-gas:
-@if gcc-bootstrap
-all-gas: stage_current
-@endif gcc-bootstrap
-@if gas
-TARGET-gas=all
-maybe-all-gas: all-gas
-all-gas: configure-gas
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gas && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-gas))
-@endif gas
-
-
-
-.PHONY: all-stage1-gas maybe-all-stage1-gas
-.PHONY: clean-stage1-gas maybe-clean-stage1-gas
-maybe-all-stage1-gas:
-maybe-clean-stage1-gas:
-@if gas-bootstrap
-maybe-all-stage1-gas: all-stage1-gas
-all-stage1: all-stage1-gas
-TARGET-stage1-gas = $(TARGET-gas)
-all-stage1-gas: configure-stage1-gas
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-               LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
-               $(TARGET-stage1-gas)
-
-maybe-clean-stage1-gas: clean-stage1-gas
-clean-stage1: clean-stage1-gas
-clean-stage1-gas:
-       @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage1-gas/Makefile ] || exit 0; \
-         $(MAKE) stage1-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
-@endif gas-bootstrap
-
-
-.PHONY: all-stage2-gas maybe-all-stage2-gas
-.PHONY: clean-stage2-gas maybe-clean-stage2-gas
-maybe-all-stage2-gas:
-maybe-clean-stage2-gas:
-@if gas-bootstrap
-maybe-all-stage2-gas: all-stage2-gas
-all-stage2: all-stage2-gas
-TARGET-stage2-gas = $(TARGET-gas)
-all-stage2-gas: configure-stage2-gas
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage2-gas)
-
-maybe-clean-stage2-gas: clean-stage2-gas
-clean-stage2: clean-stage2-gas
-clean-stage2-gas:
-       @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage2-gas/Makefile ] || exit 0; \
-         $(MAKE) stage2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gas-bootstrap
-
-
-.PHONY: all-stageb2g0-gas maybe-all-stageb2g0-gas
-.PHONY: clean-stageb2g0-gas maybe-clean-stageb2g0-gas
-maybe-all-stageb2g0-gas:
-maybe-clean-stageb2g0-gas:
-@if gas-bootstrap
-maybe-all-stageb2g0-gas: all-stageb2g0-gas
-all-stageb2g0: all-stageb2g0-gas
-TARGET-stageb2g0-gas = $(TARGET-gas)
-all-stageb2g0-gas: configure-stageb2g0-gas
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb2g0-gas)
-
-maybe-clean-stageb2g0-gas: clean-stageb2g0-gas
-clean-stageb2g0: clean-stageb2g0-gas
-clean-stageb2g0-gas:
-       @if [ $(current_stage) = stageb2g0 ]; then \
-         [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb2g0-gas/Makefile ] || exit 0; \
-         $(MAKE) stageb2g0-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gas-bootstrap
-
-
-.PHONY: all-stage3-gas maybe-all-stage3-gas
-.PHONY: clean-stage3-gas maybe-clean-stage3-gas
-maybe-all-stage3-gas:
-maybe-clean-stage3-gas:
-@if gas-bootstrap
-maybe-all-stage3-gas: all-stage3-gas
-all-stage3: all-stage3-gas
-TARGET-stage3-gas = $(TARGET-gas)
-all-stage3-gas: configure-stage3-gas
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage3-gas)
-
-maybe-clean-stage3-gas: clean-stage3-gas
-clean-stage3: clean-stage3-gas
-clean-stage3-gas:
-       @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage3-gas/Makefile ] || exit 0; \
-         $(MAKE) stage3-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gas-bootstrap
-
-
-.PHONY: all-stageb3g2-gas maybe-all-stageb3g2-gas
-.PHONY: clean-stageb3g2-gas maybe-clean-stageb3g2-gas
-maybe-all-stageb3g2-gas:
-maybe-clean-stageb3g2-gas:
-@if gas-bootstrap
-maybe-all-stageb3g2-gas: all-stageb3g2-gas
-all-stageb3g2: all-stageb3g2-gas
-TARGET-stageb3g2-gas = $(TARGET-gas)
-all-stageb3g2-gas: configure-stageb3g2-gas
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb3g2-gas)
-
-maybe-clean-stageb3g2-gas: clean-stageb3g2-gas
-clean-stageb3g2: clean-stageb3g2-gas
-clean-stageb3g2-gas:
-       @if [ $(current_stage) = stageb3g2 ]; then \
-         [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb3g2-gas/Makefile ] || exit 0; \
-         $(MAKE) stageb3g2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gas-bootstrap
-
-
-.PHONY: all-stage4-gas maybe-all-stage4-gas
-.PHONY: clean-stage4-gas maybe-clean-stage4-gas
-maybe-all-stage4-gas:
-maybe-clean-stage4-gas:
-@if gas-bootstrap
-maybe-all-stage4-gas: all-stage4-gas
-all-stage4: all-stage4-gas
-TARGET-stage4-gas = $(TARGET-gas)
-all-stage4-gas: configure-stage4-gas
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-               LIBCFLAGS="$(STAGE4_CFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage4-gas)
-
-maybe-clean-stage4-gas: clean-stage4-gas
-clean-stage4: clean-stage4-gas
-clean-stage4-gas:
-       @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage4-gas/Makefile ] || exit 0; \
-         $(MAKE) stage4-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gas-bootstrap
-
-
-.PHONY: all-stageprofile-gas maybe-all-stageprofile-gas
-.PHONY: clean-stageprofile-gas maybe-clean-stageprofile-gas
-maybe-all-stageprofile-gas:
-maybe-clean-stageprofile-gas:
-@if gas-bootstrap
-maybe-all-stageprofile-gas: all-stageprofile-gas
-all-stageprofile: all-stageprofile-gas
-TARGET-stageprofile-gas = $(TARGET-gas)
-all-stageprofile-gas: configure-stageprofile-gas
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageprofile-gas)
-
-maybe-clean-stageprofile-gas: clean-stageprofile-gas
-clean-stageprofile: clean-stageprofile-gas
-clean-stageprofile-gas:
-       @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageprofile-gas/Makefile ] || exit 0; \
-         $(MAKE) stageprofile-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gas-bootstrap
-
-
-.PHONY: all-stagefeedback-gas maybe-all-stagefeedback-gas
-.PHONY: clean-stagefeedback-gas maybe-clean-stagefeedback-gas
-maybe-all-stagefeedback-gas:
-maybe-clean-stagefeedback-gas:
-@if gas-bootstrap
-maybe-all-stagefeedback-gas: all-stagefeedback-gas
-all-stagefeedback: all-stagefeedback-gas
-TARGET-stagefeedback-gas = $(TARGET-gas)
-all-stagefeedback-gas: configure-stagefeedback-gas
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stagefeedback-gas)
-
-maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
-clean-stagefeedback: clean-stagefeedback-gas
-clean-stagefeedback-gas:
-       @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-gas/Makefile ] || exit 0; \
-         $(MAKE) stagefeedback-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gas && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gas-bootstrap
-
-
-
-
-
-.PHONY: check-gas maybe-check-gas
-maybe-check-gas:
-@if gas
-maybe-check-gas: check-gas
-
-check-gas:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gas && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif gas
-
-.PHONY: install-gas maybe-install-gas
-maybe-install-gas:
-@if gas
-maybe-install-gas: install-gas
-
-install-gas: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gas && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif gas
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-gas info-gas
-maybe-info-gas:
-@if gas
-maybe-info-gas: info-gas
-
-info-gas: \
-    configure-gas 
-       @[ -f ./gas/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
-         $(MAKE) $(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 gas
-
-.PHONY: maybe-dvi-gas dvi-gas
-maybe-dvi-gas:
-@if gas
-maybe-dvi-gas: dvi-gas
-
-dvi-gas: \
-    configure-gas 
-       @[ -f ./gas/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
-         $(MAKE) $(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 gas
-
-.PHONY: maybe-pdf-gas pdf-gas
-maybe-pdf-gas:
-@if gas
-maybe-pdf-gas: pdf-gas
-
-pdf-gas: \
-    configure-gas 
-       @[ -f ./gas/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
-         $(MAKE) $(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 gas
-
-.PHONY: maybe-html-gas html-gas
-maybe-html-gas:
-@if gas
-maybe-html-gas: html-gas
-
-html-gas: \
-    configure-gas 
-       @[ -f ./gas/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
-         $(MAKE) $(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 gas
-
-.PHONY: maybe-TAGS-gas TAGS-gas
-maybe-TAGS-gas:
-@if gas
-maybe-TAGS-gas: TAGS-gas
-
-TAGS-gas: \
-    configure-gas 
-       @[ -f ./gas/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
-         $(MAKE) $(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 gas
-
-.PHONY: maybe-install-info-gas install-info-gas
-maybe-install-info-gas:
-@if gas
-maybe-install-info-gas: install-info-gas
-
-install-info-gas: \
-    configure-gas \
-    info-gas 
-       @[ -f ./gas/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
-         $(MAKE) $(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 gas
-
-.PHONY: maybe-install-pdf-gas install-pdf-gas
-maybe-install-pdf-gas:
-@if gas
-maybe-install-pdf-gas: install-pdf-gas
-
-install-pdf-gas: \
-    configure-gas \
-    pdf-gas 
-       @[ -f ./gas/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
-         $(MAKE) $(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 gas
-
-.PHONY: maybe-install-html-gas install-html-gas
-maybe-install-html-gas:
-@if gas
-maybe-install-html-gas: install-html-gas
-
-install-html-gas: \
-    configure-gas \
-    html-gas 
-       @[ -f ./gas/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
-         $(MAKE) $(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 gas
-
-.PHONY: maybe-installcheck-gas installcheck-gas
-maybe-installcheck-gas:
-@if gas
-maybe-installcheck-gas: installcheck-gas
-
-installcheck-gas: \
-    configure-gas 
-       @[ -f ./gas/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
-         $(MAKE) $(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 gas
-
-.PHONY: maybe-mostlyclean-gas mostlyclean-gas
-maybe-mostlyclean-gas:
-@if gas
-maybe-mostlyclean-gas: mostlyclean-gas
-
-mostlyclean-gas: 
-       @[ -f ./gas/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
-         $(MAKE) $(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 gas
-
-.PHONY: maybe-clean-gas clean-gas
-maybe-clean-gas:
-@if gas
-maybe-clean-gas: clean-gas
-
-clean-gas: 
-       @[ -f ./gas/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
-         $(MAKE) $(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 gas
-
-.PHONY: maybe-distclean-gas distclean-gas
-maybe-distclean-gas:
-@if gas
-maybe-distclean-gas: distclean-gas
-
-distclean-gas: 
-       @[ -f ./gas/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
-         $(MAKE) $(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 gas
-
-.PHONY: maybe-maintainer-clean-gas maintainer-clean-gas
-maybe-maintainer-clean-gas:
-@if gas
-maybe-maintainer-clean-gas: maintainer-clean-gas
-
-maintainer-clean-gas: 
-       @[ -f ./gas/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
-         $(MAKE) $(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 gas
-
-
-
-.PHONY: configure-gcc maybe-configure-gcc
-maybe-configure-gcc:
-@if gcc-bootstrap
-configure-gcc: stage_current
-@endif gcc-bootstrap
-@if gcc
-maybe-configure-gcc: configure-gcc
-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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif gcc
-
-
-
-.PHONY: configure-stage1-gcc maybe-configure-stage1-gcc
-maybe-configure-stage1-gcc:
-@if gcc-bootstrap
-maybe-configure-stage1-gcc: configure-stage1-gcc
-configure-stage1-gcc:
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-       $(HOST_EXPORTS)  \
-       CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-          \
-         --disable-intermodule $(STAGE1_CHECKING)        --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif gcc-bootstrap
-
-.PHONY: configure-stage2-gcc maybe-configure-stage2-gcc
-maybe-configure-stage2-gcc:
-@if gcc-bootstrap
-maybe-configure-stage2-gcc: configure-stage2-gcc
-configure-stage2-gcc:
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif gcc-bootstrap
-
-.PHONY: configure-stageb2g0-gcc maybe-configure-stageb2g0-gcc
-maybe-configure-stageb2g0-gcc:
-@if gcc-bootstrap
-maybe-configure-stageb2g0-gcc: configure-stageb2g0-gcc
-configure-stageb2g0-gcc:
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
-       echo Configuring stage b2g0 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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif gcc-bootstrap
-
-.PHONY: configure-stage3-gcc maybe-configure-stage3-gcc
-maybe-configure-stage3-gcc:
-@if gcc-bootstrap
-maybe-configure-stage3-gcc: configure-stage3-gcc
-configure-stage3-gcc:
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif gcc-bootstrap
-
-.PHONY: configure-stageb3g2-gcc maybe-configure-stageb3g2-gcc
-maybe-configure-stageb3g2-gcc:
-@if gcc-bootstrap
-maybe-configure-stageb3g2-gcc: configure-stageb3g2-gcc
-configure-stageb3g2-gcc:
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
-       echo Configuring stage b3g2 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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif gcc-bootstrap
-
-.PHONY: configure-stage4-gcc maybe-configure-stage4-gcc
-maybe-configure-stage4-gcc:
-@if gcc-bootstrap
-maybe-configure-stage4-gcc: configure-stage4-gcc
-configure-stage4-gcc:
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif gcc-bootstrap
-
-.PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc
-maybe-configure-stageprofile-gcc:
-@if gcc-bootstrap
-maybe-configure-stageprofile-gcc: configure-stageprofile-gcc
-configure-stageprofile-gcc:
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif gcc-bootstrap
-
-.PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc
-maybe-configure-stagefeedback-gcc:
-@if gcc-bootstrap
-maybe-configure-stagefeedback-gcc: configure-stagefeedback-gcc
-configure-stagefeedback-gcc:
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif gcc-bootstrap
-
-
-
-
-
-.PHONY: all-gcc maybe-all-gcc
-maybe-all-gcc:
-@if gcc-bootstrap
-all-gcc: stage_current
-@endif gcc-bootstrap
-@if gcc
-TARGET-gcc=all
-maybe-all-gcc: all-gcc
-all-gcc: configure-gcc
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) \
-               $(TARGET-gcc))
-@endif gcc
-
-
-
-.PHONY: all-stage1-gcc maybe-all-stage1-gcc
-.PHONY: clean-stage1-gcc maybe-clean-stage1-gcc
-maybe-all-stage1-gcc:
-maybe-clean-stage1-gcc:
-@if gcc-bootstrap
-maybe-all-stage1-gcc: all-stage1-gcc
-all-stage1: all-stage1-gcc
-TARGET-stage1-gcc = $(TARGET-gcc)
-all-stage1-gcc: configure-stage1-gcc
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-               LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)  $(EXTRA_GCC_FLAGS) \
-               $(TARGET-stage1-gcc)
-
-maybe-clean-stage1-gcc: clean-stage1-gcc
-clean-stage1: clean-stage1-gcc
-clean-stage1-gcc:
-       @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage1-gcc/Makefile ] || exit 0; \
-         $(MAKE) stage1-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: all-stage2-gcc maybe-all-stage2-gcc
-.PHONY: clean-stage2-gcc maybe-clean-stage2-gcc
-maybe-all-stage2-gcc:
-maybe-clean-stage2-gcc:
-@if gcc-bootstrap
-maybe-all-stage2-gcc: all-stage2-gcc
-all-stage2: all-stage2-gcc
-TARGET-stage2-gcc = $(TARGET-gcc)
-all-stage2-gcc: configure-stage2-gcc
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-               $(TARGET-stage2-gcc)
-
-maybe-clean-stage2-gcc: clean-stage2-gcc
-clean-stage2: clean-stage2-gcc
-clean-stage2-gcc:
-       @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage2-gcc/Makefile ] || exit 0; \
-         $(MAKE) stage2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: all-stageb2g0-gcc maybe-all-stageb2g0-gcc
-.PHONY: clean-stageb2g0-gcc maybe-clean-stageb2g0-gcc
-maybe-all-stageb2g0-gcc:
-maybe-clean-stageb2g0-gcc:
-@if gcc-bootstrap
-maybe-all-stageb2g0-gcc: all-stageb2g0-gcc
-all-stageb2g0: all-stageb2g0-gcc
-TARGET-stageb2g0-gcc = $(TARGET-gcc)
-all-stageb2g0-gcc: configure-stageb2g0-gcc
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-               $(TARGET-stageb2g0-gcc)
-
-maybe-clean-stageb2g0-gcc: clean-stageb2g0-gcc
-clean-stageb2g0: clean-stageb2g0-gcc
-clean-stageb2g0-gcc:
-       @if [ $(current_stage) = stageb2g0 ]; then \
-         [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb2g0-gcc/Makefile ] || exit 0; \
-         $(MAKE) stageb2g0-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: all-stage3-gcc maybe-all-stage3-gcc
-.PHONY: clean-stage3-gcc maybe-clean-stage3-gcc
-maybe-all-stage3-gcc:
-maybe-clean-stage3-gcc:
-@if gcc-bootstrap
-maybe-all-stage3-gcc: all-stage3-gcc
-all-stage3: all-stage3-gcc
-TARGET-stage3-gcc = $(TARGET-gcc)
-all-stage3-gcc: configure-stage3-gcc
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-               $(TARGET-stage3-gcc)
-
-maybe-clean-stage3-gcc: clean-stage3-gcc
-clean-stage3: clean-stage3-gcc
-clean-stage3-gcc:
-       @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage3-gcc/Makefile ] || exit 0; \
-         $(MAKE) stage3-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: all-stageb3g2-gcc maybe-all-stageb3g2-gcc
-.PHONY: clean-stageb3g2-gcc maybe-clean-stageb3g2-gcc
-maybe-all-stageb3g2-gcc:
-maybe-clean-stageb3g2-gcc:
-@if gcc-bootstrap
-maybe-all-stageb3g2-gcc: all-stageb3g2-gcc
-all-stageb3g2: all-stageb3g2-gcc
-TARGET-stageb3g2-gcc = $(TARGET-gcc)
-all-stageb3g2-gcc: configure-stageb3g2-gcc
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-               $(TARGET-stageb3g2-gcc)
-
-maybe-clean-stageb3g2-gcc: clean-stageb3g2-gcc
-clean-stageb3g2: clean-stageb3g2-gcc
-clean-stageb3g2-gcc:
-       @if [ $(current_stage) = stageb3g2 ]; then \
-         [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb3g2-gcc/Makefile ] || exit 0; \
-         $(MAKE) stageb3g2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: all-stage4-gcc maybe-all-stage4-gcc
-.PHONY: clean-stage4-gcc maybe-clean-stage4-gcc
-maybe-all-stage4-gcc:
-maybe-clean-stage4-gcc:
-@if gcc-bootstrap
-maybe-all-stage4-gcc: all-stage4-gcc
-all-stage4: all-stage4-gcc
-TARGET-stage4-gcc = $(TARGET-gcc)
-all-stage4-gcc: configure-stage4-gcc
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-               LIBCFLAGS="$(STAGE4_CFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-               $(TARGET-stage4-gcc)
-
-maybe-clean-stage4-gcc: clean-stage4-gcc
-clean-stage4: clean-stage4-gcc
-clean-stage4-gcc:
-       @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage4-gcc/Makefile ] || exit 0; \
-         $(MAKE) stage4-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: all-stageprofile-gcc maybe-all-stageprofile-gcc
-.PHONY: clean-stageprofile-gcc maybe-clean-stageprofile-gcc
-maybe-all-stageprofile-gcc:
-maybe-clean-stageprofile-gcc:
-@if gcc-bootstrap
-maybe-all-stageprofile-gcc: all-stageprofile-gcc
-all-stageprofile: all-stageprofile-gcc
-TARGET-stageprofile-gcc = $(TARGET-gcc)
-all-stageprofile-gcc: configure-stageprofile-gcc
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-               $(TARGET-stageprofile-gcc)
-
-maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
-clean-stageprofile: clean-stageprofile-gcc
-clean-stageprofile-gcc:
-       @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageprofile-gcc/Makefile ] || exit 0; \
-         $(MAKE) stageprofile-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: all-stagefeedback-gcc maybe-all-stagefeedback-gcc
-.PHONY: clean-stagefeedback-gcc maybe-clean-stagefeedback-gcc
-maybe-all-stagefeedback-gcc:
-maybe-clean-stagefeedback-gcc:
-@if gcc-bootstrap
-maybe-all-stagefeedback-gcc: all-stagefeedback-gcc
-all-stagefeedback: all-stagefeedback-gcc
-TARGET-stagefeedback-gcc = $(TARGET-gcc)
-all-stagefeedback-gcc: configure-stagefeedback-gcc
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-               $(TARGET-stagefeedback-gcc)
-
-maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
-clean-stagefeedback: clean-stagefeedback-gcc
-clean-stagefeedback-gcc:
-       @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-gcc/Makefile ] || exit 0; \
-         $(MAKE) stagefeedback-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gcc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-
-
-
-.PHONY: check-gcc maybe-check-gcc
-maybe-check-gcc:
-@if gcc
-maybe-check-gcc: check-gcc
-
-check-gcc:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gcc && \
-         $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) check)
-
-@endif gcc
-
-.PHONY: install-gcc maybe-install-gcc
-maybe-install-gcc:
-@if gcc
-maybe-install-gcc: install-gcc
-
-install-gcc: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gcc && \
-         $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) install)
-
-@endif gcc
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-gcc info-gcc
-maybe-info-gcc:
-@if gcc
-maybe-info-gcc: info-gcc
-
-info-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       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" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
-         $(MAKE) $(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 gcc
-
-.PHONY: maybe-dvi-gcc dvi-gcc
-maybe-dvi-gcc:
-@if gcc
-maybe-dvi-gcc: dvi-gcc
-
-dvi-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       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" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
-         $(MAKE) $(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 gcc
-
-.PHONY: maybe-pdf-gcc pdf-gcc
-maybe-pdf-gcc:
-@if gcc
-maybe-pdf-gcc: pdf-gcc
-
-pdf-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       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" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
-         $(MAKE) $(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 gcc
-
-.PHONY: maybe-html-gcc html-gcc
-maybe-html-gcc:
-@if gcc
-maybe-html-gcc: html-gcc
-
-html-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       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" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
-         $(MAKE) $(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 gcc
-
-.PHONY: maybe-TAGS-gcc TAGS-gcc
-maybe-TAGS-gcc:
-@if gcc
-maybe-TAGS-gcc: TAGS-gcc
-
-TAGS-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       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" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
-         $(MAKE) $(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 gcc
-
-.PHONY: maybe-install-info-gcc install-info-gcc
-maybe-install-info-gcc:
-@if gcc
-maybe-install-info-gcc: install-info-gcc
-
-install-info-gcc: \
-    configure-gcc \
-    info-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       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" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
-         $(MAKE) $(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 gcc
-
-.PHONY: maybe-install-pdf-gcc install-pdf-gcc
-maybe-install-pdf-gcc:
-@if gcc
-maybe-install-pdf-gcc: install-pdf-gcc
-
-install-pdf-gcc: \
-    configure-gcc \
-    pdf-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       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" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
-         $(MAKE) $(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 gcc
-
-.PHONY: maybe-install-html-gcc install-html-gcc
-maybe-install-html-gcc:
-@if gcc
-maybe-install-html-gcc: install-html-gcc
-
-install-html-gcc: \
-    configure-gcc \
-    html-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       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" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
-         $(MAKE) $(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 gcc
-
-.PHONY: maybe-installcheck-gcc installcheck-gcc
-maybe-installcheck-gcc:
-@if gcc
-maybe-installcheck-gcc: installcheck-gcc
-
-installcheck-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       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" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
-         $(MAKE) $(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 gcc
-
-.PHONY: maybe-mostlyclean-gcc mostlyclean-gcc
-maybe-mostlyclean-gcc:
-@if gcc
-maybe-mostlyclean-gcc: mostlyclean-gcc
-
-mostlyclean-gcc: 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       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" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
-         $(MAKE) $(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 gcc
-
-.PHONY: maybe-clean-gcc clean-gcc
-maybe-clean-gcc:
-@if gcc
-maybe-clean-gcc: clean-gcc
-
-clean-gcc: 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       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" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
-         $(MAKE) $(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 gcc
-
-.PHONY: maybe-distclean-gcc distclean-gcc
-maybe-distclean-gcc:
-@if gcc
-maybe-distclean-gcc: distclean-gcc
-
-distclean-gcc: 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       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" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
-         $(MAKE) $(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 gcc
-
-.PHONY: maybe-maintainer-clean-gcc maintainer-clean-gcc
-maybe-maintainer-clean-gcc:
-@if gcc
-maybe-maintainer-clean-gcc: maintainer-clean-gcc
-
-maintainer-clean-gcc: 
-       @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       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" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
-         $(MAKE) $(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 gcc
-
-
-
-.PHONY: configure-gawk maybe-configure-gawk
-maybe-configure-gawk:
-@if gcc-bootstrap
-configure-gawk: stage_current
-@endif gcc-bootstrap
-@if gawk
-maybe-configure-gawk: configure-gawk
-configure-gawk: 
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gawk/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gawk ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/gawk; \
-       cd "$(HOST_SUBDIR)/gawk" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gawk/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gawk"; \
-       libsrcdir="$$s/gawk"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif gawk
-
-
-
-
-
-.PHONY: all-gawk maybe-all-gawk
-maybe-all-gawk:
-@if gcc-bootstrap
-all-gawk: stage_current
-@endif gcc-bootstrap
-@if gawk
-TARGET-gawk=all
-maybe-all-gawk: all-gawk
-all-gawk: configure-gawk
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gawk && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-gawk))
-@endif gawk
-
-
-
-
-.PHONY: check-gawk maybe-check-gawk
-maybe-check-gawk:
-@if gawk
-maybe-check-gawk: check-gawk
-
-check-gawk:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gawk && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif gawk
-
-.PHONY: install-gawk maybe-install-gawk
-maybe-install-gawk:
-@if gawk
-maybe-install-gawk: install-gawk
-
-install-gawk: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gawk && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif gawk
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-gawk info-gawk
-maybe-info-gawk:
-@if gawk
-maybe-info-gawk: info-gawk
-
-info-gawk: \
-    configure-gawk 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gawk" ; \
-       (cd $(HOST_SUBDIR)/gawk && \
-         $(MAKE) $(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 gawk
-
-.PHONY: maybe-dvi-gawk dvi-gawk
-maybe-dvi-gawk:
-@if gawk
-maybe-dvi-gawk: dvi-gawk
-
-dvi-gawk: \
-    configure-gawk 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gawk" ; \
-       (cd $(HOST_SUBDIR)/gawk && \
-         $(MAKE) $(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 gawk
-
-.PHONY: maybe-pdf-gawk pdf-gawk
-maybe-pdf-gawk:
-@if gawk
-maybe-pdf-gawk: pdf-gawk
-
-pdf-gawk: \
-    configure-gawk 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gawk" ; \
-       (cd $(HOST_SUBDIR)/gawk && \
-         $(MAKE) $(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 gawk
-
-.PHONY: maybe-html-gawk html-gawk
-maybe-html-gawk:
-@if gawk
-maybe-html-gawk: html-gawk
-
-html-gawk: \
-    configure-gawk 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gawk" ; \
-       (cd $(HOST_SUBDIR)/gawk && \
-         $(MAKE) $(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 gawk
-
-.PHONY: maybe-TAGS-gawk TAGS-gawk
-maybe-TAGS-gawk:
-@if gawk
-maybe-TAGS-gawk: TAGS-gawk
-
-TAGS-gawk: \
-    configure-gawk 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gawk" ; \
-       (cd $(HOST_SUBDIR)/gawk && \
-         $(MAKE) $(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 gawk
-
-.PHONY: maybe-install-info-gawk install-info-gawk
-maybe-install-info-gawk:
-@if gawk
-maybe-install-info-gawk: install-info-gawk
-
-install-info-gawk: \
-    configure-gawk \
-    info-gawk 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gawk" ; \
-       (cd $(HOST_SUBDIR)/gawk && \
-         $(MAKE) $(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 gawk
-
-.PHONY: maybe-install-pdf-gawk install-pdf-gawk
-maybe-install-pdf-gawk:
-@if gawk
-maybe-install-pdf-gawk: install-pdf-gawk
-
-install-pdf-gawk: \
-    configure-gawk \
-    pdf-gawk 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gawk" ; \
-       (cd $(HOST_SUBDIR)/gawk && \
-         $(MAKE) $(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 gawk
-
-.PHONY: maybe-install-html-gawk install-html-gawk
-maybe-install-html-gawk:
-@if gawk
-maybe-install-html-gawk: install-html-gawk
-
-install-html-gawk: \
-    configure-gawk \
-    html-gawk 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gawk" ; \
-       (cd $(HOST_SUBDIR)/gawk && \
-         $(MAKE) $(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 gawk
-
-.PHONY: maybe-installcheck-gawk installcheck-gawk
-maybe-installcheck-gawk:
-@if gawk
-maybe-installcheck-gawk: installcheck-gawk
-
-installcheck-gawk: \
-    configure-gawk 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gawk" ; \
-       (cd $(HOST_SUBDIR)/gawk && \
-         $(MAKE) $(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 gawk
-
-.PHONY: maybe-mostlyclean-gawk mostlyclean-gawk
-maybe-mostlyclean-gawk:
-@if gawk
-maybe-mostlyclean-gawk: mostlyclean-gawk
-
-mostlyclean-gawk: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gawk" ; \
-       (cd $(HOST_SUBDIR)/gawk && \
-         $(MAKE) $(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 gawk
-
-.PHONY: maybe-clean-gawk clean-gawk
-maybe-clean-gawk:
-@if gawk
-maybe-clean-gawk: clean-gawk
-
-clean-gawk: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gawk" ; \
-       (cd $(HOST_SUBDIR)/gawk && \
-         $(MAKE) $(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 gawk
-
-.PHONY: maybe-distclean-gawk distclean-gawk
-maybe-distclean-gawk:
-@if gawk
-maybe-distclean-gawk: distclean-gawk
-
-distclean-gawk: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gawk" ; \
-       (cd $(HOST_SUBDIR)/gawk && \
-         $(MAKE) $(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 gawk
-
-.PHONY: maybe-maintainer-clean-gawk maintainer-clean-gawk
-maybe-maintainer-clean-gawk:
-@if gawk
-maybe-maintainer-clean-gawk: maintainer-clean-gawk
-
-maintainer-clean-gawk: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gawk" ; \
-       (cd $(HOST_SUBDIR)/gawk && \
-         $(MAKE) $(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 gawk
-
-
-
-.PHONY: configure-gettext maybe-configure-gettext
-maybe-configure-gettext:
-@if gcc-bootstrap
-configure-gettext: stage_current
-@endif gcc-bootstrap
-@if gettext
-maybe-configure-gettext: configure-gettext
-configure-gettext: 
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/gettext; \
-       cd "$(HOST_SUBDIR)/gettext" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gettext/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gettext"; \
-       libsrcdir="$$s/gettext"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif gettext
-
-
-
-
-
-.PHONY: all-gettext maybe-all-gettext
-maybe-all-gettext:
-@if gcc-bootstrap
-all-gettext: stage_current
-@endif gcc-bootstrap
-@if gettext
-TARGET-gettext=all
-maybe-all-gettext: all-gettext
-all-gettext: configure-gettext
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gettext && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-gettext))
-@endif gettext
-
-
-
-
-.PHONY: check-gettext maybe-check-gettext
-maybe-check-gettext:
-@if gettext
-maybe-check-gettext: check-gettext
-
-check-gettext:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gettext && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif gettext
-
-.PHONY: install-gettext maybe-install-gettext
-maybe-install-gettext:
-@if gettext
-maybe-install-gettext: install-gettext
-
-install-gettext: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gettext && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif gettext
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-gettext info-gettext
-maybe-info-gettext:
-@if gettext
-maybe-info-gettext: info-gettext
-
-info-gettext: \
-    configure-gettext 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
-         $(MAKE) $(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 gettext
-
-.PHONY: maybe-dvi-gettext dvi-gettext
-maybe-dvi-gettext:
-@if gettext
-maybe-dvi-gettext: dvi-gettext
-
-dvi-gettext: \
-    configure-gettext 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
-         $(MAKE) $(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 gettext
-
-.PHONY: maybe-pdf-gettext pdf-gettext
-maybe-pdf-gettext:
-@if gettext
-maybe-pdf-gettext: pdf-gettext
-
-pdf-gettext: \
-    configure-gettext 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
-         $(MAKE) $(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 gettext
-
-.PHONY: maybe-html-gettext html-gettext
-maybe-html-gettext:
-@if gettext
-maybe-html-gettext: html-gettext
-
-html-gettext: \
-    configure-gettext 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
-         $(MAKE) $(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 gettext
-
-.PHONY: maybe-TAGS-gettext TAGS-gettext
-maybe-TAGS-gettext:
-@if gettext
-maybe-TAGS-gettext: TAGS-gettext
-
-TAGS-gettext: \
-    configure-gettext 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
-         $(MAKE) $(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 gettext
-
-.PHONY: maybe-install-info-gettext install-info-gettext
-maybe-install-info-gettext:
-@if gettext
-maybe-install-info-gettext: install-info-gettext
-
-install-info-gettext: \
-    configure-gettext \
-    info-gettext 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
-         $(MAKE) $(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 gettext
-
-.PHONY: maybe-install-pdf-gettext install-pdf-gettext
-maybe-install-pdf-gettext:
-@if gettext
-maybe-install-pdf-gettext: install-pdf-gettext
-
-install-pdf-gettext: \
-    configure-gettext \
-    pdf-gettext 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
-         $(MAKE) $(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 gettext
-
-.PHONY: maybe-install-html-gettext install-html-gettext
-maybe-install-html-gettext:
-@if gettext
-maybe-install-html-gettext: install-html-gettext
-
-install-html-gettext: \
-    configure-gettext \
-    html-gettext 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
-         $(MAKE) $(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 gettext
-
-.PHONY: maybe-installcheck-gettext installcheck-gettext
-maybe-installcheck-gettext:
-@if gettext
-maybe-installcheck-gettext: installcheck-gettext
-
-installcheck-gettext: \
-    configure-gettext 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
-         $(MAKE) $(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 gettext
-
-.PHONY: maybe-mostlyclean-gettext mostlyclean-gettext
-maybe-mostlyclean-gettext:
-@if gettext
-maybe-mostlyclean-gettext: mostlyclean-gettext
+.PHONY: maybe-mostlyclean-gcc mostlyclean-gcc
+maybe-mostlyclean-gcc:
+@if gcc
+maybe-mostlyclean-gcc: mostlyclean-gcc
 
-mostlyclean-gettext: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/Makefile ] || exit 0; \
+mostlyclean-gcc: 
+       @[ -f ./gcc/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_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -15936,24 +11053,23 @@ mostlyclean-gettext:
                  mostlyclean) \
          || exit 1
 
-@endif gettext
+@endif gcc
 
-.PHONY: maybe-clean-gettext clean-gettext
-maybe-clean-gettext:
-@if gettext
-maybe-clean-gettext: clean-gettext
+.PHONY: maybe-clean-gcc clean-gcc
+maybe-clean-gcc:
+@if gcc
+maybe-clean-gcc: clean-gcc
 
-clean-gettext: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/Makefile ] || exit 0; \
+clean-gcc: 
+       @[ -f ./gcc/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_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -15961,24 +11077,23 @@ clean-gettext:
                  clean) \
          || exit 1
 
-@endif gettext
+@endif gcc
 
-.PHONY: maybe-distclean-gettext distclean-gettext
-maybe-distclean-gettext:
-@if gettext
-maybe-distclean-gettext: distclean-gettext
+.PHONY: maybe-distclean-gcc distclean-gcc
+maybe-distclean-gcc:
+@if gcc
+maybe-distclean-gcc: distclean-gcc
 
-distclean-gettext: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/Makefile ] || exit 0; \
+distclean-gcc: 
+       @[ -f ./gcc/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_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -15986,24 +11101,23 @@ distclean-gettext:
                  distclean) \
          || exit 1
 
-@endif gettext
+@endif gcc
 
-.PHONY: maybe-maintainer-clean-gettext maintainer-clean-gettext
-maybe-maintainer-clean-gettext:
-@if gettext
-maybe-maintainer-clean-gettext: maintainer-clean-gettext
+.PHONY: maybe-maintainer-clean-gcc maintainer-clean-gcc
+maybe-maintainer-clean-gcc:
+@if gcc
+maybe-maintainer-clean-gcc: maintainer-clean-gcc
 
-maintainer-clean-gettext: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/Makefile ] || exit 0; \
+maintainer-clean-gcc: 
+       @[ -f ./gcc/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_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -16011,7 +11125,7 @@ maintainer-clean-gettext:
                  maintainer-clean) \
          || exit 1
 
-@endif gettext
+@endif gcc
 
 
 
@@ -16026,8 +11140,8 @@ 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 ; \
-       $(HOST_EXPORTS) \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \
+       $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/gmp; \
        cd "$(HOST_SUBDIR)/gmp" || exit 1; \
        case $(srcdir) in \
@@ -16035,11 +11149,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
 
@@ -16054,25 +11169,28 @@ configure-stage1-gmp:
        @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
        test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
-       $(HOST_EXPORTS)  \
+       $(HOST_EXPORTS) \
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/gmp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+       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} \
           \
-         --disable-intermodule $(STAGE1_CHECKING)        --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" --disable-shared
+         $(STAGE1_CONFIGURE_FLAGS) \
+         --disable-shared LEX="touch lex.yy.c"
 @endif gmp-bootstrap
 
 .PHONY: configure-stage2-gmp maybe-configure-stage2-gmp
@@ -16084,57 +11202,29 @@ configure-stage2-gmp:
        @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
        test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ --disable-shared
-@endif gmp-bootstrap
-
-.PHONY: configure-stageb2g0-gmp maybe-configure-stageb2g0-gmp
-maybe-configure-stageb2g0-gmp:
-@if gmp-bootstrap
-maybe-configure-stageb2g0-gmp: configure-stageb2g0-gmp
-configure-stageb2g0-gmp:
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
-       echo Configuring stage b2g0 in $(HOST_SUBDIR)/gmp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+       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_werror_flag@ --disable-shared
+         $(STAGE2_CONFIGURE_FLAGS) \
+         --disable-shared LEX="touch lex.yy.c"
 @endif gmp-bootstrap
 
 .PHONY: configure-stage3-gmp maybe-configure-stage3-gmp
@@ -16146,57 +11236,29 @@ configure-stage3-gmp:
        @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
        test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ --disable-shared
-@endif gmp-bootstrap
-
-.PHONY: configure-stageb3g2-gmp maybe-configure-stageb3g2-gmp
-maybe-configure-stageb3g2-gmp:
-@if gmp-bootstrap
-maybe-configure-stageb3g2-gmp: configure-stageb3g2-gmp
-configure-stageb3g2-gmp:
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
-       echo Configuring stage b3g2 in $(HOST_SUBDIR)/gmp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+       CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+       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) \
-         @stage2_werror_flag@ --disable-shared
+         $(STAGE3_CONFIGURE_FLAGS) \
+         --disable-shared LEX="touch lex.yy.c"
 @endif gmp-bootstrap
 
 .PHONY: configure-stage4-gmp maybe-configure-stage4-gmp
@@ -16208,26 +11270,29 @@ configure-stage4-gmp:
        @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
        test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/gmp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+       CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+       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) \
-         @stage2_werror_flag@ --disable-shared
+         $(STAGE4_CONFIGURE_FLAGS) \
+         --disable-shared LEX="touch lex.yy.c"
 @endif gmp-bootstrap
 
 .PHONY: configure-stageprofile-gmp maybe-configure-stageprofile-gmp
@@ -16239,26 +11304,29 @@ configure-stageprofile-gmp:
        @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
        test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/gmp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+       $(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)/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_werror_flag@ --disable-shared
+         $(STAGEprofile_CONFIGURE_FLAGS) \
+         --disable-shared LEX="touch lex.yy.c"
 @endif gmp-bootstrap
 
 .PHONY: configure-stagefeedback-gmp maybe-configure-stagefeedback-gmp
@@ -16270,26 +11338,29 @@ configure-stagefeedback-gmp:
        @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/gmp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+       $(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)/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_werror_flag@ --disable-shared
+         $(STAGEfeedback_CONFIGURE_FLAGS) \
+         --disable-shared LEX="touch lex.yy.c"
 @endif gmp-bootstrap
 
 
@@ -16307,9 +11378,9 @@ maybe-all-gmp: all-gmp
 all-gmp: configure-gmp
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(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
 
@@ -16327,13 +11398,20 @@ all-stage1-gmp: configure-stage1-gmp
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
        cd $(HOST_SUBDIR)/gmp && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-               LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
+               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) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                $(TARGET-stage1-gmp)
 
 maybe-clean-stage1-gmp: clean-stage1-gmp
@@ -16347,7 +11425,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
 
 
@@ -16363,14 +11441,20 @@ all-stage2-gmp: configure-stage2-gmp
        @[ $(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) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
        cd $(HOST_SUBDIR)/gmp && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                $(TARGET-stage2-gmp)
 
 maybe-clean-stage2-gmp: clean-stage2-gmp
@@ -16383,47 +11467,7 @@ clean-stage2-gmp:
          $(MAKE) stage2-start; \
        fi; \
        cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gmp-bootstrap
-
-
-.PHONY: all-stageb2g0-gmp maybe-all-stageb2g0-gmp
-.PHONY: clean-stageb2g0-gmp maybe-clean-stageb2g0-gmp
-maybe-all-stageb2g0-gmp:
-maybe-clean-stageb2g0-gmp:
-@if gmp-bootstrap
-maybe-all-stageb2g0-gmp: all-stageb2g0-gmp
-all-stageb2g0: all-stageb2g0-gmp
-TARGET-stageb2g0-gmp = $(TARGET-gmp)
-all-stageb2g0-gmp: configure-stageb2g0-gmp
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb2g0-gmp)
-
-maybe-clean-stageb2g0-gmp: clean-stageb2g0-gmp
-clean-stageb2g0: clean-stageb2g0-gmp
-clean-stageb2g0-gmp:
-       @if [ $(current_stage) = stageb2g0 ]; then \
-         [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb2g0-gmp/Makefile ] || exit 0; \
-         $(MAKE) stageb2g0-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
 
 
@@ -16439,14 +11483,20 @@ all-stage3-gmp: configure-stage3-gmp
        @[ $(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) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
        cd $(HOST_SUBDIR)/gmp && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                $(TARGET-stage3-gmp)
 
 maybe-clean-stage3-gmp: clean-stage3-gmp
@@ -16459,47 +11509,7 @@ clean-stage3-gmp:
          $(MAKE) stage3-start; \
        fi; \
        cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gmp-bootstrap
-
-
-.PHONY: all-stageb3g2-gmp maybe-all-stageb3g2-gmp
-.PHONY: clean-stageb3g2-gmp maybe-clean-stageb3g2-gmp
-maybe-all-stageb3g2-gmp:
-maybe-clean-stageb3g2-gmp:
-@if gmp-bootstrap
-maybe-all-stageb3g2-gmp: all-stageb3g2-gmp
-all-stageb3g2: all-stageb3g2-gmp
-TARGET-stageb3g2-gmp = $(TARGET-gmp)
-all-stageb3g2-gmp: configure-stageb3g2-gmp
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb3g2-gmp)
-
-maybe-clean-stageb3g2-gmp: clean-stageb3g2-gmp
-clean-stageb3g2: clean-stageb3g2-gmp
-clean-stageb3g2-gmp:
-       @if [ $(current_stage) = stageb3g2 ]; then \
-         [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb3g2-gmp/Makefile ] || exit 0; \
-         $(MAKE) stageb3g2-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
 
 
@@ -16515,14 +11525,20 @@ all-stage4-gmp: configure-stage4-gmp
        @[ $(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) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
        cd $(HOST_SUBDIR)/gmp && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+               CFLAGS="$(STAGE4_CFLAGS)" \
+               CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               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) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                $(TARGET-stage4-gmp)
 
 maybe-clean-stage4-gmp: clean-stage4-gmp
@@ -16535,9 +11551,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
 
 
@@ -16553,14 +11567,20 @@ all-stageprofile-gmp: configure-stageprofile-gmp
        @[ $(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) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
        cd $(HOST_SUBDIR)/gmp && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                $(TARGET-stageprofile-gmp)
 
 maybe-clean-stageprofile-gmp: clean-stageprofile-gmp
@@ -16573,9 +11593,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
 
 
@@ -16591,14 +11609,20 @@ all-stagefeedback-gmp: configure-stagefeedback-gmp
        @[ $(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) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
        cd $(HOST_SUBDIR)/gmp && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                $(TARGET-stagefeedback-gmp)
 
 maybe-clean-stagefeedback-gmp: clean-stagefeedback-gmp
@@ -16611,9 +11635,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
 
 
@@ -16629,9 +11651,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
 
@@ -16644,6 +11666,15 @@ install-gmp:
 
 @endif gmp
 
+.PHONY: install-strip-gmp maybe-install-strip-gmp
+maybe-install-strip-gmp:
+@if gmp
+maybe-install-strip-gmp: install-strip-gmp
+
+install-strip-gmp:
+
+@endif gmp
+
 # Other targets (info, dvi, pdf, etc.)
 
 .PHONY: maybe-info-gmp info-gmp
@@ -16657,10 +11688,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}" \
@@ -16682,10 +11713,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}" \
@@ -16707,10 +11738,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}" \
@@ -16732,10 +11763,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}" \
@@ -16757,10 +11788,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}" \
@@ -16783,10 +11814,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}" \
@@ -16809,10 +11840,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}" \
@@ -16835,10 +11866,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}" \
@@ -16860,10 +11891,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}" \
@@ -16884,10 +11915,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}" \
@@ -16908,10 +11939,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}" \
@@ -16932,10 +11963,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}" \
@@ -16956,10 +11987,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}" \
@@ -16983,8 +12014,8 @@ 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 ; \
-       $(HOST_EXPORTS) \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \
+       $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/mpfr; \
        cd "$(HOST_SUBDIR)/mpfr" || exit 1; \
        case $(srcdir) in \
@@ -16992,11 +12023,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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp \
+       module_srcdir=mpfr; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} --disable-shared @extra_mpfr_configure_flags@ \
          || exit 1
 @endif mpfr
 
@@ -17011,25 +12043,28 @@ configure-stage1-mpfr:
        @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
        test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
-       $(HOST_EXPORTS)  \
+       $(HOST_EXPORTS) \
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/mpfr ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
+       module_srcdir=mpfr; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
           \
-         --disable-intermodule $(STAGE1_CHECKING)        --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp
+         $(STAGE1_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
 
 .PHONY: configure-stage2-mpfr maybe-configure-stage2-mpfr
@@ -17041,57 +12076,29 @@ configure-stage2-mpfr:
        @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
        test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp
-@endif mpfr-bootstrap
-
-.PHONY: configure-stageb2g0-mpfr maybe-configure-stageb2g0-mpfr
-maybe-configure-stageb2g0-mpfr:
-@if mpfr-bootstrap
-maybe-configure-stageb2g0-mpfr: configure-stageb2g0-mpfr
-configure-stageb2g0-mpfr:
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
-       echo Configuring stage b2g0 in $(HOST_SUBDIR)/mpfr ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
+       module_srcdir=mpfr; \
+       $(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_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp
+         $(STAGE2_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
 
 .PHONY: configure-stage3-mpfr maybe-configure-stage3-mpfr
@@ -17103,57 +12110,29 @@ configure-stage3-mpfr:
        @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
        test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp
-@endif mpfr-bootstrap
-
-.PHONY: configure-stageb3g2-mpfr maybe-configure-stageb3g2-mpfr
-maybe-configure-stageb3g2-mpfr:
-@if mpfr-bootstrap
-maybe-configure-stageb3g2-mpfr: configure-stageb3g2-mpfr
-configure-stageb3g2-mpfr:
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
-       echo Configuring stage b3g2 in $(HOST_SUBDIR)/mpfr ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+       CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
+       module_srcdir=mpfr; \
+       $(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_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp
+         $(STAGE3_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
 
 .PHONY: configure-stage4-mpfr maybe-configure-stage4-mpfr
@@ -17165,26 +12144,29 @@ configure-stage4-mpfr:
        @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
        test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/mpfr ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+       CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
+       module_srcdir=mpfr; \
+       $(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_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp
+         $(STAGE4_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
 
 .PHONY: configure-stageprofile-mpfr maybe-configure-stageprofile-mpfr
@@ -17196,26 +12178,29 @@ configure-stageprofile-mpfr:
        @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
        test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/mpfr ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+       $(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)/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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
+       module_srcdir=mpfr; \
+       $(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_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp
+         $(STAGEprofile_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
 
 .PHONY: configure-stagefeedback-mpfr maybe-configure-stagefeedback-mpfr
@@ -17227,26 +12212,29 @@ configure-stagefeedback-mpfr:
        @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/mpfr ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+       $(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)/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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
+       module_srcdir=mpfr; \
+       $(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_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp
+         $(STAGEfeedback_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
 
 
@@ -17264,9 +12252,9 @@ maybe-all-mpfr: all-mpfr
 all-mpfr: configure-mpfr
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(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
 
@@ -17284,13 +12272,20 @@ all-stage1-mpfr: configure-stage1-mpfr
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
        cd $(HOST_SUBDIR)/mpfr && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-               LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
+               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) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                $(TARGET-stage1-mpfr)
 
 maybe-clean-stage1-mpfr: clean-stage1-mpfr
@@ -17304,7 +12299,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
 
 
@@ -17320,14 +12315,20 @@ all-stage2-mpfr: configure-stage2-mpfr
        @[ $(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) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
        cd $(HOST_SUBDIR)/mpfr && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                $(TARGET-stage2-mpfr)
 
 maybe-clean-stage2-mpfr: clean-stage2-mpfr
@@ -17340,47 +12341,7 @@ clean-stage2-mpfr:
          $(MAKE) stage2-start; \
        fi; \
        cd $(HOST_SUBDIR)/mpfr && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif mpfr-bootstrap
-
-
-.PHONY: all-stageb2g0-mpfr maybe-all-stageb2g0-mpfr
-.PHONY: clean-stageb2g0-mpfr maybe-clean-stageb2g0-mpfr
-maybe-all-stageb2g0-mpfr:
-maybe-clean-stageb2g0-mpfr:
-@if mpfr-bootstrap
-maybe-all-stageb2g0-mpfr: all-stageb2g0-mpfr
-all-stageb2g0: all-stageb2g0-mpfr
-TARGET-stageb2g0-mpfr = $(TARGET-mpfr)
-all-stageb2g0-mpfr: configure-stageb2g0-mpfr
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/mpfr && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb2g0-mpfr)
-
-maybe-clean-stageb2g0-mpfr: clean-stageb2g0-mpfr
-clean-stageb2g0: clean-stageb2g0-mpfr
-clean-stageb2g0-mpfr:
-       @if [ $(current_stage) = stageb2g0 ]; then \
-         [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb2g0-mpfr/Makefile ] || exit 0; \
-         $(MAKE) stageb2g0-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
 
 
@@ -17396,14 +12357,20 @@ all-stage3-mpfr: configure-stage3-mpfr
        @[ $(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) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
        cd $(HOST_SUBDIR)/mpfr && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                $(TARGET-stage3-mpfr)
 
 maybe-clean-stage3-mpfr: clean-stage3-mpfr
@@ -17416,47 +12383,7 @@ clean-stage3-mpfr:
          $(MAKE) stage3-start; \
        fi; \
        cd $(HOST_SUBDIR)/mpfr && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif mpfr-bootstrap
-
-
-.PHONY: all-stageb3g2-mpfr maybe-all-stageb3g2-mpfr
-.PHONY: clean-stageb3g2-mpfr maybe-clean-stageb3g2-mpfr
-maybe-all-stageb3g2-mpfr:
-maybe-clean-stageb3g2-mpfr:
-@if mpfr-bootstrap
-maybe-all-stageb3g2-mpfr: all-stageb3g2-mpfr
-all-stageb3g2: all-stageb3g2-mpfr
-TARGET-stageb3g2-mpfr = $(TARGET-mpfr)
-all-stageb3g2-mpfr: configure-stageb3g2-mpfr
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/mpfr && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb3g2-mpfr)
-
-maybe-clean-stageb3g2-mpfr: clean-stageb3g2-mpfr
-clean-stageb3g2: clean-stageb3g2-mpfr
-clean-stageb3g2-mpfr:
-       @if [ $(current_stage) = stageb3g2 ]; then \
-         [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb3g2-mpfr/Makefile ] || exit 0; \
-         $(MAKE) stageb3g2-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
 
 
@@ -17472,14 +12399,20 @@ all-stage4-mpfr: configure-stage4-mpfr
        @[ $(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) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
        cd $(HOST_SUBDIR)/mpfr && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+               CFLAGS="$(STAGE4_CFLAGS)" \
+               CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               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) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                $(TARGET-stage4-mpfr)
 
 maybe-clean-stage4-mpfr: clean-stage4-mpfr
@@ -17492,9 +12425,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
 
 
@@ -17510,14 +12441,20 @@ all-stageprofile-mpfr: configure-stageprofile-mpfr
        @[ $(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) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
        cd $(HOST_SUBDIR)/mpfr && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                $(TARGET-stageprofile-mpfr)
 
 maybe-clean-stageprofile-mpfr: clean-stageprofile-mpfr
@@ -17530,9 +12467,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
 
 
@@ -17548,14 +12483,20 @@ all-stagefeedback-mpfr: configure-stagefeedback-mpfr
        @[ $(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) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
        cd $(HOST_SUBDIR)/mpfr && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                $(TARGET-stagefeedback-mpfr)
 
 maybe-clean-stagefeedback-mpfr: clean-stagefeedback-mpfr
@@ -17568,9 +12509,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
 
 
@@ -17586,9 +12525,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
 
@@ -17601,6 +12540,15 @@ install-mpfr:
 
 @endif mpfr
 
+.PHONY: install-strip-mpfr maybe-install-strip-mpfr
+maybe-install-strip-mpfr:
+@if mpfr
+maybe-install-strip-mpfr: install-strip-mpfr
+
+install-strip-mpfr:
+
+@endif mpfr
+
 # Other targets (info, dvi, pdf, etc.)
 
 .PHONY: maybe-info-mpfr info-mpfr
@@ -17614,10 +12562,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}" \
@@ -17639,10 +12587,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}" \
@@ -17664,10 +12612,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}" \
@@ -17689,10 +12637,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}" \
@@ -17714,10 +12662,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}" \
@@ -17740,10 +12688,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}" \
@@ -17766,10 +12714,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}" \
@@ -17792,10 +12740,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}" \
@@ -17817,10 +12765,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}" \
@@ -17841,10 +12789,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}" \
@@ -17865,10 +12813,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}" \
@@ -17889,10 +12837,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}" \
@@ -17913,10 +12861,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}" \
@@ -17929,1084 +12877,570 @@ maintainer-clean-mpfr:
 
 
 
-.PHONY: configure-gnuserv maybe-configure-gnuserv
-maybe-configure-gnuserv:
-@if gcc-bootstrap
-configure-gnuserv: stage_current
-@endif gcc-bootstrap
-@if gnuserv
-maybe-configure-gnuserv: configure-gnuserv
-configure-gnuserv: 
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gnuserv/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnuserv ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/gnuserv; \
-       cd "$(HOST_SUBDIR)/gnuserv" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gnuserv/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gnuserv"; \
-       libsrcdir="$$s/gnuserv"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif gnuserv
-
-
-
-
-
-.PHONY: all-gnuserv maybe-all-gnuserv
-maybe-all-gnuserv:
-@if gcc-bootstrap
-all-gnuserv: stage_current
-@endif gcc-bootstrap
-@if gnuserv
-TARGET-gnuserv=all
-maybe-all-gnuserv: all-gnuserv
-all-gnuserv: configure-gnuserv
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gnuserv && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-gnuserv))
-@endif gnuserv
-
-
-
-
-.PHONY: check-gnuserv maybe-check-gnuserv
-maybe-check-gnuserv:
-@if gnuserv
-maybe-check-gnuserv: check-gnuserv
-
-check-gnuserv:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gnuserv && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif gnuserv
-
-.PHONY: install-gnuserv maybe-install-gnuserv
-maybe-install-gnuserv:
-@if gnuserv
-maybe-install-gnuserv: install-gnuserv
-
-install-gnuserv: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gnuserv && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif gnuserv
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-gnuserv info-gnuserv
-maybe-info-gnuserv:
-@if gnuserv
-maybe-info-gnuserv: info-gnuserv
-
-info-gnuserv: \
-    configure-gnuserv 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
-         $(MAKE) $(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 gnuserv
-
-.PHONY: maybe-dvi-gnuserv dvi-gnuserv
-maybe-dvi-gnuserv:
-@if gnuserv
-maybe-dvi-gnuserv: dvi-gnuserv
-
-dvi-gnuserv: \
-    configure-gnuserv 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
-         $(MAKE) $(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 gnuserv
-
-.PHONY: maybe-pdf-gnuserv pdf-gnuserv
-maybe-pdf-gnuserv:
-@if gnuserv
-maybe-pdf-gnuserv: pdf-gnuserv
-
-pdf-gnuserv: \
-    configure-gnuserv 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
-         $(MAKE) $(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 gnuserv
-
-.PHONY: maybe-html-gnuserv html-gnuserv
-maybe-html-gnuserv:
-@if gnuserv
-maybe-html-gnuserv: html-gnuserv
-
-html-gnuserv: \
-    configure-gnuserv 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
-         $(MAKE) $(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 gnuserv
-
-.PHONY: maybe-TAGS-gnuserv TAGS-gnuserv
-maybe-TAGS-gnuserv:
-@if gnuserv
-maybe-TAGS-gnuserv: TAGS-gnuserv
-
-TAGS-gnuserv: \
-    configure-gnuserv 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
-         $(MAKE) $(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 gnuserv
-
-.PHONY: maybe-install-info-gnuserv install-info-gnuserv
-maybe-install-info-gnuserv:
-@if gnuserv
-maybe-install-info-gnuserv: install-info-gnuserv
-
-install-info-gnuserv: \
-    configure-gnuserv \
-    info-gnuserv 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
-         $(MAKE) $(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 gnuserv
-
-.PHONY: maybe-install-pdf-gnuserv install-pdf-gnuserv
-maybe-install-pdf-gnuserv:
-@if gnuserv
-maybe-install-pdf-gnuserv: install-pdf-gnuserv
-
-install-pdf-gnuserv: \
-    configure-gnuserv \
-    pdf-gnuserv 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
-         $(MAKE) $(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 gnuserv
-
-.PHONY: maybe-install-html-gnuserv install-html-gnuserv
-maybe-install-html-gnuserv:
-@if gnuserv
-maybe-install-html-gnuserv: install-html-gnuserv
-
-install-html-gnuserv: \
-    configure-gnuserv \
-    html-gnuserv 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
-         $(MAKE) $(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 gnuserv
-
-.PHONY: maybe-installcheck-gnuserv installcheck-gnuserv
-maybe-installcheck-gnuserv:
-@if gnuserv
-maybe-installcheck-gnuserv: installcheck-gnuserv
-
-installcheck-gnuserv: \
-    configure-gnuserv 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
-         $(MAKE) $(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 gnuserv
-
-.PHONY: maybe-mostlyclean-gnuserv mostlyclean-gnuserv
-maybe-mostlyclean-gnuserv:
-@if gnuserv
-maybe-mostlyclean-gnuserv: mostlyclean-gnuserv
-
-mostlyclean-gnuserv: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
-         $(MAKE) $(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 gnuserv
-
-.PHONY: maybe-clean-gnuserv clean-gnuserv
-maybe-clean-gnuserv:
-@if gnuserv
-maybe-clean-gnuserv: clean-gnuserv
-
-clean-gnuserv: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
-         $(MAKE) $(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 gnuserv
-
-.PHONY: maybe-distclean-gnuserv distclean-gnuserv
-maybe-distclean-gnuserv:
-@if gnuserv
-maybe-distclean-gnuserv: distclean-gnuserv
-
-distclean-gnuserv: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
-         $(MAKE) $(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 gnuserv
-
-.PHONY: maybe-maintainer-clean-gnuserv maintainer-clean-gnuserv
-maybe-maintainer-clean-gnuserv:
-@if gnuserv
-maybe-maintainer-clean-gnuserv: maintainer-clean-gnuserv
-
-maintainer-clean-gnuserv: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
-         $(MAKE) $(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 gnuserv
-
-
-
-.PHONY: configure-gold maybe-configure-gold
-maybe-configure-gold:
+.PHONY: configure-mpc maybe-configure-mpc
+maybe-configure-mpc:
 @if gcc-bootstrap
-configure-gold: stage_current
+configure-mpc: stage_current
 @endif gcc-bootstrap
-@if gold
-maybe-configure-gold: configure-gold
-configure-gold: 
+@if mpc
+maybe-configure-mpc: configure-mpc
+configure-mpc: 
        @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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/gold; \
-       cd "$(HOST_SUBDIR)/gold" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/mpc; \
+       cd "$(HOST_SUBDIR)/mpc" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
-       $(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} --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ \
          || exit 1
-@endif gold
+@endif mpc
 
 
 
-.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:
+.PHONY: configure-stage1-mpc maybe-configure-stage1-mpc
+maybe-configure-stage1-mpc:
+@if mpc-bootstrap
+maybe-configure-stage1-mpc: configure-stage1-mpc
+configure-stage1-mpc:
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-       $(HOST_EXPORTS)  \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/gold ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
-       cd $(HOST_SUBDIR)/gold || exit 1; \
+       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+       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)/gold/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
-       $(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} \
           \
-         --disable-intermodule $(STAGE1_CHECKING)        --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif gold-bootstrap
-
-.PHONY: configure-stage2-gold maybe-configure-stage2-gold
-maybe-configure-stage2-gold:
-@if gold-bootstrap
-maybe-configure-stage2-gold: configure-stage2-gold
-configure-stage2-gold:
+         $(STAGE1_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
+@endif mpc-bootstrap
+
+.PHONY: configure-stage2-mpc maybe-configure-stage2-mpc
+maybe-configure-stage2-mpc:
+@if mpc-bootstrap
+maybe-configure-stage2-mpc: configure-stage2-mpc
+configure-stage2-mpc:
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
-       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_werror_flag@ 
-@endif gold-bootstrap
-
-.PHONY: configure-stageb2g0-gold maybe-configure-stageb2g0-gold
-maybe-configure-stageb2g0-gold:
-@if gold-bootstrap
-maybe-configure-stageb2g0-gold: configure-stageb2g0-gold
-configure-stageb2g0-gold:
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
-       echo Configuring stage b2g0 in $(HOST_SUBDIR)/gold ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
-       cd $(HOST_SUBDIR)/gold || exit 1; \
+       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+       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)/gold/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
-       $(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_werror_flag@ 
-@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:
+         $(STAGE2_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
+@endif mpc-bootstrap
+
+.PHONY: configure-stage3-mpc maybe-configure-stage3-mpc
+maybe-configure-stage3-mpc:
+@if mpc-bootstrap
+maybe-configure-stage3-mpc: configure-stage3-mpc
+configure-stage3-mpc:
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
-       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) \
-         @stage2_werror_flag@ 
-@endif gold-bootstrap
-
-.PHONY: configure-stageb3g2-gold maybe-configure-stageb3g2-gold
-maybe-configure-stageb3g2-gold:
-@if gold-bootstrap
-maybe-configure-stageb3g2-gold: configure-stageb3g2-gold
-configure-stageb3g2-gold:
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
-       echo Configuring stage b3g2 in $(HOST_SUBDIR)/gold ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
-       cd $(HOST_SUBDIR)/gold || exit 1; \
+       CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+       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)/gold/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
-       $(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_werror_flag@ 
-@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:
+         $(STAGE3_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
+@endif mpc-bootstrap
+
+.PHONY: configure-stage4-mpc maybe-configure-stage4-mpc
+maybe-configure-stage4-mpc:
+@if mpc-bootstrap
+maybe-configure-stage4-mpc: configure-stage4-mpc
+configure-stage4-mpc:
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/gold ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
-       cd $(HOST_SUBDIR)/gold || exit 1; \
+       CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+       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)/gold/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
-       $(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_werror_flag@ 
-@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:
+         $(STAGE4_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
+@endif mpc-bootstrap
+
+.PHONY: configure-stageprofile-mpc maybe-configure-stageprofile-mpc
+maybe-configure-stageprofile-mpc:
+@if mpc-bootstrap
+maybe-configure-stageprofile-mpc: configure-stageprofile-mpc
+configure-stageprofile-mpc:
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/gold ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
-       cd $(HOST_SUBDIR)/gold || exit 1; \
+       $(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)/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)/gold/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
-       $(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_werror_flag@ 
-@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:
+         $(STAGEprofile_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
+@endif mpc-bootstrap
+
+.PHONY: configure-stagefeedback-mpc maybe-configure-stagefeedback-mpc
+maybe-configure-stagefeedback-mpc:
+@if mpc-bootstrap
+maybe-configure-stagefeedback-mpc: configure-stagefeedback-mpc
+configure-stagefeedback-mpc:
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/gold ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
-       cd $(HOST_SUBDIR)/gold || exit 1; \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/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)/gold/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
-       $(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_werror_flag@ 
-@endif gold-bootstrap
+         $(STAGEfeedback_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
+@endif mpc-bootstrap
 
 
 
 
 
-.PHONY: all-gold maybe-all-gold
-maybe-all-gold:
+.PHONY: all-mpc maybe-all-mpc
+maybe-all-mpc:
 @if gcc-bootstrap
-all-gold: stage_current
+all-mpc: stage_current
 @endif gcc-bootstrap
-@if gold
-TARGET-gold=all
-maybe-all-gold: all-gold
-all-gold: configure-gold
+@if mpc
+TARGET-mpc=all
+maybe-all-mpc: all-mpc
+all-mpc: configure-mpc
        @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
-
-
-
-.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
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/mpc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-mpc))
+@endif mpc
+
+
+
+.PHONY: all-stage1-mpc maybe-all-stage1-mpc
+.PHONY: clean-stage1-mpc maybe-clean-stage1-mpc
+maybe-all-stage1-mpc:
+maybe-clean-stage1-mpc:
+@if mpc-bootstrap
+maybe-all-stage1-mpc: all-stage1-mpc
+all-stage1: all-stage1-mpc
+TARGET-stage1-mpc = $(TARGET-mpc)
+all-stage1-mpc: configure-stage1-mpc
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/gold && \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/mpc && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-               LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
-               $(TARGET-stage1-gold)
-
-maybe-clean-stage1-gold: clean-stage1-gold
-clean-stage1: clean-stage1-gold
-clean-stage1-gold:
+               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-mpc)
+
+maybe-clean-stage1-mpc: clean-stage1-mpc
+clean-stage1: clean-stage1-mpc
+clean-stage1-mpc:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage1-gold/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage1-mpc/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(HOST_SUBDIR)/gold && \
+       cd $(HOST_SUBDIR)/mpc && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
-@endif gold-bootstrap
-
-
-.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
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif mpc-bootstrap
+
+
+.PHONY: all-stage2-mpc maybe-all-stage2-mpc
+.PHONY: clean-stage2-mpc maybe-clean-stage2-mpc
+maybe-all-stage2-mpc:
+maybe-clean-stage2-mpc:
+@if mpc-bootstrap
+maybe-all-stage2-mpc: all-stage2-mpc
+all-stage2: all-stage2-mpc
+TARGET-stage2-mpc = $(TARGET-mpc)
+all-stage2-mpc: configure-stage2-mpc
        @[ $(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)/gold && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/mpc && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage2-gold)
-
-maybe-clean-stage2-gold: clean-stage2-gold
-clean-stage2: clean-stage2-gold
-clean-stage2-gold:
+               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-mpc)
+
+maybe-clean-stage2-mpc: clean-stage2-mpc
+clean-stage2: clean-stage2-mpc
+clean-stage2-mpc:
        @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
-
-
-.PHONY: all-stageb2g0-gold maybe-all-stageb2g0-gold
-.PHONY: clean-stageb2g0-gold maybe-clean-stageb2g0-gold
-maybe-all-stageb2g0-gold:
-maybe-clean-stageb2g0-gold:
-@if gold-bootstrap
-maybe-all-stageb2g0-gold: all-stageb2g0-gold
-all-stageb2g0: all-stageb2g0-gold
-TARGET-stageb2g0-gold = $(TARGET-gold)
-all-stageb2g0-gold: configure-stageb2g0-gold
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb2g0-gold)
-
-maybe-clean-stageb2g0-gold: clean-stageb2g0-gold
-clean-stageb2g0: clean-stageb2g0-gold
-clean-stageb2g0-gold:
-       @if [ $(current_stage) = stageb2g0 ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb2g0-gold/Makefile ] || exit 0; \
-         $(MAKE) stageb2g0-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gold-bootstrap
-
-
-.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; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(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; \
+         [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-mpc/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
        fi; \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gold-bootstrap
-
-
-.PHONY: all-stageb3g2-gold maybe-all-stageb3g2-gold
-.PHONY: clean-stageb3g2-gold maybe-clean-stageb3g2-gold
-maybe-all-stageb3g2-gold:
-maybe-clean-stageb3g2-gold:
-@if gold-bootstrap
-maybe-all-stageb3g2-gold: all-stageb3g2-gold
-all-stageb3g2: all-stageb3g2-gold
-TARGET-stageb3g2-gold = $(TARGET-gold)
-all-stageb3g2-gold: configure-stageb3g2-gold
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
+       cd $(HOST_SUBDIR)/mpc && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif mpc-bootstrap
+
+
+.PHONY: all-stage3-mpc maybe-all-stage3-mpc
+.PHONY: clean-stage3-mpc maybe-clean-stage3-mpc
+maybe-all-stage3-mpc:
+maybe-clean-stage3-mpc:
+@if mpc-bootstrap
+maybe-all-stage3-mpc: all-stage3-mpc
+all-stage3: all-stage3-mpc
+TARGET-stage3-mpc = $(TARGET-mpc)
+all-stage3-mpc: configure-stage3-mpc
+       @[ $(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 && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/mpc && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb3g2-gold)
-
-maybe-clean-stageb3g2-gold: clean-stageb3g2-gold
-clean-stageb3g2: clean-stageb3g2-gold
-clean-stageb3g2-gold:
-       @if [ $(current_stage) = stageb3g2 ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
+               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-mpc)
+
+maybe-clean-stage3-mpc: clean-stage3-mpc
+clean-stage3: clean-stage3-mpc
+clean-stage3-mpc:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stageb3g2-gold/Makefile ] || exit 0; \
-         $(MAKE) stageb3g2-start; \
+         [ -f $(HOST_SUBDIR)/stage3-mpc/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
+       cd $(HOST_SUBDIR)/mpc && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif mpc-bootstrap
+
+
+.PHONY: all-stage4-mpc maybe-all-stage4-mpc
+.PHONY: clean-stage4-mpc maybe-clean-stage4-mpc
+maybe-all-stage4-mpc:
+maybe-clean-stage4-mpc:
+@if mpc-bootstrap
+maybe-all-stage4-mpc: all-stage4-mpc
+all-stage4: all-stage4-mpc
+TARGET-stage4-mpc = $(TARGET-mpc)
+all-stage4-mpc: configure-stage4-mpc
        @[ $(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 && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/mpc && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+               CFLAGS="$(STAGE4_CFLAGS)" \
+               CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage4-gold)
-
-maybe-clean-stage4-gold: clean-stage4-gold
-clean-stage4: clean-stage4-gold
-clean-stage4-gold:
+               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-mpc)
+
+maybe-clean-stage4-mpc: clean-stage4-mpc
+clean-stage4: clean-stage4-mpc
+clean-stage4-mpc:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage4-gold/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage4-mpc/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
+       cd $(HOST_SUBDIR)/mpc && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif mpc-bootstrap
+
+
+.PHONY: all-stageprofile-mpc maybe-all-stageprofile-mpc
+.PHONY: clean-stageprofile-mpc maybe-clean-stageprofile-mpc
+maybe-all-stageprofile-mpc:
+maybe-clean-stageprofile-mpc:
+@if mpc-bootstrap
+maybe-all-stageprofile-mpc: all-stageprofile-mpc
+all-stageprofile: all-stageprofile-mpc
+TARGET-stageprofile-mpc = $(TARGET-mpc)
+all-stageprofile-mpc: configure-stageprofile-mpc
        @[ $(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 && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/mpc && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageprofile-gold)
-
-maybe-clean-stageprofile-gold: clean-stageprofile-gold
-clean-stageprofile: clean-stageprofile-gold
-clean-stageprofile-gold:
+               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-mpc)
+
+maybe-clean-stageprofile-mpc: clean-stageprofile-mpc
+clean-stageprofile: clean-stageprofile-mpc
+clean-stageprofile-mpc:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stageprofile-gold/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageprofile-mpc/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
+       cd $(HOST_SUBDIR)/mpc && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif mpc-bootstrap
+
+
+.PHONY: all-stagefeedback-mpc maybe-all-stagefeedback-mpc
+.PHONY: clean-stagefeedback-mpc maybe-clean-stagefeedback-mpc
+maybe-all-stagefeedback-mpc:
+maybe-clean-stagefeedback-mpc:
+@if mpc-bootstrap
+maybe-all-stagefeedback-mpc: all-stagefeedback-mpc
+all-stagefeedback: all-stagefeedback-mpc
+TARGET-stagefeedback-mpc = $(TARGET-mpc)
+all-stagefeedback-mpc: configure-stagefeedback-mpc
        @[ $(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 && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/mpc && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stagefeedback-gold)
-
-maybe-clean-stagefeedback-gold: clean-stagefeedback-gold
-clean-stagefeedback: clean-stagefeedback-gold
-clean-stagefeedback-gold:
+               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-mpc)
+
+maybe-clean-stagefeedback-mpc: clean-stagefeedback-mpc
+clean-stagefeedback: clean-stagefeedback-mpc
+clean-stagefeedback-mpc:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-gold/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stagefeedback-mpc/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       cd $(HOST_SUBDIR)/gold && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gold-bootstrap
+       cd $(HOST_SUBDIR)/mpc && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif mpc-bootstrap
 
 
 
 
 
-.PHONY: check-gold maybe-check-gold
-maybe-check-gold:
-@if gold
-maybe-check-gold: check-gold
+.PHONY: check-mpc maybe-check-mpc
+maybe-check-mpc:
+@if mpc
+maybe-check-mpc: check-mpc
 
-check-gold:
+check-mpc:
        @: $(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)
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/mpc && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
-@endif gold
+@endif mpc
 
-.PHONY: install-gold maybe-install-gold
-maybe-install-gold:
-@if gold
-maybe-install-gold: install-gold
+.PHONY: install-mpc maybe-install-mpc
+maybe-install-mpc:
+@if mpc
+maybe-install-mpc: install-mpc
 
-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)
+install-mpc:
 
-@endif gold
+@endif mpc
+
+.PHONY: install-strip-mpc maybe-install-strip-mpc
+maybe-install-strip-mpc:
+@if mpc
+maybe-install-strip-mpc: install-strip-mpc
+
+install-strip-mpc:
+
+@endif mpc
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-gold info-gold
-maybe-info-gold:
-@if gold
-maybe-info-gold: info-gold
+.PHONY: maybe-info-mpc info-mpc
+maybe-info-mpc:
+@if mpc
+maybe-info-mpc: info-mpc
 
-info-gold: \
-    configure-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+info-mpc: \
+    configure-mpc 
+       @[ -f ./mpc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpc"; \
+       (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -19014,24 +13448,24 @@ info-gold: \
                  info) \
          || exit 1
 
-@endif gold
+@endif mpc
 
-.PHONY: maybe-dvi-gold dvi-gold
-maybe-dvi-gold:
-@if gold
-maybe-dvi-gold: dvi-gold
+.PHONY: maybe-dvi-mpc dvi-mpc
+maybe-dvi-mpc:
+@if mpc
+maybe-dvi-mpc: dvi-mpc
 
-dvi-gold: \
-    configure-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+dvi-mpc: \
+    configure-mpc 
+       @[ -f ./mpc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpc"; \
+       (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -19039,24 +13473,24 @@ dvi-gold: \
                  dvi) \
          || exit 1
 
-@endif gold
+@endif mpc
 
-.PHONY: maybe-pdf-gold pdf-gold
-maybe-pdf-gold:
-@if gold
-maybe-pdf-gold: pdf-gold
+.PHONY: maybe-pdf-mpc pdf-mpc
+maybe-pdf-mpc:
+@if mpc
+maybe-pdf-mpc: pdf-mpc
 
-pdf-gold: \
-    configure-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+pdf-mpc: \
+    configure-mpc 
+       @[ -f ./mpc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpc"; \
+       (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -19064,24 +13498,24 @@ pdf-gold: \
                  pdf) \
          || exit 1
 
-@endif gold
+@endif mpc
 
-.PHONY: maybe-html-gold html-gold
-maybe-html-gold:
-@if gold
-maybe-html-gold: html-gold
+.PHONY: maybe-html-mpc html-mpc
+maybe-html-mpc:
+@if mpc
+maybe-html-mpc: html-mpc
 
-html-gold: \
-    configure-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+html-mpc: \
+    configure-mpc 
+       @[ -f ./mpc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpc"; \
+       (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -19089,24 +13523,24 @@ html-gold: \
                  html) \
          || exit 1
 
-@endif gold
+@endif mpc
 
-.PHONY: maybe-TAGS-gold TAGS-gold
-maybe-TAGS-gold:
-@if gold
-maybe-TAGS-gold: TAGS-gold
+.PHONY: maybe-TAGS-mpc TAGS-mpc
+maybe-TAGS-mpc:
+@if mpc
+maybe-TAGS-mpc: TAGS-mpc
 
-TAGS-gold: \
-    configure-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+TAGS-mpc: \
+    configure-mpc 
+       @[ -f ./mpc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpc"; \
+       (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -19114,25 +13548,25 @@ TAGS-gold: \
                  TAGS) \
          || exit 1
 
-@endif gold
+@endif mpc
 
-.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-mpc install-info-mpc
+maybe-install-info-mpc:
+@if mpc
+maybe-install-info-mpc: install-info-mpc
 
-install-info-gold: \
-    configure-gold \
-    info-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+install-info-mpc: \
+    configure-mpc \
+    info-mpc 
+       @[ -f ./mpc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpc"; \
+       (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -19140,25 +13574,25 @@ install-info-gold: \
                  install-info) \
          || exit 1
 
-@endif gold
+@endif mpc
 
-.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-mpc install-pdf-mpc
+maybe-install-pdf-mpc:
+@if mpc
+maybe-install-pdf-mpc: install-pdf-mpc
 
-install-pdf-gold: \
-    configure-gold \
-    pdf-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+install-pdf-mpc: \
+    configure-mpc \
+    pdf-mpc 
+       @[ -f ./mpc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpc"; \
+       (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -19166,25 +13600,25 @@ install-pdf-gold: \
                  install-pdf) \
          || exit 1
 
-@endif gold
+@endif mpc
 
-.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-mpc install-html-mpc
+maybe-install-html-mpc:
+@if mpc
+maybe-install-html-mpc: install-html-mpc
 
-install-html-gold: \
-    configure-gold \
-    html-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+install-html-mpc: \
+    configure-mpc \
+    html-mpc 
+       @[ -f ./mpc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpc"; \
+       (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -19192,24 +13626,24 @@ install-html-gold: \
                  install-html) \
          || exit 1
 
-@endif gold
+@endif mpc
 
-.PHONY: maybe-installcheck-gold installcheck-gold
-maybe-installcheck-gold:
-@if gold
-maybe-installcheck-gold: installcheck-gold
+.PHONY: maybe-installcheck-mpc installcheck-mpc
+maybe-installcheck-mpc:
+@if mpc
+maybe-installcheck-mpc: installcheck-mpc
 
-installcheck-gold: \
-    configure-gold 
-       @[ -f ./gold/Makefile ] || exit 0; \
+installcheck-mpc: \
+    configure-mpc 
+       @[ -f ./mpc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpc"; \
+       (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -19217,23 +13651,23 @@ installcheck-gold: \
                  installcheck) \
          || exit 1
 
-@endif gold
+@endif mpc
 
-.PHONY: maybe-mostlyclean-gold mostlyclean-gold
-maybe-mostlyclean-gold:
-@if gold
-maybe-mostlyclean-gold: mostlyclean-gold
+.PHONY: maybe-mostlyclean-mpc mostlyclean-mpc
+maybe-mostlyclean-mpc:
+@if mpc
+maybe-mostlyclean-mpc: mostlyclean-mpc
 
-mostlyclean-gold: 
-       @[ -f ./gold/Makefile ] || exit 0; \
+mostlyclean-mpc: 
+       @[ -f ./mpc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpc"; \
+       (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -19241,23 +13675,23 @@ mostlyclean-gold:
                  mostlyclean) \
          || exit 1
 
-@endif gold
+@endif mpc
 
-.PHONY: maybe-clean-gold clean-gold
-maybe-clean-gold:
-@if gold
-maybe-clean-gold: clean-gold
+.PHONY: maybe-clean-mpc clean-mpc
+maybe-clean-mpc:
+@if mpc
+maybe-clean-mpc: clean-mpc
 
-clean-gold: 
-       @[ -f ./gold/Makefile ] || exit 0; \
+clean-mpc: 
+       @[ -f ./mpc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpc"; \
+       (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -19265,23 +13699,23 @@ clean-gold:
                  clean) \
          || exit 1
 
-@endif gold
+@endif mpc
 
-.PHONY: maybe-distclean-gold distclean-gold
-maybe-distclean-gold:
-@if gold
-maybe-distclean-gold: distclean-gold
+.PHONY: maybe-distclean-mpc distclean-mpc
+maybe-distclean-mpc:
+@if mpc
+maybe-distclean-mpc: distclean-mpc
 
-distclean-gold: 
-       @[ -f ./gold/Makefile ] || exit 0; \
+distclean-mpc: 
+       @[ -f ./mpc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpc"; \
+       (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -19289,23 +13723,23 @@ distclean-gold:
                  distclean) \
          || exit 1
 
-@endif gold
+@endif mpc
 
-.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-mpc maintainer-clean-mpc
+maybe-maintainer-clean-mpc:
+@if mpc
+maybe-maintainer-clean-mpc: maintainer-clean-mpc
 
-maintainer-clean-gold: 
-       @[ -f ./gold/Makefile ] || exit 0; \
+maintainer-clean-mpc: 
+       @[ -f ./mpc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpc"; \
+       (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -19313,113 +13747,574 @@ maintainer-clean-gold:
                  maintainer-clean) \
          || exit 1
 
-@endif gold
+@endif mpc
 
 
 
-.PHONY: configure-gprof maybe-configure-gprof
-maybe-configure-gprof:
+.PHONY: configure-isl maybe-configure-isl
+maybe-configure-isl:
 @if gcc-bootstrap
-configure-gprof: stage_current
+configure-isl: stage_current
 @endif gcc-bootstrap
-@if gprof
-maybe-configure-gprof: configure-gprof
-configure-gprof: 
-       @: $(MAKE); $(unstage)
+@if isl
+maybe-configure-isl: configure-isl
+configure-isl: 
        @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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/gprof; \
-       cd "$(HOST_SUBDIR)/gprof" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/isl/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/isl; \
+       cd "$(HOST_SUBDIR)/isl" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gprof/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/isl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gprof"; \
-       libsrcdir="$$s/gprof"; \
-       $(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} --disable-shared @extra_isl_gmp_configure_flags@ \
          || exit 1
-@endif gprof
+@endif isl
+
+
+
+.PHONY: configure-stage1-isl maybe-configure-stage1-isl
+maybe-configure-stage1-isl:
+@if isl-bootstrap
+maybe-configure-stage1-isl: configure-stage1-isl
+configure-stage1-isl:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/isl/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)/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; \
+       module_srcdir=isl; \
+       $(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 @extra_isl_gmp_configure_flags@
+@endif isl-bootstrap
+
+.PHONY: configure-stage2-isl maybe-configure-stage2-isl
+maybe-configure-stage2-isl:
+@if isl-bootstrap
+maybe-configure-stage2-isl: configure-stage2-isl
+configure-stage2-isl:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/isl/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)/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; \
+       module_srcdir=isl; \
+       $(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 @extra_isl_gmp_configure_flags@
+@endif isl-bootstrap
+
+.PHONY: configure-stage3-isl maybe-configure-stage3-isl
+maybe-configure-stage3-isl:
+@if isl-bootstrap
+maybe-configure-stage3-isl: configure-stage3-isl
+configure-stage3-isl:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/isl/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)/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; \
+       module_srcdir=isl; \
+       $(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 @extra_isl_gmp_configure_flags@
+@endif isl-bootstrap
+
+.PHONY: configure-stage4-isl maybe-configure-stage4-isl
+maybe-configure-stage4-isl:
+@if isl-bootstrap
+maybe-configure-stage4-isl: configure-stage4-isl
+configure-stage4-isl:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/isl/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)/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; \
+       module_srcdir=isl; \
+       $(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 @extra_isl_gmp_configure_flags@
+@endif isl-bootstrap
+
+.PHONY: configure-stageprofile-isl maybe-configure-stageprofile-isl
+maybe-configure-stageprofile-isl:
+@if isl-bootstrap
+maybe-configure-stageprofile-isl: configure-stageprofile-isl
+configure-stageprofile-isl:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/isl/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)/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; \
+       module_srcdir=isl; \
+       $(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 @extra_isl_gmp_configure_flags@
+@endif isl-bootstrap
+
+.PHONY: configure-stagefeedback-isl maybe-configure-stagefeedback-isl
+maybe-configure-stagefeedback-isl:
+@if isl-bootstrap
+maybe-configure-stagefeedback-isl: configure-stagefeedback-isl
+configure-stagefeedback-isl:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/isl/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)/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; \
+       module_srcdir=isl; \
+       $(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 @extra_isl_gmp_configure_flags@
+@endif isl-bootstrap
 
 
 
 
 
-.PHONY: all-gprof maybe-all-gprof
-maybe-all-gprof:
+.PHONY: all-isl maybe-all-isl
+maybe-all-isl:
 @if gcc-bootstrap
-all-gprof: stage_current
+all-isl: stage_current
 @endif gcc-bootstrap
-@if gprof
-TARGET-gprof=all
-maybe-all-gprof: all-gprof
-all-gprof: configure-gprof
-       @: $(MAKE); $(unstage)
+@if isl
+TARGET-isl=all
+maybe-all-isl: all-isl
+all-isl: configure-isl
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/isl && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) V=1 \
+               $(TARGET-isl))
+@endif isl
+
+
+
+.PHONY: all-stage1-isl maybe-all-stage1-isl
+.PHONY: clean-stage1-isl maybe-clean-stage1-isl
+maybe-all-stage1-isl:
+maybe-clean-stage1-isl:
+@if isl-bootstrap
+maybe-all-stage1-isl: all-stage1-isl
+all-stage1: all-stage1-isl
+TARGET-stage1-isl = $(TARGET-isl)
+all-stage1-isl: configure-stage1-isl
+       @[ $(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)/isl && \
+        \
+       $(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) V=1 \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
+               $(TARGET-stage1-isl)
+
+maybe-clean-stage1-isl: clean-stage1-isl
+clean-stage1: clean-stage1-isl
+clean-stage1-isl:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/isl/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-isl/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/isl && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+       $(STAGE1_FLAGS_TO_PASS) V=1 clean
+@endif isl-bootstrap
+
+
+.PHONY: all-stage2-isl maybe-all-stage2-isl
+.PHONY: clean-stage2-isl maybe-clean-stage2-isl
+maybe-all-stage2-isl:
+maybe-clean-stage2-isl:
+@if isl-bootstrap
+maybe-all-stage2-isl: all-stage2-isl
+all-stage2: all-stage2-isl
+TARGET-stage2-isl = $(TARGET-isl)
+all-stage2-isl: configure-stage2-isl
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-gprof))
-@endif gprof
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/isl && \
+        \
+       $(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) V=1 \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
+               $(TARGET-stage2-isl)
+
+maybe-clean-stage2-isl: clean-stage2-isl
+clean-stage2: clean-stage2-isl
+clean-stage2-isl:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/isl/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-isl/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/isl && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 clean
+@endif isl-bootstrap
+
+
+.PHONY: all-stage3-isl maybe-all-stage3-isl
+.PHONY: clean-stage3-isl maybe-clean-stage3-isl
+maybe-all-stage3-isl:
+maybe-clean-stage3-isl:
+@if isl-bootstrap
+maybe-all-stage3-isl: all-stage3-isl
+all-stage3: all-stage3-isl
+TARGET-stage3-isl = $(TARGET-isl)
+all-stage3-isl: configure-stage3-isl
+       @[ $(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)/isl && \
+        \
+       $(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) V=1 \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
+               $(TARGET-stage3-isl)
+
+maybe-clean-stage3-isl: clean-stage3-isl
+clean-stage3: clean-stage3-isl
+clean-stage3-isl:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/isl/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-isl/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/isl && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 clean
+@endif isl-bootstrap
+
+
+.PHONY: all-stage4-isl maybe-all-stage4-isl
+.PHONY: clean-stage4-isl maybe-clean-stage4-isl
+maybe-all-stage4-isl:
+maybe-clean-stage4-isl:
+@if isl-bootstrap
+maybe-all-stage4-isl: all-stage4-isl
+all-stage4: all-stage4-isl
+TARGET-stage4-isl = $(TARGET-isl)
+all-stage4-isl: configure-stage4-isl
+       @[ $(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)/isl && \
+        \
+       $(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) V=1 \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
+               $(TARGET-stage4-isl)
+
+maybe-clean-stage4-isl: clean-stage4-isl
+clean-stage4: clean-stage4-isl
+clean-stage4-isl:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/isl/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-isl/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/isl && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 clean
+@endif isl-bootstrap
+
+
+.PHONY: all-stageprofile-isl maybe-all-stageprofile-isl
+.PHONY: clean-stageprofile-isl maybe-clean-stageprofile-isl
+maybe-all-stageprofile-isl:
+maybe-clean-stageprofile-isl:
+@if isl-bootstrap
+maybe-all-stageprofile-isl: all-stageprofile-isl
+all-stageprofile: all-stageprofile-isl
+TARGET-stageprofile-isl = $(TARGET-isl)
+all-stageprofile-isl: configure-stageprofile-isl
+       @[ $(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)/isl && \
+        \
+       $(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) V=1 \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
+               $(TARGET-stageprofile-isl)
+
+maybe-clean-stageprofile-isl: clean-stageprofile-isl
+clean-stageprofile: clean-stageprofile-isl
+clean-stageprofile-isl:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/isl/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-isl/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/isl && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 clean
+@endif isl-bootstrap
+
+
+.PHONY: all-stagefeedback-isl maybe-all-stagefeedback-isl
+.PHONY: clean-stagefeedback-isl maybe-clean-stagefeedback-isl
+maybe-all-stagefeedback-isl:
+maybe-clean-stagefeedback-isl:
+@if isl-bootstrap
+maybe-all-stagefeedback-isl: all-stagefeedback-isl
+all-stagefeedback: all-stagefeedback-isl
+TARGET-stagefeedback-isl = $(TARGET-isl)
+all-stagefeedback-isl: configure-stagefeedback-isl
+       @[ $(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)/isl && \
+        \
+       $(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) V=1 \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
+               $(TARGET-stagefeedback-isl)
+
+maybe-clean-stagefeedback-isl: clean-stagefeedback-isl
+clean-stagefeedback: clean-stagefeedback-isl
+clean-stagefeedback-isl:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/isl/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-isl/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/isl && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 clean
+@endif isl-bootstrap
 
 
 
 
-.PHONY: check-gprof maybe-check-gprof
-maybe-check-gprof:
-@if gprof
-maybe-check-gprof: check-gprof
 
-check-gprof:
+.PHONY: check-isl maybe-check-isl
+maybe-check-isl:
+@if isl
+maybe-check-isl: check-isl
+
+check-isl:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/isl && \
+         $(MAKE) $(FLAGS_TO_PASS) V=1 $(EXTRA_BOOTSTRAP_FLAGS) check)
 
-@endif gprof
+@endif isl
 
-.PHONY: install-gprof maybe-install-gprof
-maybe-install-gprof:
-@if gprof
-maybe-install-gprof: install-gprof
+.PHONY: install-isl maybe-install-isl
+maybe-install-isl:
+@if isl
+maybe-install-isl: install-isl
 
-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)
+install-isl:
 
-@endif gprof
+@endif isl
+
+.PHONY: install-strip-isl maybe-install-strip-isl
+maybe-install-strip-isl:
+@if isl
+maybe-install-strip-isl: install-strip-isl
+
+install-strip-isl:
+
+@endif isl
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-gprof info-gprof
-maybe-info-gprof:
-@if gprof
-maybe-info-gprof: info-gprof
+.PHONY: maybe-info-isl info-isl
+maybe-info-isl:
+@if isl
+maybe-info-isl: info-isl
 
-info-gprof: \
-    configure-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+info-isl: \
+    configure-isl 
+       @[ -f ./isl/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) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -19427,25 +14322,24 @@ info-gprof: \
                  info) \
          || exit 1
 
-@endif gprof
+@endif isl
 
-.PHONY: maybe-dvi-gprof dvi-gprof
-maybe-dvi-gprof:
-@if gprof
-maybe-dvi-gprof: dvi-gprof
+.PHONY: maybe-dvi-isl dvi-isl
+maybe-dvi-isl:
+@if isl
+maybe-dvi-isl: dvi-isl
 
-dvi-gprof: \
-    configure-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+dvi-isl: \
+    configure-isl 
+       @[ -f ./isl/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) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -19453,25 +14347,24 @@ dvi-gprof: \
                  dvi) \
          || exit 1
 
-@endif gprof
+@endif isl
 
-.PHONY: maybe-pdf-gprof pdf-gprof
-maybe-pdf-gprof:
-@if gprof
-maybe-pdf-gprof: pdf-gprof
+.PHONY: maybe-pdf-isl pdf-isl
+maybe-pdf-isl:
+@if isl
+maybe-pdf-isl: pdf-isl
 
-pdf-gprof: \
-    configure-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+pdf-isl: \
+    configure-isl 
+       @[ -f ./isl/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) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -19479,25 +14372,24 @@ pdf-gprof: \
                  pdf) \
          || exit 1
 
-@endif gprof
+@endif isl
 
-.PHONY: maybe-html-gprof html-gprof
-maybe-html-gprof:
-@if gprof
-maybe-html-gprof: html-gprof
+.PHONY: maybe-html-isl html-isl
+maybe-html-isl:
+@if isl
+maybe-html-isl: html-isl
 
-html-gprof: \
-    configure-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+html-isl: \
+    configure-isl 
+       @[ -f ./isl/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) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -19505,25 +14397,24 @@ html-gprof: \
                  html) \
          || exit 1
 
-@endif gprof
+@endif isl
 
-.PHONY: maybe-TAGS-gprof TAGS-gprof
-maybe-TAGS-gprof:
-@if gprof
-maybe-TAGS-gprof: TAGS-gprof
+.PHONY: maybe-TAGS-isl TAGS-isl
+maybe-TAGS-isl:
+@if isl
+maybe-TAGS-isl: TAGS-isl
 
-TAGS-gprof: \
-    configure-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+TAGS-isl: \
+    configure-isl 
+       @[ -f ./isl/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) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -19531,26 +14422,25 @@ TAGS-gprof: \
                  TAGS) \
          || exit 1
 
-@endif gprof
+@endif isl
 
-.PHONY: maybe-install-info-gprof install-info-gprof
-maybe-install-info-gprof:
-@if gprof
-maybe-install-info-gprof: install-info-gprof
+.PHONY: maybe-install-info-isl install-info-isl
+maybe-install-info-isl:
+@if isl
+maybe-install-info-isl: install-info-isl
 
-install-info-gprof: \
-    configure-gprof \
-    info-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+install-info-isl: \
+    configure-isl \
+    info-isl 
+       @[ -f ./isl/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) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -19558,26 +14448,25 @@ install-info-gprof: \
                  install-info) \
          || exit 1
 
-@endif gprof
+@endif isl
 
-.PHONY: maybe-install-pdf-gprof install-pdf-gprof
-maybe-install-pdf-gprof:
-@if gprof
-maybe-install-pdf-gprof: install-pdf-gprof
+.PHONY: maybe-install-pdf-isl install-pdf-isl
+maybe-install-pdf-isl:
+@if isl
+maybe-install-pdf-isl: install-pdf-isl
 
-install-pdf-gprof: \
-    configure-gprof \
-    pdf-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+install-pdf-isl: \
+    configure-isl \
+    pdf-isl 
+       @[ -f ./isl/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) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -19585,26 +14474,25 @@ install-pdf-gprof: \
                  install-pdf) \
          || exit 1
 
-@endif gprof
+@endif isl
 
-.PHONY: maybe-install-html-gprof install-html-gprof
-maybe-install-html-gprof:
-@if gprof
-maybe-install-html-gprof: install-html-gprof
+.PHONY: maybe-install-html-isl install-html-isl
+maybe-install-html-isl:
+@if isl
+maybe-install-html-isl: install-html-isl
 
-install-html-gprof: \
-    configure-gprof \
-    html-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+install-html-isl: \
+    configure-isl \
+    html-isl 
+       @[ -f ./isl/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) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -19612,25 +14500,24 @@ install-html-gprof: \
                  install-html) \
          || exit 1
 
-@endif gprof
+@endif isl
 
-.PHONY: maybe-installcheck-gprof installcheck-gprof
-maybe-installcheck-gprof:
-@if gprof
-maybe-installcheck-gprof: installcheck-gprof
+.PHONY: maybe-installcheck-isl installcheck-isl
+maybe-installcheck-isl:
+@if isl
+maybe-installcheck-isl: installcheck-isl
 
-installcheck-gprof: \
-    configure-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+installcheck-isl: \
+    configure-isl 
+       @[ -f ./isl/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) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -19638,24 +14525,23 @@ installcheck-gprof: \
                  installcheck) \
          || exit 1
 
-@endif gprof
+@endif isl
 
-.PHONY: maybe-mostlyclean-gprof mostlyclean-gprof
-maybe-mostlyclean-gprof:
-@if gprof
-maybe-mostlyclean-gprof: mostlyclean-gprof
+.PHONY: maybe-mostlyclean-isl mostlyclean-isl
+maybe-mostlyclean-isl:
+@if isl
+maybe-mostlyclean-isl: mostlyclean-isl
 
-mostlyclean-gprof: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+mostlyclean-isl: 
+       @[ -f ./isl/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) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -19663,24 +14549,23 @@ mostlyclean-gprof:
                  mostlyclean) \
          || exit 1
 
-@endif gprof
+@endif isl
 
-.PHONY: maybe-clean-gprof clean-gprof
-maybe-clean-gprof:
-@if gprof
-maybe-clean-gprof: clean-gprof
+.PHONY: maybe-clean-isl clean-isl
+maybe-clean-isl:
+@if isl
+maybe-clean-isl: clean-isl
 
-clean-gprof: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+clean-isl: 
+       @[ -f ./isl/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) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -19688,24 +14573,23 @@ clean-gprof:
                  clean) \
          || exit 1
 
-@endif gprof
+@endif isl
 
-.PHONY: maybe-distclean-gprof distclean-gprof
-maybe-distclean-gprof:
-@if gprof
-maybe-distclean-gprof: distclean-gprof
+.PHONY: maybe-distclean-isl distclean-isl
+maybe-distclean-isl:
+@if isl
+maybe-distclean-isl: distclean-isl
 
-distclean-gprof: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+distclean-isl: 
+       @[ -f ./isl/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) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -19713,24 +14597,23 @@ distclean-gprof:
                  distclean) \
          || exit 1
 
-@endif gprof
+@endif isl
 
-.PHONY: maybe-maintainer-clean-gprof maintainer-clean-gprof
-maybe-maintainer-clean-gprof:
-@if gprof
-maybe-maintainer-clean-gprof: maintainer-clean-gprof
+.PHONY: maybe-maintainer-clean-isl maintainer-clean-isl
+maybe-maintainer-clean-isl:
+@if isl
+maybe-maintainer-clean-isl: maintainer-clean-isl
 
-maintainer-clean-gprof: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+maintainer-clean-isl: 
+       @[ -f ./isl/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) V=1; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -19738,113 +14621,574 @@ maintainer-clean-gprof:
                  maintainer-clean) \
          || exit 1
 
-@endif gprof
+@endif isl
 
 
 
-.PHONY: configure-gzip maybe-configure-gzip
-maybe-configure-gzip:
+.PHONY: configure-libelf maybe-configure-libelf
+maybe-configure-libelf:
 @if gcc-bootstrap
-configure-gzip: stage_current
+configure-libelf: stage_current
 @endif gcc-bootstrap
-@if gzip
-maybe-configure-gzip: configure-gzip
-configure-gzip: 
-       @: $(MAKE); $(unstage)
+@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)/gzip/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gzip ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/gzip; \
-       cd "$(HOST_SUBDIR)/gzip" || 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)/gzip/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gzip"; \
-       libsrcdir="$$s/gzip"; \
-       $(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} --disable-shared \
          || exit 1
-@endif gzip
+@endif libelf
+
+
+
+.PHONY: configure-stage1-libelf maybe-configure-stage1-libelf
+maybe-configure-stage1-libelf:
+@if libelf-bootstrap
+maybe-configure-stage1-libelf: configure-stage1-libelf
+configure-stage1-libelf:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libelf/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; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libelf; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS) \
+         --disable-shared
+@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)/libelf
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       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;  \
+       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)/libelf/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libelf; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE2_CONFIGURE_FLAGS) \
+         --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)/libelf
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       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;  \
+       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)/libelf/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libelf; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE3_CONFIGURE_FLAGS) \
+         --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)/libelf
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       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;  \
+       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)/libelf/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libelf; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE4_CONFIGURE_FLAGS) \
+         --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)/libelf
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       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;  \
+       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)/libelf/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libelf; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEprofile_CONFIGURE_FLAGS) \
+         --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)/libelf
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       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;  \
+       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)/libelf/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libelf; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEfeedback_CONFIGURE_FLAGS) \
+         --disable-shared
+@endif libelf-bootstrap
 
 
 
 
 
-.PHONY: all-gzip maybe-all-gzip
-maybe-all-gzip:
+.PHONY: all-libelf maybe-all-libelf
+maybe-all-libelf:
 @if gcc-bootstrap
-all-gzip: stage_current
+all-libelf: stage_current
 @endif gcc-bootstrap
-@if gzip
-TARGET-gzip=all
-maybe-all-gzip: all-gzip
-all-gzip: configure-gzip
-       @: $(MAKE); $(unstage)
+@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)  \
+       (cd $(HOST_SUBDIR)/libelf && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-libelf))
+@endif libelf
+
+
+
+.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)  \
+       cd $(HOST_SUBDIR)/libelf && \
+        \
+       $(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-libelf)
+
+maybe-clean-stage1-libelf: clean-stage1-libelf
+clean-stage1: clean-stage1-libelf
+clean-stage1-libelf:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-libelf/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libelf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+       $(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)  \
+       cd $(HOST_SUBDIR)/libelf && \
+        \
+       $(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-libelf)
+
+maybe-clean-stage2-libelf: clean-stage2-libelf
+clean-stage2: clean-stage2-libelf
+clean-stage2-libelf:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-libelf/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       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)  \
+       cd $(HOST_SUBDIR)/libelf && \
+        \
+       $(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-libelf)
+
+maybe-clean-stage3-libelf: clean-stage3-libelf
+clean-stage3: clean-stage3-libelf
+clean-stage3-libelf:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-libelf/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       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)  \
+       cd $(HOST_SUBDIR)/libelf && \
+        \
+       $(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-libelf)
+
+maybe-clean-stage4-libelf: clean-stage4-libelf
+clean-stage4: clean-stage4-libelf
+clean-stage4-libelf:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-libelf/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       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)  \
+       cd $(HOST_SUBDIR)/libelf && \
+        \
+       $(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-libelf)
+
+maybe-clean-stageprofile-libelf: clean-stageprofile-libelf
+clean-stageprofile: clean-stageprofile-libelf
+clean-stageprofile-libelf:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-libelf/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       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) \
-       (cd $(HOST_SUBDIR)/gzip && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-gzip))
-@endif gzip
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libelf && \
+        \
+       $(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-libelf)
+
+maybe-clean-stagefeedback-libelf: clean-stagefeedback-libelf
+clean-stagefeedback: clean-stagefeedback-libelf
+clean-stagefeedback-libelf:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-libelf/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libelf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libelf-bootstrap
 
 
 
 
-.PHONY: check-gzip maybe-check-gzip
-maybe-check-gzip:
-@if gzip
-maybe-check-gzip: check-gzip
 
-check-gzip:
+.PHONY: check-libelf maybe-check-libelf
+maybe-check-libelf:
+@if libelf
+maybe-check-libelf: check-libelf
+
+check-libelf:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gzip && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libelf && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
-@endif gzip
+@endif libelf
 
-.PHONY: install-gzip maybe-install-gzip
-maybe-install-gzip:
-@if gzip
-maybe-install-gzip: install-gzip
+.PHONY: install-libelf maybe-install-libelf
+maybe-install-libelf:
+@if libelf
+maybe-install-libelf: install-libelf
 
-install-gzip: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gzip && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+install-libelf:
 
-@endif gzip
+@endif libelf
+
+.PHONY: install-strip-libelf maybe-install-strip-libelf
+maybe-install-strip-libelf:
+@if libelf
+maybe-install-strip-libelf: install-strip-libelf
+
+install-strip-libelf:
+
+@endif libelf
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-gzip info-gzip
-maybe-info-gzip:
-@if gzip
-maybe-info-gzip: info-gzip
+.PHONY: maybe-info-libelf info-libelf
+maybe-info-libelf:
+@if libelf
+maybe-info-libelf: info-libelf
 
-info-gzip: \
-    configure-gzip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -19852,25 +15196,24 @@ info-gzip: \
                  info) \
          || exit 1
 
-@endif gzip
+@endif libelf
 
-.PHONY: maybe-dvi-gzip dvi-gzip
-maybe-dvi-gzip:
-@if gzip
-maybe-dvi-gzip: dvi-gzip
+.PHONY: maybe-dvi-libelf dvi-libelf
+maybe-dvi-libelf:
+@if libelf
+maybe-dvi-libelf: dvi-libelf
 
-dvi-gzip: \
-    configure-gzip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -19878,25 +15221,24 @@ dvi-gzip: \
                  dvi) \
          || exit 1
 
-@endif gzip
+@endif libelf
 
-.PHONY: maybe-pdf-gzip pdf-gzip
-maybe-pdf-gzip:
-@if gzip
-maybe-pdf-gzip: pdf-gzip
+.PHONY: maybe-pdf-libelf pdf-libelf
+maybe-pdf-libelf:
+@if libelf
+maybe-pdf-libelf: pdf-libelf
 
-pdf-gzip: \
-    configure-gzip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -19904,25 +15246,24 @@ pdf-gzip: \
                  pdf) \
          || exit 1
 
-@endif gzip
+@endif libelf
 
-.PHONY: maybe-html-gzip html-gzip
-maybe-html-gzip:
-@if gzip
-maybe-html-gzip: html-gzip
+.PHONY: maybe-html-libelf html-libelf
+maybe-html-libelf:
+@if libelf
+maybe-html-libelf: html-libelf
 
-html-gzip: \
-    configure-gzip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -19930,25 +15271,24 @@ html-gzip: \
                  html) \
          || exit 1
 
-@endif gzip
+@endif libelf
 
-.PHONY: maybe-TAGS-gzip TAGS-gzip
-maybe-TAGS-gzip:
-@if gzip
-maybe-TAGS-gzip: TAGS-gzip
+.PHONY: maybe-TAGS-libelf TAGS-libelf
+maybe-TAGS-libelf:
+@if libelf
+maybe-TAGS-libelf: TAGS-libelf
 
-TAGS-gzip: \
-    configure-gzip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -19956,26 +15296,25 @@ TAGS-gzip: \
                  TAGS) \
          || exit 1
 
-@endif gzip
+@endif libelf
 
-.PHONY: maybe-install-info-gzip install-info-gzip
-maybe-install-info-gzip:
-@if gzip
-maybe-install-info-gzip: install-info-gzip
+.PHONY: maybe-install-info-libelf install-info-libelf
+maybe-install-info-libelf:
+@if libelf
+maybe-install-info-libelf: install-info-libelf
 
-install-info-gzip: \
-    configure-gzip \
-    info-gzip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -19983,26 +15322,25 @@ install-info-gzip: \
                  install-info) \
          || exit 1
 
-@endif gzip
+@endif libelf
 
-.PHONY: maybe-install-pdf-gzip install-pdf-gzip
-maybe-install-pdf-gzip:
-@if gzip
-maybe-install-pdf-gzip: install-pdf-gzip
+.PHONY: maybe-install-pdf-libelf install-pdf-libelf
+maybe-install-pdf-libelf:
+@if libelf
+maybe-install-pdf-libelf: install-pdf-libelf
 
-install-pdf-gzip: \
-    configure-gzip \
-    pdf-gzip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -20010,26 +15348,25 @@ install-pdf-gzip: \
                  install-pdf) \
          || exit 1
 
-@endif gzip
+@endif libelf
 
-.PHONY: maybe-install-html-gzip install-html-gzip
-maybe-install-html-gzip:
-@if gzip
-maybe-install-html-gzip: install-html-gzip
+.PHONY: maybe-install-html-libelf install-html-libelf
+maybe-install-html-libelf:
+@if libelf
+maybe-install-html-libelf: install-html-libelf
 
-install-html-gzip: \
-    configure-gzip \
-    html-gzip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -20037,25 +15374,24 @@ install-html-gzip: \
                  install-html) \
          || exit 1
 
-@endif gzip
+@endif libelf
 
-.PHONY: maybe-installcheck-gzip installcheck-gzip
-maybe-installcheck-gzip:
-@if gzip
-maybe-installcheck-gzip: installcheck-gzip
+.PHONY: maybe-installcheck-libelf installcheck-libelf
+maybe-installcheck-libelf:
+@if libelf
+maybe-installcheck-libelf: installcheck-libelf
 
-installcheck-gzip: \
-    configure-gzip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -20063,24 +15399,23 @@ installcheck-gzip: \
                  installcheck) \
          || exit 1
 
-@endif gzip
+@endif libelf
 
-.PHONY: maybe-mostlyclean-gzip mostlyclean-gzip
-maybe-mostlyclean-gzip:
-@if gzip
-maybe-mostlyclean-gzip: mostlyclean-gzip
+.PHONY: maybe-mostlyclean-libelf mostlyclean-libelf
+maybe-mostlyclean-libelf:
+@if libelf
+maybe-mostlyclean-libelf: mostlyclean-libelf
 
-mostlyclean-gzip: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -20088,188 +15423,652 @@ mostlyclean-gzip:
                  mostlyclean) \
          || exit 1
 
-@endif gzip
+@endif libelf
 
-.PHONY: maybe-clean-gzip clean-gzip
-maybe-clean-gzip:
-@if gzip
-maybe-clean-gzip: clean-gzip
+.PHONY: maybe-clean-libelf clean-libelf
+maybe-clean-libelf:
+@if libelf
+maybe-clean-libelf: clean-libelf
 
-clean-gzip: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       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}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 clean) \
+         || exit 1
+
+@endif libelf
+
+.PHONY: maybe-distclean-libelf distclean-libelf
+maybe-distclean-libelf:
+@if libelf
+maybe-distclean-libelf: distclean-libelf
+
+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) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       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}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 distclean) \
+         || exit 1
+
+@endif libelf
+
+.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) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing clean in gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
-         $(MAKE) $(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
+       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 && \
+         $(MAKE) $(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 libelf
+
+
+
+.PHONY: configure-gold maybe-configure-gold
+maybe-configure-gold:
+@if gcc-bootstrap
+configure-gold: stage_current
+@endif gcc-bootstrap
+@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)/gold/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/gold; \
+       cd "$(HOST_SUBDIR)/gold" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=gold; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias}  \
+         || exit 1
+@endif gold
+
+
+
+.PHONY: configure-stage1-gold maybe-configure-stage1-gold
+maybe-configure-stage1-gold:
+@if gold-bootstrap
+maybe-configure-stage1-gold: configure-stage1-gold
+configure-stage1-gold:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/gold; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=gold; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif gold-bootstrap
+
+.PHONY: configure-stage2-gold maybe-configure-stage2-gold
+maybe-configure-stage2-gold:
+@if gold-bootstrap
+maybe-configure-stage2-gold: configure-stage2-gold
+configure-stage2-gold:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/gold; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=gold; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif gold-bootstrap
+
+.PHONY: configure-stage3-gold maybe-configure-stage3-gold
+maybe-configure-stage3-gold:
+@if gold-bootstrap
+maybe-configure-stage3-gold: configure-stage3-gold
+configure-stage3-gold:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/gold; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=gold; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif gold-bootstrap
+
+.PHONY: configure-stage4-gold maybe-configure-stage4-gold
+maybe-configure-stage4-gold:
+@if gold-bootstrap
+maybe-configure-stage4-gold: configure-stage4-gold
+configure-stage4-gold:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/gold; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=gold; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif gold-bootstrap
+
+.PHONY: configure-stageprofile-gold maybe-configure-stageprofile-gold
+maybe-configure-stageprofile-gold:
+@if gold-bootstrap
+maybe-configure-stageprofile-gold: configure-stageprofile-gold
+configure-stageprofile-gold:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage profile in $(HOST_SUBDIR)/gold; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=gold; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif gold-bootstrap
+
+.PHONY: configure-stagefeedback-gold maybe-configure-stagefeedback-gold
+maybe-configure-stagefeedback-gold:
+@if gold-bootstrap
+maybe-configure-stagefeedback-gold: configure-stagefeedback-gold
+configure-stagefeedback-gold:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/gold; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=gold; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif gold-bootstrap
+
+
+
+
+
+.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
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gold && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-gold))
+@endif gold
+
+
+
+.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)/gold && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE1_CFLAGS)" \
+               CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+               LIBCFLAGS="$(LIBCFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
+               $(TARGET-stage1-gold)
+
+maybe-clean-stage1-gold: clean-stage1-gold
+clean-stage1: clean-stage1-gold
+clean-stage1-gold:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-gold/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/gold && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif gold-bootstrap
+
+
+.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)/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)
+
+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
+
+
+.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)
 
-@endif gzip
+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: maybe-distclean-gzip distclean-gzip
-maybe-distclean-gzip:
-@if gzip
-maybe-distclean-gzip: distclean-gzip
 
-distclean-gzip: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gzip/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing distclean in gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
-         $(MAKE) $(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
+       $(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)
 
-@endif gzip
+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: maybe-maintainer-clean-gzip maintainer-clean-gzip
-maybe-maintainer-clean-gzip:
-@if gzip
-maybe-maintainer-clean-gzip: maintainer-clean-gzip
 
-maintainer-clean-gzip: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gzip/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing maintainer-clean in gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
-         $(MAKE) $(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 gzip
+       $(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: configure-hello maybe-configure-hello
-maybe-configure-hello:
-@if gcc-bootstrap
-configure-hello: stage_current
-@endif gcc-bootstrap
-@if hello
-maybe-configure-hello: configure-hello
-configure-hello: 
-       @: $(MAKE); $(unstage)
+.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; \
-       test ! -f $(HOST_SUBDIR)/hello/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/hello ; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/hello; \
-       cd "$(HOST_SUBDIR)/hello" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/hello/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/hello"; \
-       libsrcdir="$$s/hello"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif hello
+       $(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: all-hello maybe-all-hello
-maybe-all-hello:
-@if gcc-bootstrap
-all-hello: stage_current
-@endif gcc-bootstrap
-@if hello
-TARGET-hello=all
-maybe-all-hello: all-hello
-all-hello: configure-hello
+.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)/hello && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-hello))
-@endif hello
-
-
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gold && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
+@endif gold
 
-.PHONY: check-hello maybe-check-hello
-maybe-check-hello:
-@if hello
-maybe-check-hello: check-hello
+.PHONY: install-gold maybe-install-gold
+maybe-install-gold:
+@if gold
+maybe-install-gold: install-gold
 
-check-hello:
+install-gold: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/hello && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       (cd $(HOST_SUBDIR)/gold && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif hello
+@endif gold
 
-.PHONY: install-hello maybe-install-hello
-maybe-install-hello:
-@if hello
-maybe-install-hello: install-hello
+.PHONY: install-strip-gold maybe-install-strip-gold
+maybe-install-strip-gold:
+@if gold
+maybe-install-strip-gold: install-strip-gold
 
-install-hello: installdirs
+install-strip-gold: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/hello && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+       (cd $(HOST_SUBDIR)/gold && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif hello
+@endif gold
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-hello info-hello
-maybe-info-hello:
-@if hello
-maybe-info-hello: info-hello
+.PHONY: maybe-info-gold info-gold
+maybe-info-gold:
+@if gold
+maybe-info-gold: info-gold
 
-info-hello: \
-    configure-hello 
-       @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -20277,25 +16076,24 @@ info-hello: \
                  info) \
          || exit 1
 
-@endif hello
+@endif gold
 
-.PHONY: maybe-dvi-hello dvi-hello
-maybe-dvi-hello:
-@if hello
-maybe-dvi-hello: dvi-hello
+.PHONY: maybe-dvi-gold dvi-gold
+maybe-dvi-gold:
+@if gold
+maybe-dvi-gold: dvi-gold
 
-dvi-hello: \
-    configure-hello 
-       @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -20303,25 +16101,24 @@ dvi-hello: \
                  dvi) \
          || exit 1
 
-@endif hello
+@endif gold
 
-.PHONY: maybe-pdf-hello pdf-hello
-maybe-pdf-hello:
-@if hello
-maybe-pdf-hello: pdf-hello
+.PHONY: maybe-pdf-gold pdf-gold
+maybe-pdf-gold:
+@if gold
+maybe-pdf-gold: pdf-gold
 
-pdf-hello: \
-    configure-hello 
-       @: $(MAKE); $(unstage)
-       @[ -f ./hello/Makefile ] || exit 0; \
+pdf-gold: \
+    configure-gold 
+       @[ -f ./gold/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -20329,25 +16126,24 @@ pdf-hello: \
                  pdf) \
          || exit 1
 
-@endif hello
+@endif gold
 
-.PHONY: maybe-html-hello html-hello
-maybe-html-hello:
-@if hello
-maybe-html-hello: html-hello
+.PHONY: maybe-html-gold html-gold
+maybe-html-gold:
+@if gold
+maybe-html-gold: html-gold
 
-html-hello: \
-    configure-hello 
-       @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -20355,25 +16151,24 @@ html-hello: \
                  html) \
          || exit 1
 
-@endif hello
+@endif gold
 
-.PHONY: maybe-TAGS-hello TAGS-hello
-maybe-TAGS-hello:
-@if hello
-maybe-TAGS-hello: TAGS-hello
+.PHONY: maybe-TAGS-gold TAGS-gold
+maybe-TAGS-gold:
+@if gold
+maybe-TAGS-gold: TAGS-gold
 
-TAGS-hello: \
-    configure-hello 
-       @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -20381,26 +16176,25 @@ TAGS-hello: \
                  TAGS) \
          || exit 1
 
-@endif hello
+@endif gold
 
-.PHONY: maybe-install-info-hello install-info-hello
-maybe-install-info-hello:
-@if hello
-maybe-install-info-hello: install-info-hello
+.PHONY: maybe-install-info-gold install-info-gold
+maybe-install-info-gold:
+@if gold
+maybe-install-info-gold: install-info-gold
 
-install-info-hello: \
-    configure-hello \
-    info-hello 
-       @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -20408,26 +16202,25 @@ install-info-hello: \
                  install-info) \
          || exit 1
 
-@endif hello
+@endif gold
 
-.PHONY: maybe-install-pdf-hello install-pdf-hello
-maybe-install-pdf-hello:
-@if hello
-maybe-install-pdf-hello: install-pdf-hello
+.PHONY: maybe-install-pdf-gold install-pdf-gold
+maybe-install-pdf-gold:
+@if gold
+maybe-install-pdf-gold: install-pdf-gold
 
-install-pdf-hello: \
-    configure-hello \
-    pdf-hello 
-       @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -20435,26 +16228,25 @@ install-pdf-hello: \
                  install-pdf) \
          || exit 1
 
-@endif hello
+@endif gold
 
-.PHONY: maybe-install-html-hello install-html-hello
-maybe-install-html-hello:
-@if hello
-maybe-install-html-hello: install-html-hello
+.PHONY: maybe-install-html-gold install-html-gold
+maybe-install-html-gold:
+@if gold
+maybe-install-html-gold: install-html-gold
 
-install-html-hello: \
-    configure-hello \
-    html-hello 
-       @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -20462,25 +16254,24 @@ install-html-hello: \
                  install-html) \
          || exit 1
 
-@endif hello
+@endif gold
 
-.PHONY: maybe-installcheck-hello installcheck-hello
-maybe-installcheck-hello:
-@if hello
-maybe-installcheck-hello: installcheck-hello
+.PHONY: maybe-installcheck-gold installcheck-gold
+maybe-installcheck-gold:
+@if gold
+maybe-installcheck-gold: installcheck-gold
 
-installcheck-hello: \
-    configure-hello 
-       @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -20488,24 +16279,23 @@ installcheck-hello: \
                  installcheck) \
          || exit 1
 
-@endif hello
+@endif gold
 
-.PHONY: maybe-mostlyclean-hello mostlyclean-hello
-maybe-mostlyclean-hello:
-@if hello
-maybe-mostlyclean-hello: mostlyclean-hello
+.PHONY: maybe-mostlyclean-gold mostlyclean-gold
+maybe-mostlyclean-gold:
+@if gold
+maybe-mostlyclean-gold: mostlyclean-gold
 
-mostlyclean-hello: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -20513,24 +16303,23 @@ mostlyclean-hello:
                  mostlyclean) \
          || exit 1
 
-@endif hello
+@endif gold
 
-.PHONY: maybe-clean-hello clean-hello
-maybe-clean-hello:
-@if hello
-maybe-clean-hello: clean-hello
+.PHONY: maybe-clean-gold clean-gold
+maybe-clean-gold:
+@if gold
+maybe-clean-gold: clean-gold
 
-clean-hello: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -20538,24 +16327,23 @@ clean-hello:
                  clean) \
          || exit 1
 
-@endif hello
+@endif gold
 
-.PHONY: maybe-distclean-hello distclean-hello
-maybe-distclean-hello:
-@if hello
-maybe-distclean-hello: distclean-hello
+.PHONY: maybe-distclean-gold distclean-gold
+maybe-distclean-gold:
+@if gold
+maybe-distclean-gold: distclean-gold
 
-distclean-hello: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -20563,24 +16351,23 @@ distclean-hello:
                  distclean) \
          || exit 1
 
-@endif hello
+@endif gold
 
-.PHONY: maybe-maintainer-clean-hello maintainer-clean-hello
-maybe-maintainer-clean-hello:
-@if hello
-maybe-maintainer-clean-hello: maintainer-clean-hello
+.PHONY: maybe-maintainer-clean-gold maintainer-clean-gold
+maybe-maintainer-clean-gold:
+@if gold
+maybe-maintainer-clean-gold: maintainer-clean-gold
 
-maintainer-clean-hello: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -20588,113 +16375,129 @@ maintainer-clean-hello:
                  maintainer-clean) \
          || exit 1
 
-@endif hello
+@endif gold
 
 
 
-.PHONY: configure-indent maybe-configure-indent
-maybe-configure-indent:
+.PHONY: configure-gprof maybe-configure-gprof
+maybe-configure-gprof:
 @if gcc-bootstrap
-configure-indent: stage_current
+configure-gprof: stage_current
 @endif gcc-bootstrap
-@if indent
-maybe-configure-indent: configure-indent
-configure-indent: 
+@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)/indent/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/indent ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/indent; \
-       cd "$(HOST_SUBDIR)/indent" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/gprof; \
+       cd "$(HOST_SUBDIR)/gprof" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/indent/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gprof/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/indent"; \
-       libsrcdir="$$s/indent"; \
-       $(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 indent
+@endif gprof
 
 
 
 
 
-.PHONY: all-indent maybe-all-indent
-maybe-all-indent:
+.PHONY: all-gprof maybe-all-gprof
+maybe-all-gprof:
 @if gcc-bootstrap
-all-indent: stage_current
+all-gprof: stage_current
 @endif gcc-bootstrap
-@if indent
-TARGET-indent=all
-maybe-all-indent: all-indent
-all-indent: configure-indent
+@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)/indent && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-indent))
-@endif indent
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gprof && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-gprof))
+@endif gprof
 
 
 
 
-.PHONY: check-indent maybe-check-indent
-maybe-check-indent:
-@if indent
-maybe-check-indent: check-indent
+.PHONY: check-gprof maybe-check-gprof
+maybe-check-gprof:
+@if gprof
+maybe-check-gprof: check-gprof
 
-check-indent:
+check-gprof:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/indent && \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gprof && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif indent
+@endif gprof
 
-.PHONY: install-indent maybe-install-indent
-maybe-install-indent:
-@if indent
-maybe-install-indent: install-indent
+.PHONY: install-gprof maybe-install-gprof
+maybe-install-gprof:
+@if gprof
+maybe-install-gprof: install-gprof
 
-install-indent: installdirs
+install-gprof: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/indent && \
+       (cd $(HOST_SUBDIR)/gprof && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif indent
+@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-indent info-indent
-maybe-info-indent:
-@if indent
-maybe-info-indent: info-indent
+.PHONY: maybe-info-gprof info-gprof
+maybe-info-gprof:
+@if gprof
+maybe-info-gprof: info-gprof
 
-info-indent: \
-    configure-indent 
+info-gprof: \
+    configure-gprof 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/Makefile ] || exit 0; \
+       @[ -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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -20702,25 +16505,25 @@ info-indent: \
                  info) \
          || exit 1
 
-@endif indent
+@endif gprof
 
-.PHONY: maybe-dvi-indent dvi-indent
-maybe-dvi-indent:
-@if indent
-maybe-dvi-indent: dvi-indent
+.PHONY: maybe-dvi-gprof dvi-gprof
+maybe-dvi-gprof:
+@if gprof
+maybe-dvi-gprof: dvi-gprof
 
-dvi-indent: \
-    configure-indent 
+dvi-gprof: \
+    configure-gprof 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/Makefile ] || exit 0; \
+       @[ -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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -20728,25 +16531,25 @@ dvi-indent: \
                  dvi) \
          || exit 1
 
-@endif indent
+@endif gprof
 
-.PHONY: maybe-pdf-indent pdf-indent
-maybe-pdf-indent:
-@if indent
-maybe-pdf-indent: pdf-indent
+.PHONY: maybe-pdf-gprof pdf-gprof
+maybe-pdf-gprof:
+@if gprof
+maybe-pdf-gprof: pdf-gprof
 
-pdf-indent: \
-    configure-indent 
+pdf-gprof: \
+    configure-gprof 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/Makefile ] || exit 0; \
+       @[ -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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -20754,25 +16557,25 @@ pdf-indent: \
                  pdf) \
          || exit 1
 
-@endif indent
+@endif gprof
 
-.PHONY: maybe-html-indent html-indent
-maybe-html-indent:
-@if indent
-maybe-html-indent: html-indent
+.PHONY: maybe-html-gprof html-gprof
+maybe-html-gprof:
+@if gprof
+maybe-html-gprof: html-gprof
 
-html-indent: \
-    configure-indent 
+html-gprof: \
+    configure-gprof 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/Makefile ] || exit 0; \
+       @[ -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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -20780,25 +16583,25 @@ html-indent: \
                  html) \
          || exit 1
 
-@endif indent
+@endif gprof
 
-.PHONY: maybe-TAGS-indent TAGS-indent
-maybe-TAGS-indent:
-@if indent
-maybe-TAGS-indent: TAGS-indent
+.PHONY: maybe-TAGS-gprof TAGS-gprof
+maybe-TAGS-gprof:
+@if gprof
+maybe-TAGS-gprof: TAGS-gprof
 
-TAGS-indent: \
-    configure-indent 
+TAGS-gprof: \
+    configure-gprof 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/Makefile ] || exit 0; \
+       @[ -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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -20806,26 +16609,26 @@ TAGS-indent: \
                  TAGS) \
          || exit 1
 
-@endif indent
+@endif gprof
 
-.PHONY: maybe-install-info-indent install-info-indent
-maybe-install-info-indent:
-@if indent
-maybe-install-info-indent: install-info-indent
+.PHONY: maybe-install-info-gprof install-info-gprof
+maybe-install-info-gprof:
+@if gprof
+maybe-install-info-gprof: install-info-gprof
 
-install-info-indent: \
-    configure-indent \
-    info-indent 
+install-info-gprof: \
+    configure-gprof \
+    info-gprof 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/Makefile ] || exit 0; \
+       @[ -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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -20833,26 +16636,26 @@ install-info-indent: \
                  install-info) \
          || exit 1
 
-@endif indent
+@endif gprof
 
-.PHONY: maybe-install-pdf-indent install-pdf-indent
-maybe-install-pdf-indent:
-@if indent
-maybe-install-pdf-indent: install-pdf-indent
+.PHONY: maybe-install-pdf-gprof install-pdf-gprof
+maybe-install-pdf-gprof:
+@if gprof
+maybe-install-pdf-gprof: install-pdf-gprof
 
-install-pdf-indent: \
-    configure-indent \
-    pdf-indent 
+install-pdf-gprof: \
+    configure-gprof \
+    pdf-gprof 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/Makefile ] || exit 0; \
+       @[ -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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -20860,26 +16663,26 @@ install-pdf-indent: \
                  install-pdf) \
          || exit 1
 
-@endif indent
+@endif gprof
 
-.PHONY: maybe-install-html-indent install-html-indent
-maybe-install-html-indent:
-@if indent
-maybe-install-html-indent: install-html-indent
+.PHONY: maybe-install-html-gprof install-html-gprof
+maybe-install-html-gprof:
+@if gprof
+maybe-install-html-gprof: install-html-gprof
 
-install-html-indent: \
-    configure-indent \
-    html-indent 
+install-html-gprof: \
+    configure-gprof \
+    html-gprof 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/Makefile ] || exit 0; \
+       @[ -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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -20887,25 +16690,25 @@ install-html-indent: \
                  install-html) \
          || exit 1
 
-@endif indent
+@endif gprof
 
-.PHONY: maybe-installcheck-indent installcheck-indent
-maybe-installcheck-indent:
-@if indent
-maybe-installcheck-indent: installcheck-indent
+.PHONY: maybe-installcheck-gprof installcheck-gprof
+maybe-installcheck-gprof:
+@if gprof
+maybe-installcheck-gprof: installcheck-gprof
 
-installcheck-indent: \
-    configure-indent 
+installcheck-gprof: \
+    configure-gprof 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/Makefile ] || exit 0; \
+       @[ -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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -20913,24 +16716,24 @@ installcheck-indent: \
                  installcheck) \
          || exit 1
 
-@endif indent
+@endif gprof
 
-.PHONY: maybe-mostlyclean-indent mostlyclean-indent
-maybe-mostlyclean-indent:
-@if indent
-maybe-mostlyclean-indent: mostlyclean-indent
+.PHONY: maybe-mostlyclean-gprof mostlyclean-gprof
+maybe-mostlyclean-gprof:
+@if gprof
+maybe-mostlyclean-gprof: mostlyclean-gprof
 
-mostlyclean-indent: 
+mostlyclean-gprof: 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/Makefile ] || exit 0; \
+       @[ -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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -20938,24 +16741,24 @@ mostlyclean-indent:
                  mostlyclean) \
          || exit 1
 
-@endif indent
+@endif gprof
 
-.PHONY: maybe-clean-indent clean-indent
-maybe-clean-indent:
-@if indent
-maybe-clean-indent: clean-indent
+.PHONY: maybe-clean-gprof clean-gprof
+maybe-clean-gprof:
+@if gprof
+maybe-clean-gprof: clean-gprof
 
-clean-indent: 
+clean-gprof: 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/Makefile ] || exit 0; \
+       @[ -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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -20963,24 +16766,24 @@ clean-indent:
                  clean) \
          || exit 1
 
-@endif indent
+@endif gprof
 
-.PHONY: maybe-distclean-indent distclean-indent
-maybe-distclean-indent:
-@if indent
-maybe-distclean-indent: distclean-indent
+.PHONY: maybe-distclean-gprof distclean-gprof
+maybe-distclean-gprof:
+@if gprof
+maybe-distclean-gprof: distclean-gprof
 
-distclean-indent: 
+distclean-gprof: 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/Makefile ] || exit 0; \
+       @[ -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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -20988,24 +16791,24 @@ distclean-indent:
                  distclean) \
          || exit 1
 
-@endif indent
+@endif gprof
 
-.PHONY: maybe-maintainer-clean-indent maintainer-clean-indent
-maybe-maintainer-clean-indent:
-@if indent
-maybe-maintainer-clean-indent: maintainer-clean-indent
+.PHONY: maybe-maintainer-clean-gprof maintainer-clean-gprof
+maybe-maintainer-clean-gprof:
+@if gprof
+maybe-maintainer-clean-gprof: maintainer-clean-gprof
 
-maintainer-clean-indent: 
+maintainer-clean-gprof: 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/Makefile ] || exit 0; \
+       @[ -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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -21013,7 +16816,7 @@ maintainer-clean-indent:
                  maintainer-clean) \
          || exit 1
 
-@endif indent
+@endif gprof
 
 
 
@@ -21028,8 +16831,8 @@ 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) \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \
+       $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/intl; \
        cd "$(HOST_SUBDIR)/intl" || exit 1; \
        case $(srcdir) in \
@@ -21037,11 +16840,12 @@ configure-intl:
          *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=intl; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif intl
 
@@ -21056,25 +16860,27 @@ configure-stage1-intl:
        @$(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; \
-       $(HOST_EXPORTS)  \
+       $(HOST_EXPORTS) \
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+       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} \
           \
-         --disable-intermodule $(STAGE1_CHECKING)        --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+         $(STAGE1_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
 .PHONY: configure-stage2-intl maybe-configure-stage2-intl
@@ -21086,119 +16892,61 @@ configure-stage2-intl:
        @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
        test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif intl-bootstrap
-
-.PHONY: configure-stageb2g0-intl maybe-configure-stageb2g0-intl
-maybe-configure-stageb2g0-intl:
-@if intl-bootstrap
-maybe-configure-stageb2g0-intl: configure-stageb2g0-intl
-configure-stageb2g0-intl:
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
-       echo Configuring stage b2g0 in $(HOST_SUBDIR)/intl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+       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_werror_flag@ 
+         $(STAGE2_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
 .PHONY: configure-stage3-intl maybe-configure-stage3-intl
 maybe-configure-stage3-intl:
 @if intl-bootstrap
 maybe-configure-stage3-intl: configure-stage3-intl
-configure-stage3-intl:
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif intl-bootstrap
-
-.PHONY: configure-stageb3g2-intl maybe-configure-stageb3g2-intl
-maybe-configure-stageb3g2-intl:
-@if intl-bootstrap
-maybe-configure-stageb3g2-intl: configure-stageb3g2-intl
-configure-stageb3g2-intl:
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
+configure-stage3-intl:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
        @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
        test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
-       echo Configuring stage b3g2 in $(HOST_SUBDIR)/intl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+       $(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)/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_werror_flag@ 
+         $(STAGE3_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
 .PHONY: configure-stage4-intl maybe-configure-stage4-intl
@@ -21210,26 +16958,28 @@ configure-stage4-intl:
        @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
        test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/intl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+       CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+       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) \
-         @stage2_werror_flag@ 
+         $(STAGE4_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
 .PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl
@@ -21241,26 +16991,28 @@ configure-stageprofile-intl:
        @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
        test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/intl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+       $(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)/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_werror_flag@ 
+         $(STAGEprofile_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
 .PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl
@@ -21272,26 +17024,28 @@ configure-stagefeedback-intl:
        @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/intl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+       $(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)/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_werror_flag@ 
+         $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
 
@@ -21309,9 +17063,9 @@ maybe-all-intl: all-intl
 all-intl: configure-intl
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(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
 
@@ -21329,13 +17083,20 @@ all-stage1-intl: configure-stage1-intl
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
        cd $(HOST_SUBDIR)/intl && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-               LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
+               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-intl)
 
 maybe-clean-stage1-intl: clean-stage1-intl
@@ -21349,7 +17110,7 @@ clean-stage1-intl:
        fi; \
        cd $(HOST_SUBDIR)/intl && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
+       $(STAGE1_FLAGS_TO_PASS)  clean
 @endif intl-bootstrap
 
 
@@ -21365,14 +17126,20 @@ all-stage2-intl: configure-stage2-intl
        @[ $(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) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
        cd $(HOST_SUBDIR)/intl && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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-intl)
 
 maybe-clean-stage2-intl: clean-stage2-intl
@@ -21385,47 +17152,7 @@ clean-stage2-intl:
          $(MAKE) stage2-start; \
        fi; \
        cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif intl-bootstrap
-
-
-.PHONY: all-stageb2g0-intl maybe-all-stageb2g0-intl
-.PHONY: clean-stageb2g0-intl maybe-clean-stageb2g0-intl
-maybe-all-stageb2g0-intl:
-maybe-clean-stageb2g0-intl:
-@if intl-bootstrap
-maybe-all-stageb2g0-intl: all-stageb2g0-intl
-all-stageb2g0: all-stageb2g0-intl
-TARGET-stageb2g0-intl = $(TARGET-intl)
-all-stageb2g0-intl: configure-stageb2g0-intl
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb2g0-intl)
-
-maybe-clean-stageb2g0-intl: clean-stageb2g0-intl
-clean-stageb2g0: clean-stageb2g0-intl
-clean-stageb2g0-intl:
-       @if [ $(current_stage) = stageb2g0 ]; then \
-         [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb2g0-intl/Makefile ] || exit 0; \
-         $(MAKE) stageb2g0-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
 
 
@@ -21441,14 +17168,20 @@ all-stage3-intl: configure-stage3-intl
        @[ $(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) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
        cd $(HOST_SUBDIR)/intl && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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-intl)
 
 maybe-clean-stage3-intl: clean-stage3-intl
@@ -21461,47 +17194,7 @@ clean-stage3-intl:
          $(MAKE) stage3-start; \
        fi; \
        cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif intl-bootstrap
-
-
-.PHONY: all-stageb3g2-intl maybe-all-stageb3g2-intl
-.PHONY: clean-stageb3g2-intl maybe-clean-stageb3g2-intl
-maybe-all-stageb3g2-intl:
-maybe-clean-stageb3g2-intl:
-@if intl-bootstrap
-maybe-all-stageb3g2-intl: all-stageb3g2-intl
-all-stageb3g2: all-stageb3g2-intl
-TARGET-stageb3g2-intl = $(TARGET-intl)
-all-stageb3g2-intl: configure-stageb3g2-intl
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb3g2-intl)
-
-maybe-clean-stageb3g2-intl: clean-stageb3g2-intl
-clean-stageb3g2: clean-stageb3g2-intl
-clean-stageb3g2-intl:
-       @if [ $(current_stage) = stageb3g2 ]; then \
-         [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb3g2-intl/Makefile ] || exit 0; \
-         $(MAKE) stageb3g2-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
 
 
@@ -21517,14 +17210,20 @@ all-stage4-intl: configure-stage4-intl
        @[ $(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) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
        cd $(HOST_SUBDIR)/intl && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+               CFLAGS="$(STAGE4_CFLAGS)" \
+               CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               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-intl)
 
 maybe-clean-stage4-intl: clean-stage4-intl
@@ -21537,9 +17236,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
 
 
@@ -21555,14 +17252,20 @@ all-stageprofile-intl: configure-stageprofile-intl
        @[ $(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) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
        cd $(HOST_SUBDIR)/intl && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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-intl)
 
 maybe-clean-stageprofile-intl: clean-stageprofile-intl
@@ -21575,9 +17278,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
 
 
@@ -21593,14 +17294,20 @@ all-stagefeedback-intl: configure-stagefeedback-intl
        @[ $(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) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
        cd $(HOST_SUBDIR)/intl && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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-intl)
 
 maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
@@ -21613,9 +17320,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
 
 
@@ -21631,9 +17336,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
 
@@ -21652,6 +17357,21 @@ install-intl: installdirs
 
 @endif intl
 
+.PHONY: install-strip-intl maybe-install-strip-intl
+maybe-install-strip-intl:
+@if intl
+maybe-install-strip-intl: install-strip-intl
+
+install-strip-intl: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/intl && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif intl
+
 # Other targets (info, dvi, pdf, etc.)
 
 .PHONY: maybe-info-intl info-intl
@@ -21668,7 +17388,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}" \
@@ -21693,7 +17413,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}" \
@@ -21718,7 +17438,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}" \
@@ -21743,7 +17463,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}" \
@@ -21768,7 +17488,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}" \
@@ -21794,7 +17514,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}" \
@@ -21820,7 +17540,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}" \
@@ -21846,7 +17566,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}" \
@@ -21871,7 +17591,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}" \
@@ -21895,7 +17615,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}" \
@@ -21919,7 +17639,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}" \
@@ -21943,7 +17663,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}" \
@@ -21967,7 +17687,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}" \
@@ -21992,8 +17712,8 @@ 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 ; \
-       $(HOST_EXPORTS) \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tcl; \
+       $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/tcl; \
        cd "$(HOST_SUBDIR)/tcl" || exit 1; \
        case $(srcdir) in \
@@ -22001,11 +17721,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
 
@@ -22025,9 +17746,9 @@ all-tcl: configure-tcl
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(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
 
@@ -22043,7 +17764,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)
 
@@ -22064,6 +17785,21 @@ install-tcl: installdirs
 
 @endif tcl
 
+.PHONY: install-strip-tcl maybe-install-strip-tcl
+maybe-install-strip-tcl:
+@if tcl
+maybe-install-strip-tcl: install-strip-tcl
+
+install-strip-tcl: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/tcl && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif tcl
+
 # Other targets (info, dvi, pdf, etc.)
 
 .PHONY: maybe-info-tcl info-tcl
@@ -22081,7 +17817,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}" \
@@ -22107,7 +17843,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}" \
@@ -22133,7 +17869,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}" \
@@ -22159,7 +17895,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}" \
@@ -22185,575 +17921,150 @@ 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" ; \
-       (cd $(HOST_SUBDIR)/tcl && \
-         $(MAKE) $(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 tcl
-
-.PHONY: maybe-install-info-tcl install-info-tcl
-maybe-install-info-tcl:
-@if tcl
-maybe-install-info-tcl: install-info-tcl
-
-install-info-tcl: \
-    configure-tcl \
-    info-tcl 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tcl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 tcl" ; \
-       (cd $(HOST_SUBDIR)/tcl && \
-         $(MAKE) $(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 tcl
-
-.PHONY: maybe-install-pdf-tcl install-pdf-tcl
-maybe-install-pdf-tcl:
-@if tcl
-maybe-install-pdf-tcl: install-pdf-tcl
-
-install-pdf-tcl: \
-    configure-tcl \
-    pdf-tcl 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tcl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 tcl" ; \
-       (cd $(HOST_SUBDIR)/tcl && \
-         $(MAKE) $(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 tcl
-
-.PHONY: maybe-install-html-tcl install-html-tcl
-maybe-install-html-tcl:
-@if tcl
-maybe-install-html-tcl: install-html-tcl
-
-install-html-tcl: \
-    configure-tcl \
-    html-tcl 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tcl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 tcl" ; \
-       (cd $(HOST_SUBDIR)/tcl && \
-         $(MAKE) $(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 tcl
-
-.PHONY: maybe-installcheck-tcl installcheck-tcl
-maybe-installcheck-tcl:
-@if tcl
-maybe-installcheck-tcl: installcheck-tcl
-
-installcheck-tcl: \
-    configure-tcl 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tcl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 tcl" ; \
-       (cd $(HOST_SUBDIR)/tcl && \
-         $(MAKE) $(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 tcl
-
-.PHONY: maybe-mostlyclean-tcl mostlyclean-tcl
-maybe-mostlyclean-tcl:
-@if tcl
-maybe-mostlyclean-tcl: mostlyclean-tcl
-
-# tcl doesn't support mostlyclean.
-mostlyclean-tcl:
-
-@endif tcl
-
-.PHONY: maybe-clean-tcl clean-tcl
-maybe-clean-tcl:
-@if tcl
-maybe-clean-tcl: clean-tcl
-
-clean-tcl: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tcl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 tcl" ; \
-       (cd $(HOST_SUBDIR)/tcl && \
-         $(MAKE) $(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 tcl
-
-.PHONY: maybe-distclean-tcl distclean-tcl
-maybe-distclean-tcl:
-@if tcl
-maybe-distclean-tcl: distclean-tcl
-
-distclean-tcl: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tcl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 tcl" ; \
-       (cd $(HOST_SUBDIR)/tcl && \
-         $(MAKE) $(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 tcl
-
-.PHONY: maybe-maintainer-clean-tcl maintainer-clean-tcl
-maybe-maintainer-clean-tcl:
-@if tcl
-maybe-maintainer-clean-tcl: maintainer-clean-tcl
-
-maintainer-clean-tcl: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tcl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 tcl" ; \
-       (cd $(HOST_SUBDIR)/tcl && \
-         $(MAKE) $(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 tcl
-
-
-
-.PHONY: configure-itcl maybe-configure-itcl
-maybe-configure-itcl:
-@if gcc-bootstrap
-configure-itcl: stage_current
-@endif gcc-bootstrap
-@if itcl
-maybe-configure-itcl: configure-itcl
-configure-itcl: 
-       @: $(MAKE); $(unstage)
-       @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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/itcl; \
-       cd "$(HOST_SUBDIR)/itcl" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/itcl/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/itcl"; \
-       libsrcdir="$$s/itcl"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif itcl
-
-
-
-
-
-.PHONY: all-itcl maybe-all-itcl
-maybe-all-itcl:
-@if gcc-bootstrap
-all-itcl: stage_current
-@endif gcc-bootstrap
-@if itcl
-TARGET-itcl=all
-maybe-all-itcl: all-itcl
-all-itcl: configure-itcl
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/itcl && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-itcl))
-@endif itcl
-
-
-
-
-.PHONY: check-itcl maybe-check-itcl
-maybe-check-itcl:
-@if itcl
-maybe-check-itcl: check-itcl
-
-check-itcl:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/itcl && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif itcl
-
-.PHONY: install-itcl maybe-install-itcl
-maybe-install-itcl:
-@if itcl
-maybe-install-itcl: install-itcl
-
-install-itcl: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/itcl && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif itcl
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-itcl info-itcl
-maybe-info-itcl:
-@if itcl
-maybe-info-itcl: info-itcl
-
-info-itcl: \
-    configure-itcl 
-       @: $(MAKE); $(unstage)
-       @[ -f ./itcl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 itcl" ; \
-       (cd $(HOST_SUBDIR)/itcl && \
-         $(MAKE) $(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 itcl
-
-.PHONY: maybe-dvi-itcl dvi-itcl
-maybe-dvi-itcl:
-@if itcl
-maybe-dvi-itcl: dvi-itcl
-
-dvi-itcl: \
-    configure-itcl 
-       @: $(MAKE); $(unstage)
-       @[ -f ./itcl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 itcl" ; \
-       (cd $(HOST_SUBDIR)/itcl && \
-         $(MAKE) $(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 itcl
-
-.PHONY: maybe-pdf-itcl pdf-itcl
-maybe-pdf-itcl:
-@if itcl
-maybe-pdf-itcl: pdf-itcl
-
-pdf-itcl: \
-    configure-itcl 
-       @: $(MAKE); $(unstage)
-       @[ -f ./itcl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 itcl" ; \
-       (cd $(HOST_SUBDIR)/itcl && \
-         $(MAKE) $(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 itcl
-
-.PHONY: maybe-html-itcl html-itcl
-maybe-html-itcl:
-@if itcl
-maybe-html-itcl: html-itcl
-
-html-itcl: \
-    configure-itcl 
-       @: $(MAKE); $(unstage)
-       @[ -f ./itcl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 itcl" ; \
-       (cd $(HOST_SUBDIR)/itcl && \
-         $(MAKE) $(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 itcl
-
-.PHONY: maybe-TAGS-itcl TAGS-itcl
-maybe-TAGS-itcl:
-@if itcl
-maybe-TAGS-itcl: TAGS-itcl
-
-TAGS-itcl: \
-    configure-itcl 
-       @: $(MAKE); $(unstage)
-       @[ -f ./itcl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 itcl" ; \
-       (cd $(HOST_SUBDIR)/itcl && \
-         $(MAKE) $(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 itcl
-
-.PHONY: maybe-install-info-itcl install-info-itcl
-maybe-install-info-itcl:
-@if itcl
-maybe-install-info-itcl: install-info-itcl
-
-install-info-itcl: \
-    configure-itcl \
-    info-itcl 
-       @: $(MAKE); $(unstage)
-       @[ -f ./itcl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 itcl" ; \
-       (cd $(HOST_SUBDIR)/itcl && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-info) \
+                 TAGS) \
          || exit 1
 
-@endif itcl
+@endif tcl
 
-.PHONY: maybe-install-pdf-itcl install-pdf-itcl
-maybe-install-pdf-itcl:
-@if itcl
-maybe-install-pdf-itcl: install-pdf-itcl
+.PHONY: maybe-install-info-tcl install-info-tcl
+maybe-install-info-tcl:
+@if tcl
+maybe-install-info-tcl: install-info-tcl
 
-install-pdf-itcl: \
-    configure-itcl \
-    pdf-itcl 
+install-info-tcl: \
+    configure-tcl \
+    info-tcl 
        @: $(MAKE); $(unstage)
-       @[ -f ./itcl/Makefile ] || exit 0; \
+       @[ -f ./tcl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 itcl" ; \
-       (cd $(HOST_SUBDIR)/itcl && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-pdf) \
+                 install-info) \
          || exit 1
 
-@endif itcl
+@endif tcl
 
-.PHONY: maybe-install-html-itcl install-html-itcl
-maybe-install-html-itcl:
-@if itcl
-maybe-install-html-itcl: install-html-itcl
+.PHONY: maybe-install-pdf-tcl install-pdf-tcl
+maybe-install-pdf-tcl:
+@if tcl
+maybe-install-pdf-tcl: install-pdf-tcl
 
-install-html-itcl: \
-    configure-itcl \
-    html-itcl 
+install-pdf-tcl: \
+    configure-tcl \
+    pdf-tcl 
        @: $(MAKE); $(unstage)
-       @[ -f ./itcl/Makefile ] || exit 0; \
+       @[ -f ./tcl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 itcl" ; \
-       (cd $(HOST_SUBDIR)/itcl && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-html) \
+                 install-pdf) \
          || exit 1
 
-@endif itcl
+@endif tcl
 
-.PHONY: maybe-installcheck-itcl installcheck-itcl
-maybe-installcheck-itcl:
-@if itcl
-maybe-installcheck-itcl: installcheck-itcl
+.PHONY: maybe-install-html-tcl install-html-tcl
+maybe-install-html-tcl:
+@if tcl
+maybe-install-html-tcl: install-html-tcl
 
-installcheck-itcl: \
-    configure-itcl 
+install-html-tcl: \
+    configure-tcl \
+    html-tcl 
        @: $(MAKE); $(unstage)
-       @[ -f ./itcl/Makefile ] || exit 0; \
+       @[ -f ./tcl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 itcl" ; \
-       (cd $(HOST_SUBDIR)/itcl && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 installcheck) \
+                 install-html) \
          || exit 1
 
-@endif itcl
+@endif tcl
 
-.PHONY: maybe-mostlyclean-itcl mostlyclean-itcl
-maybe-mostlyclean-itcl:
-@if itcl
-maybe-mostlyclean-itcl: mostlyclean-itcl
+.PHONY: maybe-installcheck-tcl installcheck-tcl
+maybe-installcheck-tcl:
+@if tcl
+maybe-installcheck-tcl: installcheck-tcl
 
-mostlyclean-itcl: 
+installcheck-tcl: \
+    configure-tcl 
        @: $(MAKE); $(unstage)
-       @[ -f ./itcl/Makefile ] || exit 0; \
+       @[ -f ./tcl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 itcl" ; \
-       (cd $(HOST_SUBDIR)/itcl && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 mostlyclean) \
+                 installcheck) \
          || exit 1
 
-@endif itcl
+@endif tcl
 
-.PHONY: maybe-clean-itcl clean-itcl
-maybe-clean-itcl:
-@if itcl
-maybe-clean-itcl: clean-itcl
+.PHONY: maybe-mostlyclean-tcl mostlyclean-tcl
+maybe-mostlyclean-tcl:
+@if tcl
+maybe-mostlyclean-tcl: mostlyclean-tcl
 
-clean-itcl: 
+# tcl doesn't support mostlyclean.
+mostlyclean-tcl:
+
+@endif tcl
+
+.PHONY: maybe-clean-tcl clean-tcl
+maybe-clean-tcl:
+@if tcl
+maybe-clean-tcl: clean-tcl
+
+clean-tcl: 
        @: $(MAKE); $(unstage)
-       @[ -f ./itcl/Makefile ] || exit 0; \
+       @[ -f ./tcl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 itcl" ; \
-       (cd $(HOST_SUBDIR)/itcl && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -22761,24 +18072,24 @@ clean-itcl:
                  clean) \
          || exit 1
 
-@endif itcl
+@endif tcl
 
-.PHONY: maybe-distclean-itcl distclean-itcl
-maybe-distclean-itcl:
-@if itcl
-maybe-distclean-itcl: distclean-itcl
+.PHONY: maybe-distclean-tcl distclean-tcl
+maybe-distclean-tcl:
+@if tcl
+maybe-distclean-tcl: distclean-tcl
 
-distclean-itcl: 
+distclean-tcl: 
        @: $(MAKE); $(unstage)
-       @[ -f ./itcl/Makefile ] || exit 0; \
+       @[ -f ./tcl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 itcl" ; \
-       (cd $(HOST_SUBDIR)/itcl && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -22786,688 +18097,154 @@ distclean-itcl:
                  distclean) \
          || exit 1
 
-@endif itcl
+@endif tcl
 
-.PHONY: maybe-maintainer-clean-itcl maintainer-clean-itcl
-maybe-maintainer-clean-itcl:
-@if itcl
-maybe-maintainer-clean-itcl: maintainer-clean-itcl
+.PHONY: maybe-maintainer-clean-tcl maintainer-clean-tcl
+maybe-maintainer-clean-tcl:
+@if tcl
+maybe-maintainer-clean-tcl: maintainer-clean-tcl
 
-maintainer-clean-itcl: 
+maintainer-clean-tcl: 
        @: $(MAKE); $(unstage)
-       @[ -f ./itcl/Makefile ] || exit 0; \
+       @[ -f ./tcl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 itcl" ; \
-       (cd $(HOST_SUBDIR)/itcl && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 maintainer-clean) \
-         || exit 1
-
-@endif itcl
-
-
-
-.PHONY: configure-ld maybe-configure-ld
-maybe-configure-ld:
-@if gcc-bootstrap
-configure-ld: stage_current
-@endif gcc-bootstrap
-@if ld
-maybe-configure-ld: configure-ld
-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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif ld
-
-
-
-.PHONY: configure-stage1-ld maybe-configure-stage1-ld
-maybe-configure-stage1-ld:
-@if ld-bootstrap
-maybe-configure-stage1-ld: configure-stage1-ld
-configure-stage1-ld:
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-       $(HOST_EXPORTS)  \
-       CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-          \
-         --disable-intermodule $(STAGE1_CHECKING)        --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif ld-bootstrap
-
-.PHONY: configure-stage2-ld maybe-configure-stage2-ld
-maybe-configure-stage2-ld:
-@if ld-bootstrap
-maybe-configure-stage2-ld: configure-stage2-ld
-configure-stage2-ld:
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif ld-bootstrap
-
-.PHONY: configure-stageb2g0-ld maybe-configure-stageb2g0-ld
-maybe-configure-stageb2g0-ld:
-@if ld-bootstrap
-maybe-configure-stageb2g0-ld: configure-stageb2g0-ld
-configure-stageb2g0-ld:
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
-       echo Configuring stage b2g0 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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif ld-bootstrap
-
-.PHONY: configure-stage3-ld maybe-configure-stage3-ld
-maybe-configure-stage3-ld:
-@if ld-bootstrap
-maybe-configure-stage3-ld: configure-stage3-ld
-configure-stage3-ld:
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif ld-bootstrap
-
-.PHONY: configure-stageb3g2-ld maybe-configure-stageb3g2-ld
-maybe-configure-stageb3g2-ld:
-@if ld-bootstrap
-maybe-configure-stageb3g2-ld: configure-stageb3g2-ld
-configure-stageb3g2-ld:
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
-       echo Configuring stage b3g2 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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif ld-bootstrap
-
-.PHONY: configure-stage4-ld maybe-configure-stage4-ld
-maybe-configure-stage4-ld:
-@if ld-bootstrap
-maybe-configure-stage4-ld: configure-stage4-ld
-configure-stage4-ld:
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif ld-bootstrap
-
-.PHONY: configure-stageprofile-ld maybe-configure-stageprofile-ld
-maybe-configure-stageprofile-ld:
-@if ld-bootstrap
-maybe-configure-stageprofile-ld: configure-stageprofile-ld
-configure-stageprofile-ld:
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif ld-bootstrap
-
-.PHONY: configure-stagefeedback-ld maybe-configure-stagefeedback-ld
-maybe-configure-stagefeedback-ld:
-@if ld-bootstrap
-maybe-configure-stagefeedback-ld: configure-stagefeedback-ld
-configure-stagefeedback-ld:
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif ld-bootstrap
-
-
-
-
-
-.PHONY: all-ld maybe-all-ld
-maybe-all-ld:
-@if gcc-bootstrap
-all-ld: stage_current
-@endif gcc-bootstrap
-@if ld
-TARGET-ld=all
-maybe-all-ld: all-ld
-all-ld: configure-ld
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/ld && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-ld))
-@endif ld
-
-
-
-.PHONY: all-stage1-ld maybe-all-stage1-ld
-.PHONY: clean-stage1-ld maybe-clean-stage1-ld
-maybe-all-stage1-ld:
-maybe-clean-stage1-ld:
-@if ld-bootstrap
-maybe-all-stage1-ld: all-stage1-ld
-all-stage1: all-stage1-ld
-TARGET-stage1-ld = $(TARGET-ld)
-all-stage1-ld: configure-stage1-ld
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-               LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
-               $(TARGET-stage1-ld)
-
-maybe-clean-stage1-ld: clean-stage1-ld
-clean-stage1: clean-stage1-ld
-clean-stage1-ld:
-       @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage1-ld/Makefile ] || exit 0; \
-         $(MAKE) stage1-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
-@endif ld-bootstrap
-
-
-.PHONY: all-stage2-ld maybe-all-stage2-ld
-.PHONY: clean-stage2-ld maybe-clean-stage2-ld
-maybe-all-stage2-ld:
-maybe-clean-stage2-ld:
-@if ld-bootstrap
-maybe-all-stage2-ld: all-stage2-ld
-all-stage2: all-stage2-ld
-TARGET-stage2-ld = $(TARGET-ld)
-all-stage2-ld: configure-stage2-ld
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage2-ld)
-
-maybe-clean-stage2-ld: clean-stage2-ld
-clean-stage2: clean-stage2-ld
-clean-stage2-ld:
-       @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage2-ld/Makefile ] || exit 0; \
-         $(MAKE) stage2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif ld-bootstrap
-
-
-.PHONY: all-stageb2g0-ld maybe-all-stageb2g0-ld
-.PHONY: clean-stageb2g0-ld maybe-clean-stageb2g0-ld
-maybe-all-stageb2g0-ld:
-maybe-clean-stageb2g0-ld:
-@if ld-bootstrap
-maybe-all-stageb2g0-ld: all-stageb2g0-ld
-all-stageb2g0: all-stageb2g0-ld
-TARGET-stageb2g0-ld = $(TARGET-ld)
-all-stageb2g0-ld: configure-stageb2g0-ld
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb2g0-ld)
-
-maybe-clean-stageb2g0-ld: clean-stageb2g0-ld
-clean-stageb2g0: clean-stageb2g0-ld
-clean-stageb2g0-ld:
-       @if [ $(current_stage) = stageb2g0 ]; then \
-         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb2g0-ld/Makefile ] || exit 0; \
-         $(MAKE) stageb2g0-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif ld-bootstrap
-
-
-.PHONY: all-stage3-ld maybe-all-stage3-ld
-.PHONY: clean-stage3-ld maybe-clean-stage3-ld
-maybe-all-stage3-ld:
-maybe-clean-stage3-ld:
-@if ld-bootstrap
-maybe-all-stage3-ld: all-stage3-ld
-all-stage3: all-stage3-ld
-TARGET-stage3-ld = $(TARGET-ld)
-all-stage3-ld: configure-stage3-ld
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage3-ld)
-
-maybe-clean-stage3-ld: clean-stage3-ld
-clean-stage3: clean-stage3-ld
-clean-stage3-ld:
-       @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage3-ld/Makefile ] || exit 0; \
-         $(MAKE) stage3-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif ld-bootstrap
-
-
-.PHONY: all-stageb3g2-ld maybe-all-stageb3g2-ld
-.PHONY: clean-stageb3g2-ld maybe-clean-stageb3g2-ld
-maybe-all-stageb3g2-ld:
-maybe-clean-stageb3g2-ld:
-@if ld-bootstrap
-maybe-all-stageb3g2-ld: all-stageb3g2-ld
-all-stageb3g2: all-stageb3g2-ld
-TARGET-stageb3g2-ld = $(TARGET-ld)
-all-stageb3g2-ld: configure-stageb3g2-ld
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb3g2-ld)
-
-maybe-clean-stageb3g2-ld: clean-stageb3g2-ld
-clean-stageb3g2: clean-stageb3g2-ld
-clean-stageb3g2-ld:
-       @if [ $(current_stage) = stageb3g2 ]; then \
-         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb3g2-ld/Makefile ] || exit 0; \
-         $(MAKE) stageb3g2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif ld-bootstrap
-
-
-.PHONY: all-stage4-ld maybe-all-stage4-ld
-.PHONY: clean-stage4-ld maybe-clean-stage4-ld
-maybe-all-stage4-ld:
-maybe-clean-stage4-ld:
-@if ld-bootstrap
-maybe-all-stage4-ld: all-stage4-ld
-all-stage4: all-stage4-ld
-TARGET-stage4-ld = $(TARGET-ld)
-all-stage4-ld: configure-stage4-ld
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-               LIBCFLAGS="$(STAGE4_CFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage4-ld)
+                 maintainer-clean) \
+         || exit 1
 
-maybe-clean-stage4-ld: clean-stage4-ld
-clean-stage4: clean-stage4-ld
-clean-stage4-ld:
-       @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage4-ld/Makefile ] || exit 0; \
-         $(MAKE) stage4-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif ld-bootstrap
+@endif tcl
 
 
-.PHONY: all-stageprofile-ld maybe-all-stageprofile-ld
-.PHONY: clean-stageprofile-ld maybe-clean-stageprofile-ld
-maybe-all-stageprofile-ld:
-maybe-clean-stageprofile-ld:
-@if ld-bootstrap
-maybe-all-stageprofile-ld: all-stageprofile-ld
-all-stageprofile: all-stageprofile-ld
-TARGET-stageprofile-ld = $(TARGET-ld)
-all-stageprofile-ld: configure-stageprofile-ld
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+
+.PHONY: configure-itcl maybe-configure-itcl
+maybe-configure-itcl:
+@if gcc-bootstrap
+configure-itcl: stage_current
+@endif gcc-bootstrap
+@if itcl
+maybe-configure-itcl: configure-itcl
+configure-itcl: 
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageprofile-ld)
+       test ! -f $(HOST_SUBDIR)/itcl/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/itcl; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/itcl; \
+       cd "$(HOST_SUBDIR)/itcl" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/itcl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=itcl; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias}  \
+         || exit 1
+@endif itcl
 
-maybe-clean-stageprofile-ld: clean-stageprofile-ld
-clean-stageprofile: clean-stageprofile-ld
-clean-stageprofile-ld:
-       @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageprofile-ld/Makefile ] || exit 0; \
-         $(MAKE) stageprofile-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif ld-bootstrap
 
 
-.PHONY: all-stagefeedback-ld maybe-all-stagefeedback-ld
-.PHONY: clean-stagefeedback-ld maybe-clean-stagefeedback-ld
-maybe-all-stagefeedback-ld:
-maybe-clean-stagefeedback-ld:
-@if ld-bootstrap
-maybe-all-stagefeedback-ld: all-stagefeedback-ld
-all-stagefeedback: all-stagefeedback-ld
-TARGET-stagefeedback-ld = $(TARGET-ld)
-all-stagefeedback-ld: configure-stagefeedback-ld
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+
+
+.PHONY: all-itcl maybe-all-itcl
+maybe-all-itcl:
+@if gcc-bootstrap
+all-itcl: stage_current
+@endif gcc-bootstrap
+@if itcl
+TARGET-itcl=all
+maybe-all-itcl: all-itcl
+all-itcl: configure-itcl
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stagefeedback-ld)
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/itcl && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-itcl))
+@endif itcl
 
-maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
-clean-stagefeedback: clean-stagefeedback-ld
-clean-stagefeedback-ld:
-       @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-ld/Makefile ] || exit 0; \
-         $(MAKE) stagefeedback-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/ld && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif ld-bootstrap
 
 
 
+.PHONY: check-itcl maybe-check-itcl
+maybe-check-itcl:
+@if itcl
+maybe-check-itcl: check-itcl
 
+check-itcl:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/itcl && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
 
-.PHONY: check-ld maybe-check-ld
-maybe-check-ld:
-@if ld
-maybe-check-ld: check-ld
+@endif itcl
 
-check-ld:
+.PHONY: install-itcl maybe-install-itcl
+maybe-install-itcl:
+@if itcl
+maybe-install-itcl: install-itcl
+
+install-itcl: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/ld && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       (cd $(HOST_SUBDIR)/itcl && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif ld
+@endif itcl
 
-.PHONY: install-ld maybe-install-ld
-maybe-install-ld:
-@if ld
-maybe-install-ld: install-ld
+.PHONY: install-strip-itcl maybe-install-strip-itcl
+maybe-install-strip-itcl:
+@if itcl
+maybe-install-strip-itcl: install-strip-itcl
 
-install-ld: installdirs
+install-strip-itcl: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/ld && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+       (cd $(HOST_SUBDIR)/itcl && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif ld
+@endif itcl
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-ld info-ld
-maybe-info-ld:
-@if ld
-maybe-info-ld: info-ld
+.PHONY: maybe-info-itcl info-itcl
+maybe-info-itcl:
+@if itcl
+maybe-info-itcl: info-itcl
 
-info-ld: \
-    configure-ld 
-       @[ -f ./ld/Makefile ] || exit 0; \
+info-itcl: \
+    configure-itcl 
+       @: $(MAKE); $(unstage)
+       @[ -f ./itcl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -23475,24 +18252,25 @@ info-ld: \
                  info) \
          || exit 1
 
-@endif ld
+@endif itcl
 
-.PHONY: maybe-dvi-ld dvi-ld
-maybe-dvi-ld:
-@if ld
-maybe-dvi-ld: dvi-ld
+.PHONY: maybe-dvi-itcl dvi-itcl
+maybe-dvi-itcl:
+@if itcl
+maybe-dvi-itcl: dvi-itcl
 
-dvi-ld: \
-    configure-ld 
-       @[ -f ./ld/Makefile ] || exit 0; \
+dvi-itcl: \
+    configure-itcl 
+       @: $(MAKE); $(unstage)
+       @[ -f ./itcl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -23500,24 +18278,25 @@ dvi-ld: \
                  dvi) \
          || exit 1
 
-@endif ld
+@endif itcl
 
-.PHONY: maybe-pdf-ld pdf-ld
-maybe-pdf-ld:
-@if ld
-maybe-pdf-ld: pdf-ld
+.PHONY: maybe-pdf-itcl pdf-itcl
+maybe-pdf-itcl:
+@if itcl
+maybe-pdf-itcl: pdf-itcl
 
-pdf-ld: \
-    configure-ld 
-       @[ -f ./ld/Makefile ] || exit 0; \
+pdf-itcl: \
+    configure-itcl 
+       @: $(MAKE); $(unstage)
+       @[ -f ./itcl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -23525,24 +18304,25 @@ pdf-ld: \
                  pdf) \
          || exit 1
 
-@endif ld
+@endif itcl
 
-.PHONY: maybe-html-ld html-ld
-maybe-html-ld:
-@if ld
-maybe-html-ld: html-ld
+.PHONY: maybe-html-itcl html-itcl
+maybe-html-itcl:
+@if itcl
+maybe-html-itcl: html-itcl
 
-html-ld: \
-    configure-ld 
-       @[ -f ./ld/Makefile ] || exit 0; \
+html-itcl: \
+    configure-itcl 
+       @: $(MAKE); $(unstage)
+       @[ -f ./itcl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -23550,24 +18330,25 @@ html-ld: \
                  html) \
          || exit 1
 
-@endif ld
+@endif itcl
 
-.PHONY: maybe-TAGS-ld TAGS-ld
-maybe-TAGS-ld:
-@if ld
-maybe-TAGS-ld: TAGS-ld
+.PHONY: maybe-TAGS-itcl TAGS-itcl
+maybe-TAGS-itcl:
+@if itcl
+maybe-TAGS-itcl: TAGS-itcl
 
-TAGS-ld: \
-    configure-ld 
-       @[ -f ./ld/Makefile ] || exit 0; \
+TAGS-itcl: \
+    configure-itcl 
+       @: $(MAKE); $(unstage)
+       @[ -f ./itcl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -23575,25 +18356,26 @@ TAGS-ld: \
                  TAGS) \
          || exit 1
 
-@endif ld
+@endif itcl
 
-.PHONY: maybe-install-info-ld install-info-ld
-maybe-install-info-ld:
-@if ld
-maybe-install-info-ld: install-info-ld
+.PHONY: maybe-install-info-itcl install-info-itcl
+maybe-install-info-itcl:
+@if itcl
+maybe-install-info-itcl: install-info-itcl
 
-install-info-ld: \
-    configure-ld \
-    info-ld 
-       @[ -f ./ld/Makefile ] || exit 0; \
+install-info-itcl: \
+    configure-itcl \
+    info-itcl 
+       @: $(MAKE); $(unstage)
+       @[ -f ./itcl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -23601,25 +18383,26 @@ install-info-ld: \
                  install-info) \
          || exit 1
 
-@endif ld
+@endif itcl
 
-.PHONY: maybe-install-pdf-ld install-pdf-ld
-maybe-install-pdf-ld:
-@if ld
-maybe-install-pdf-ld: install-pdf-ld
+.PHONY: maybe-install-pdf-itcl install-pdf-itcl
+maybe-install-pdf-itcl:
+@if itcl
+maybe-install-pdf-itcl: install-pdf-itcl
 
-install-pdf-ld: \
-    configure-ld \
-    pdf-ld 
-       @[ -f ./ld/Makefile ] || exit 0; \
+install-pdf-itcl: \
+    configure-itcl \
+    pdf-itcl 
+       @: $(MAKE); $(unstage)
+       @[ -f ./itcl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -23627,25 +18410,26 @@ install-pdf-ld: \
                  install-pdf) \
          || exit 1
 
-@endif ld
+@endif itcl
 
-.PHONY: maybe-install-html-ld install-html-ld
-maybe-install-html-ld:
-@if ld
-maybe-install-html-ld: install-html-ld
+.PHONY: maybe-install-html-itcl install-html-itcl
+maybe-install-html-itcl:
+@if itcl
+maybe-install-html-itcl: install-html-itcl
 
-install-html-ld: \
-    configure-ld \
-    html-ld 
-       @[ -f ./ld/Makefile ] || exit 0; \
+install-html-itcl: \
+    configure-itcl \
+    html-itcl 
+       @: $(MAKE); $(unstage)
+       @[ -f ./itcl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -23653,24 +18437,25 @@ install-html-ld: \
                  install-html) \
          || exit 1
 
-@endif ld
+@endif itcl
 
-.PHONY: maybe-installcheck-ld installcheck-ld
-maybe-installcheck-ld:
-@if ld
-maybe-installcheck-ld: installcheck-ld
+.PHONY: maybe-installcheck-itcl installcheck-itcl
+maybe-installcheck-itcl:
+@if itcl
+maybe-installcheck-itcl: installcheck-itcl
 
-installcheck-ld: \
-    configure-ld 
-       @[ -f ./ld/Makefile ] || exit 0; \
+installcheck-itcl: \
+    configure-itcl 
+       @: $(MAKE); $(unstage)
+       @[ -f ./itcl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -23678,23 +18463,24 @@ installcheck-ld: \
                  installcheck) \
          || exit 1
 
-@endif ld
+@endif itcl
 
-.PHONY: maybe-mostlyclean-ld mostlyclean-ld
-maybe-mostlyclean-ld:
-@if ld
-maybe-mostlyclean-ld: mostlyclean-ld
+.PHONY: maybe-mostlyclean-itcl mostlyclean-itcl
+maybe-mostlyclean-itcl:
+@if itcl
+maybe-mostlyclean-itcl: mostlyclean-itcl
 
-mostlyclean-ld: 
-       @[ -f ./ld/Makefile ] || exit 0; \
+mostlyclean-itcl: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./itcl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -23702,23 +18488,24 @@ mostlyclean-ld:
                  mostlyclean) \
          || exit 1
 
-@endif ld
+@endif itcl
 
-.PHONY: maybe-clean-ld clean-ld
-maybe-clean-ld:
-@if ld
-maybe-clean-ld: clean-ld
+.PHONY: maybe-clean-itcl clean-itcl
+maybe-clean-itcl:
+@if itcl
+maybe-clean-itcl: clean-itcl
 
-clean-ld: 
-       @[ -f ./ld/Makefile ] || exit 0; \
+clean-itcl: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./itcl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -23726,23 +18513,24 @@ clean-ld:
                  clean) \
          || exit 1
 
-@endif ld
+@endif itcl
 
-.PHONY: maybe-distclean-ld distclean-ld
-maybe-distclean-ld:
-@if ld
-maybe-distclean-ld: distclean-ld
+.PHONY: maybe-distclean-itcl distclean-itcl
+maybe-distclean-itcl:
+@if itcl
+maybe-distclean-itcl: distclean-itcl
 
-distclean-ld: 
-       @[ -f ./ld/Makefile ] || exit 0; \
+distclean-itcl: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./itcl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -23750,23 +18538,24 @@ distclean-ld:
                  distclean) \
          || exit 1
 
-@endif ld
+@endif itcl
 
-.PHONY: maybe-maintainer-clean-ld maintainer-clean-ld
-maybe-maintainer-clean-ld:
-@if ld
-maybe-maintainer-clean-ld: maintainer-clean-ld
+.PHONY: maybe-maintainer-clean-itcl maintainer-clean-itcl
+maybe-maintainer-clean-itcl:
+@if itcl
+maybe-maintainer-clean-itcl: maintainer-clean-itcl
 
-maintainer-clean-ld: 
-       @[ -f ./ld/Makefile ] || exit 0; \
+maintainer-clean-itcl: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./itcl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -23774,663 +18563,580 @@ maintainer-clean-ld:
                  maintainer-clean) \
          || exit 1
 
-@endif ld
+@endif itcl
 
 
 
-.PHONY: configure-libcpp maybe-configure-libcpp
-maybe-configure-libcpp:
+.PHONY: configure-ld maybe-configure-ld
+maybe-configure-ld:
 @if gcc-bootstrap
-configure-libcpp: stage_current
+configure-ld: stage_current
 @endif gcc-bootstrap
-@if libcpp
-maybe-configure-libcpp: configure-libcpp
-configure-libcpp: 
+@if ld
+maybe-configure-ld: configure-ld
+configure-ld: 
        @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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/libcpp; \
-       cd "$(HOST_SUBDIR)/libcpp" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/ld; \
+       cd "$(HOST_SUBDIR)/ld" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(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 libcpp
+@endif ld
 
 
 
-.PHONY: configure-stage1-libcpp maybe-configure-stage1-libcpp
-maybe-configure-stage1-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stage1-libcpp: configure-stage1-libcpp
-configure-stage1-libcpp:
+.PHONY: configure-stage1-ld maybe-configure-stage1-ld
+maybe-configure-stage1-ld:
+@if ld-bootstrap
+maybe-configure-stage1-ld: configure-stage1-ld
+configure-stage1-ld:
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-       $(HOST_EXPORTS)  \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+       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)/libcpp/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(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} \
           \
-         --disable-intermodule $(STAGE1_CHECKING)        --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif libcpp-bootstrap
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif ld-bootstrap
 
-.PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp
-maybe-configure-stage2-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stage2-libcpp: configure-stage2-libcpp
-configure-stage2-libcpp:
+.PHONY: configure-stage2-ld maybe-configure-stage2-ld
+maybe-configure-stage2-ld:
+@if ld-bootstrap
+maybe-configure-stage2-ld: configure-stage2-ld
+configure-stage2-ld:
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif libcpp-bootstrap
-
-.PHONY: configure-stageb2g0-libcpp maybe-configure-stageb2g0-libcpp
-maybe-configure-stageb2g0-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stageb2g0-libcpp: configure-stageb2g0-libcpp
-configure-stageb2g0-libcpp:
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
-       echo Configuring stage b2g0 in $(HOST_SUBDIR)/libcpp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+       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)/libcpp/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(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_werror_flag@ 
-@endif libcpp-bootstrap
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif ld-bootstrap
 
-.PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp
-maybe-configure-stage3-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stage3-libcpp: configure-stage3-libcpp
-configure-stage3-libcpp:
+.PHONY: configure-stage3-ld maybe-configure-stage3-ld
+maybe-configure-stage3-ld:
+@if ld-bootstrap
+maybe-configure-stage3-ld: configure-stage3-ld
+configure-stage3-ld:
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif libcpp-bootstrap
-
-.PHONY: configure-stageb3g2-libcpp maybe-configure-stageb3g2-libcpp
-maybe-configure-stageb3g2-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stageb3g2-libcpp: configure-stageb3g2-libcpp
-configure-stageb3g2-libcpp:
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
-       echo Configuring stage b3g2 in $(HOST_SUBDIR)/libcpp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       $(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)/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)/libcpp/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(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_werror_flag@ 
-@endif libcpp-bootstrap
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif ld-bootstrap
 
-.PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp
-maybe-configure-stage4-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stage4-libcpp: configure-stage4-libcpp
-configure-stage4-libcpp:
+.PHONY: configure-stage4-ld maybe-configure-stage4-ld
+maybe-configure-stage4-ld:
+@if ld-bootstrap
+maybe-configure-stage4-ld: configure-stage4-ld
+configure-stage4-ld:
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/libcpp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+       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)/libcpp/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(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_werror_flag@ 
-@endif libcpp-bootstrap
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif ld-bootstrap
 
-.PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp
-maybe-configure-stageprofile-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp
-configure-stageprofile-libcpp:
+.PHONY: configure-stageprofile-ld maybe-configure-stageprofile-ld
+maybe-configure-stageprofile-ld:
+@if ld-bootstrap
+maybe-configure-stageprofile-ld: configure-stageprofile-ld
+configure-stageprofile-ld:
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/libcpp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       $(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)/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)/libcpp/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(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_werror_flag@ 
-@endif libcpp-bootstrap
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif ld-bootstrap
 
-.PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp
-maybe-configure-stagefeedback-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp
-configure-stagefeedback-libcpp:
+.PHONY: configure-stagefeedback-ld maybe-configure-stagefeedback-ld
+maybe-configure-stagefeedback-ld:
+@if ld-bootstrap
+maybe-configure-stagefeedback-ld: configure-stagefeedback-ld
+configure-stagefeedback-ld:
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/libcpp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-       cd $(HOST_SUBDIR)/libcpp || exit 1; \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/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)/libcpp/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(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_werror_flag@ 
-@endif libcpp-bootstrap
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif ld-bootstrap
 
 
 
 
 
-.PHONY: all-libcpp maybe-all-libcpp
-maybe-all-libcpp:
+.PHONY: all-ld maybe-all-ld
+maybe-all-ld:
 @if gcc-bootstrap
-all-libcpp: stage_current
+all-ld: stage_current
 @endif gcc-bootstrap
-@if libcpp
-TARGET-libcpp=all
-maybe-all-libcpp: all-libcpp
-all-libcpp: configure-libcpp
+@if ld
+TARGET-ld=all
+maybe-all-ld: all-ld
+all-ld: configure-ld
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libcpp && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-libcpp))
-@endif libcpp
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/ld && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-ld))
+@endif ld
 
 
 
-.PHONY: all-stage1-libcpp maybe-all-stage1-libcpp
-.PHONY: clean-stage1-libcpp maybe-clean-stage1-libcpp
-maybe-all-stage1-libcpp:
-maybe-clean-stage1-libcpp:
-@if libcpp-bootstrap
-maybe-all-stage1-libcpp: all-stage1-libcpp
-all-stage1: all-stage1-libcpp
-TARGET-stage1-libcpp = $(TARGET-libcpp)
-all-stage1-libcpp: configure-stage1-libcpp
+.PHONY: all-stage1-ld maybe-all-stage1-ld
+.PHONY: clean-stage1-ld maybe-clean-stage1-ld
+maybe-all-stage1-ld:
+maybe-clean-stage1-ld:
+@if ld-bootstrap
+maybe-all-stage1-ld: all-stage1-ld
+all-stage1: all-stage1-ld
+TARGET-stage1-ld = $(TARGET-ld)
+all-stage1-ld: configure-stage1-ld
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libcpp && \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/ld && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-               LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
-               $(TARGET-stage1-libcpp)
+               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-ld)
 
-maybe-clean-stage1-libcpp: clean-stage1-libcpp
-clean-stage1: clean-stage1-libcpp
-clean-stage1-libcpp:
+maybe-clean-stage1-ld: clean-stage1-ld
+clean-stage1: clean-stage1-ld
+clean-stage1-ld:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage1-libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage1-ld/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libcpp && \
+       cd $(HOST_SUBDIR)/ld && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
-@endif libcpp-bootstrap
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif ld-bootstrap
 
 
-.PHONY: all-stage2-libcpp maybe-all-stage2-libcpp
-.PHONY: clean-stage2-libcpp maybe-clean-stage2-libcpp
-maybe-all-stage2-libcpp:
-maybe-clean-stage2-libcpp:
-@if libcpp-bootstrap
-maybe-all-stage2-libcpp: all-stage2-libcpp
-all-stage2: all-stage2-libcpp
-TARGET-stage2-libcpp = $(TARGET-libcpp)
-all-stage2-libcpp: configure-stage2-libcpp
+.PHONY: all-stage2-ld maybe-all-stage2-ld
+.PHONY: clean-stage2-ld maybe-clean-stage2-ld
+maybe-all-stage2-ld:
+maybe-clean-stage2-ld:
+@if ld-bootstrap
+maybe-all-stage2-ld: all-stage2-ld
+all-stage2: all-stage2-ld
+TARGET-stage2-ld = $(TARGET-ld)
+all-stage2-ld: configure-stage2-ld
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libcpp && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/ld && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage2-libcpp)
+               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-ld)
 
-maybe-clean-stage2-libcpp: clean-stage2-libcpp
-clean-stage2: clean-stage2-libcpp
-clean-stage2-libcpp:
+maybe-clean-stage2-ld: clean-stage2-ld
+clean-stage2: clean-stage2-ld
+clean-stage2-ld:
        @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage2-libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage2-ld/Makefile ] || exit 0; \
          $(MAKE) stage2-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libcpp-bootstrap
-
-
-.PHONY: all-stageb2g0-libcpp maybe-all-stageb2g0-libcpp
-.PHONY: clean-stageb2g0-libcpp maybe-clean-stageb2g0-libcpp
-maybe-all-stageb2g0-libcpp:
-maybe-clean-stageb2g0-libcpp:
-@if libcpp-bootstrap
-maybe-all-stageb2g0-libcpp: all-stageb2g0-libcpp
-all-stageb2g0: all-stageb2g0-libcpp
-TARGET-stageb2g0-libcpp = $(TARGET-libcpp)
-all-stageb2g0-libcpp: configure-stageb2g0-libcpp
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb2g0-libcpp)
-
-maybe-clean-stageb2g0-libcpp: clean-stageb2g0-libcpp
-clean-stageb2g0: clean-stageb2g0-libcpp
-clean-stageb2g0-libcpp:
-       @if [ $(current_stage) = stageb2g0 ]; then \
-         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb2g0-libcpp/Makefile ] || exit 0; \
-         $(MAKE) stageb2g0-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libcpp-bootstrap
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif ld-bootstrap
 
 
-.PHONY: all-stage3-libcpp maybe-all-stage3-libcpp
-.PHONY: clean-stage3-libcpp maybe-clean-stage3-libcpp
-maybe-all-stage3-libcpp:
-maybe-clean-stage3-libcpp:
-@if libcpp-bootstrap
-maybe-all-stage3-libcpp: all-stage3-libcpp
-all-stage3: all-stage3-libcpp
-TARGET-stage3-libcpp = $(TARGET-libcpp)
-all-stage3-libcpp: configure-stage3-libcpp
+.PHONY: all-stage3-ld maybe-all-stage3-ld
+.PHONY: clean-stage3-ld maybe-clean-stage3-ld
+maybe-all-stage3-ld:
+maybe-clean-stage3-ld:
+@if ld-bootstrap
+maybe-all-stage3-ld: all-stage3-ld
+all-stage3: all-stage3-ld
+TARGET-stage3-ld = $(TARGET-ld)
+all-stage3-ld: configure-stage3-ld
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libcpp && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/ld && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage3-libcpp)
+               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-ld)
 
-maybe-clean-stage3-libcpp: clean-stage3-libcpp
-clean-stage3: clean-stage3-libcpp
-clean-stage3-libcpp:
+maybe-clean-stage3-ld: clean-stage3-ld
+clean-stage3: clean-stage3-ld
+clean-stage3-ld:
        @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage3-libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage3-ld/Makefile ] || exit 0; \
          $(MAKE) stage3-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libcpp-bootstrap
-
-
-.PHONY: all-stageb3g2-libcpp maybe-all-stageb3g2-libcpp
-.PHONY: clean-stageb3g2-libcpp maybe-clean-stageb3g2-libcpp
-maybe-all-stageb3g2-libcpp:
-maybe-clean-stageb3g2-libcpp:
-@if libcpp-bootstrap
-maybe-all-stageb3g2-libcpp: all-stageb3g2-libcpp
-all-stageb3g2: all-stageb3g2-libcpp
-TARGET-stageb3g2-libcpp = $(TARGET-libcpp)
-all-stageb3g2-libcpp: configure-stageb3g2-libcpp
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb3g2-libcpp)
-
-maybe-clean-stageb3g2-libcpp: clean-stageb3g2-libcpp
-clean-stageb3g2: clean-stageb3g2-libcpp
-clean-stageb3g2-libcpp:
-       @if [ $(current_stage) = stageb3g2 ]; then \
-         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb3g2-libcpp/Makefile ] || exit 0; \
-         $(MAKE) stageb3g2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libcpp-bootstrap
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif ld-bootstrap
 
 
-.PHONY: all-stage4-libcpp maybe-all-stage4-libcpp
-.PHONY: clean-stage4-libcpp maybe-clean-stage4-libcpp
-maybe-all-stage4-libcpp:
-maybe-clean-stage4-libcpp:
-@if libcpp-bootstrap
-maybe-all-stage4-libcpp: all-stage4-libcpp
-all-stage4: all-stage4-libcpp
-TARGET-stage4-libcpp = $(TARGET-libcpp)
-all-stage4-libcpp: configure-stage4-libcpp
+.PHONY: all-stage4-ld maybe-all-stage4-ld
+.PHONY: clean-stage4-ld maybe-clean-stage4-ld
+maybe-all-stage4-ld:
+maybe-clean-stage4-ld:
+@if ld-bootstrap
+maybe-all-stage4-ld: all-stage4-ld
+all-stage4: all-stage4-ld
+TARGET-stage4-ld = $(TARGET-ld)
+all-stage4-ld: configure-stage4-ld
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libcpp && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/ld && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+               CFLAGS="$(STAGE4_CFLAGS)" \
+               CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage4-libcpp)
+               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-ld)
 
-maybe-clean-stage4-libcpp: clean-stage4-libcpp
-clean-stage4: clean-stage4-libcpp
-clean-stage4-libcpp:
+maybe-clean-stage4-ld: clean-stage4-ld
+clean-stage4: clean-stage4-ld
+clean-stage4-ld:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage4-libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage4-ld/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libcpp-bootstrap
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif ld-bootstrap
 
 
-.PHONY: all-stageprofile-libcpp maybe-all-stageprofile-libcpp
-.PHONY: clean-stageprofile-libcpp maybe-clean-stageprofile-libcpp
-maybe-all-stageprofile-libcpp:
-maybe-clean-stageprofile-libcpp:
-@if libcpp-bootstrap
-maybe-all-stageprofile-libcpp: all-stageprofile-libcpp
-all-stageprofile: all-stageprofile-libcpp
-TARGET-stageprofile-libcpp = $(TARGET-libcpp)
-all-stageprofile-libcpp: configure-stageprofile-libcpp
+.PHONY: all-stageprofile-ld maybe-all-stageprofile-ld
+.PHONY: clean-stageprofile-ld maybe-clean-stageprofile-ld
+maybe-all-stageprofile-ld:
+maybe-clean-stageprofile-ld:
+@if ld-bootstrap
+maybe-all-stageprofile-ld: all-stageprofile-ld
+all-stageprofile: all-stageprofile-ld
+TARGET-stageprofile-ld = $(TARGET-ld)
+all-stageprofile-ld: configure-stageprofile-ld
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libcpp && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/ld && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageprofile-libcpp)
+               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-ld)
 
-maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
-clean-stageprofile: clean-stageprofile-libcpp
-clean-stageprofile-libcpp:
+maybe-clean-stageprofile-ld: clean-stageprofile-ld
+clean-stageprofile: clean-stageprofile-ld
+clean-stageprofile-ld:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stageprofile-libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageprofile-ld/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libcpp-bootstrap
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif ld-bootstrap
 
 
-.PHONY: all-stagefeedback-libcpp maybe-all-stagefeedback-libcpp
-.PHONY: clean-stagefeedback-libcpp maybe-clean-stagefeedback-libcpp
-maybe-all-stagefeedback-libcpp:
-maybe-clean-stagefeedback-libcpp:
-@if libcpp-bootstrap
-maybe-all-stagefeedback-libcpp: all-stagefeedback-libcpp
-all-stagefeedback: all-stagefeedback-libcpp
-TARGET-stagefeedback-libcpp = $(TARGET-libcpp)
-all-stagefeedback-libcpp: configure-stagefeedback-libcpp
+.PHONY: all-stagefeedback-ld maybe-all-stagefeedback-ld
+.PHONY: clean-stagefeedback-ld maybe-clean-stagefeedback-ld
+maybe-all-stagefeedback-ld:
+maybe-clean-stagefeedback-ld:
+@if ld-bootstrap
+maybe-all-stagefeedback-ld: all-stagefeedback-ld
+all-stagefeedback: all-stagefeedback-ld
+TARGET-stagefeedback-ld = $(TARGET-ld)
+all-stagefeedback-ld: configure-stagefeedback-ld
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libcpp && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/ld && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stagefeedback-libcpp)
+               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-ld)
 
-maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
-clean-stagefeedback: clean-stagefeedback-libcpp
-clean-stagefeedback-libcpp:
+maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
+clean-stagefeedback: clean-stagefeedback-ld
+clean-stagefeedback-ld:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-libcpp/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stagefeedback-ld/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libcpp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libcpp-bootstrap
+       cd $(HOST_SUBDIR)/ld && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif ld-bootstrap
 
 
 
 
 
-.PHONY: check-libcpp maybe-check-libcpp
-maybe-check-libcpp:
-@if libcpp
-maybe-check-libcpp: check-libcpp
+.PHONY: check-ld maybe-check-ld
+maybe-check-ld:
+@if ld
+maybe-check-ld: check-ld
 
-check-libcpp:
+check-ld:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libcpp && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/ld && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
-@endif libcpp
+@endif ld
 
-.PHONY: install-libcpp maybe-install-libcpp
-maybe-install-libcpp:
-@if libcpp
-maybe-install-libcpp: install-libcpp
+.PHONY: install-ld maybe-install-ld
+maybe-install-ld:
+@if ld
+maybe-install-ld: install-ld
 
-install-libcpp: installdirs
+install-ld: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif libcpp
+@endif ld
+
+.PHONY: install-strip-ld maybe-install-strip-ld
+maybe-install-strip-ld:
+@if ld
+maybe-install-strip-ld: install-strip-ld
+
+install-strip-ld: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/ld && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif ld
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-libcpp info-libcpp
-maybe-info-libcpp:
-@if libcpp
-maybe-info-libcpp: info-libcpp
+.PHONY: maybe-info-ld info-ld
+maybe-info-ld:
+@if ld
+maybe-info-ld: info-ld
 
-info-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+info-ld: \
+    configure-ld 
+       @[ -f ./ld/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing info in ld"; \
+       (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24438,24 +19144,24 @@ info-libcpp: \
                  info) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
-.PHONY: maybe-dvi-libcpp dvi-libcpp
-maybe-dvi-libcpp:
-@if libcpp
-maybe-dvi-libcpp: dvi-libcpp
+.PHONY: maybe-dvi-ld dvi-ld
+maybe-dvi-ld:
+@if ld
+maybe-dvi-ld: dvi-ld
 
-dvi-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+dvi-ld: \
+    configure-ld 
+       @[ -f ./ld/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing dvi in ld"; \
+       (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24463,24 +19169,24 @@ dvi-libcpp: \
                  dvi) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
-.PHONY: maybe-pdf-libcpp pdf-libcpp
-maybe-pdf-libcpp:
-@if libcpp
-maybe-pdf-libcpp: pdf-libcpp
+.PHONY: maybe-pdf-ld pdf-ld
+maybe-pdf-ld:
+@if ld
+maybe-pdf-ld: pdf-ld
 
-pdf-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+pdf-ld: \
+    configure-ld 
+       @[ -f ./ld/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing pdf in ld"; \
+       (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24488,24 +19194,24 @@ pdf-libcpp: \
                  pdf) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
-.PHONY: maybe-html-libcpp html-libcpp
-maybe-html-libcpp:
-@if libcpp
-maybe-html-libcpp: html-libcpp
+.PHONY: maybe-html-ld html-ld
+maybe-html-ld:
+@if ld
+maybe-html-ld: html-ld
 
-html-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+html-ld: \
+    configure-ld 
+       @[ -f ./ld/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing html in ld"; \
+       (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24513,24 +19219,24 @@ html-libcpp: \
                  html) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
-.PHONY: maybe-TAGS-libcpp TAGS-libcpp
-maybe-TAGS-libcpp:
-@if libcpp
-maybe-TAGS-libcpp: TAGS-libcpp
+.PHONY: maybe-TAGS-ld TAGS-ld
+maybe-TAGS-ld:
+@if ld
+maybe-TAGS-ld: TAGS-ld
 
-TAGS-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+TAGS-ld: \
+    configure-ld 
+       @[ -f ./ld/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing TAGS in ld"; \
+       (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24538,25 +19244,25 @@ TAGS-libcpp: \
                  TAGS) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
-.PHONY: maybe-install-info-libcpp install-info-libcpp
-maybe-install-info-libcpp:
-@if libcpp
-maybe-install-info-libcpp: install-info-libcpp
+.PHONY: maybe-install-info-ld install-info-ld
+maybe-install-info-ld:
+@if ld
+maybe-install-info-ld: install-info-ld
 
-install-info-libcpp: \
-    configure-libcpp \
-    info-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+install-info-ld: \
+    configure-ld \
+    info-ld 
+       @[ -f ./ld/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing install-info in ld"; \
+       (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24564,25 +19270,25 @@ install-info-libcpp: \
                  install-info) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
-.PHONY: maybe-install-pdf-libcpp install-pdf-libcpp
-maybe-install-pdf-libcpp:
-@if libcpp
-maybe-install-pdf-libcpp: install-pdf-libcpp
+.PHONY: maybe-install-pdf-ld install-pdf-ld
+maybe-install-pdf-ld:
+@if ld
+maybe-install-pdf-ld: install-pdf-ld
 
-install-pdf-libcpp: \
-    configure-libcpp \
-    pdf-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+install-pdf-ld: \
+    configure-ld \
+    pdf-ld 
+       @[ -f ./ld/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing install-pdf in ld"; \
+       (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24590,25 +19296,25 @@ install-pdf-libcpp: \
                  install-pdf) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
-.PHONY: maybe-install-html-libcpp install-html-libcpp
-maybe-install-html-libcpp:
-@if libcpp
-maybe-install-html-libcpp: install-html-libcpp
+.PHONY: maybe-install-html-ld install-html-ld
+maybe-install-html-ld:
+@if ld
+maybe-install-html-ld: install-html-ld
 
-install-html-libcpp: \
-    configure-libcpp \
-    html-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+install-html-ld: \
+    configure-ld \
+    html-ld 
+       @[ -f ./ld/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing install-html in ld"; \
+       (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24616,24 +19322,24 @@ install-html-libcpp: \
                  install-html) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
-.PHONY: maybe-installcheck-libcpp installcheck-libcpp
-maybe-installcheck-libcpp:
-@if libcpp
-maybe-installcheck-libcpp: installcheck-libcpp
+.PHONY: maybe-installcheck-ld installcheck-ld
+maybe-installcheck-ld:
+@if ld
+maybe-installcheck-ld: installcheck-ld
 
-installcheck-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+installcheck-ld: \
+    configure-ld 
+       @[ -f ./ld/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing installcheck in ld"; \
+       (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24641,23 +19347,23 @@ installcheck-libcpp: \
                  installcheck) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
-.PHONY: maybe-mostlyclean-libcpp mostlyclean-libcpp
-maybe-mostlyclean-libcpp:
-@if libcpp
-maybe-mostlyclean-libcpp: mostlyclean-libcpp
+.PHONY: maybe-mostlyclean-ld mostlyclean-ld
+maybe-mostlyclean-ld:
+@if ld
+maybe-mostlyclean-ld: mostlyclean-ld
 
-mostlyclean-libcpp: 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+mostlyclean-ld: 
+       @[ -f ./ld/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing mostlyclean in ld"; \
+       (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24665,23 +19371,23 @@ mostlyclean-libcpp:
                  mostlyclean) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
-.PHONY: maybe-clean-libcpp clean-libcpp
-maybe-clean-libcpp:
-@if libcpp
-maybe-clean-libcpp: clean-libcpp
+.PHONY: maybe-clean-ld clean-ld
+maybe-clean-ld:
+@if ld
+maybe-clean-ld: clean-ld
 
-clean-libcpp: 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+clean-ld: 
+       @[ -f ./ld/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing clean in ld"; \
+       (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24689,23 +19395,23 @@ clean-libcpp:
                  clean) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
-.PHONY: maybe-distclean-libcpp distclean-libcpp
-maybe-distclean-libcpp:
-@if libcpp
-maybe-distclean-libcpp: distclean-libcpp
+.PHONY: maybe-distclean-ld distclean-ld
+maybe-distclean-ld:
+@if ld
+maybe-distclean-ld: distclean-ld
 
-distclean-libcpp: 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+distclean-ld: 
+       @[ -f ./ld/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing distclean in ld"; \
+       (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24713,23 +19419,23 @@ distclean-libcpp:
                  distclean) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
-.PHONY: maybe-maintainer-clean-libcpp maintainer-clean-libcpp
-maybe-maintainer-clean-libcpp:
-@if libcpp
-maybe-maintainer-clean-libcpp: maintainer-clean-libcpp
+.PHONY: maybe-maintainer-clean-ld maintainer-clean-ld
+maybe-maintainer-clean-ld:
+@if ld
+maybe-maintainer-clean-ld: maintainer-clean-ld
 
-maintainer-clean-libcpp: 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+maintainer-clean-ld: 
+       @[ -f ./ld/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       echo "Doing maintainer-clean in ld"; \
+       (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -24737,663 +19443,580 @@ maintainer-clean-libcpp:
                  maintainer-clean) \
          || exit 1
 
-@endif libcpp
+@endif ld
 
 
 
-.PHONY: configure-libdecnumber maybe-configure-libdecnumber
-maybe-configure-libdecnumber:
+.PHONY: configure-libbacktrace maybe-configure-libbacktrace
+maybe-configure-libbacktrace:
 @if gcc-bootstrap
-configure-libdecnumber: stage_current
+configure-libbacktrace: stage_current
 @endif gcc-bootstrap
-@if libdecnumber
-maybe-configure-libdecnumber: configure-libdecnumber
-configure-libdecnumber: 
+@if libbacktrace
+maybe-configure-libbacktrace: configure-libbacktrace
+configure-libbacktrace: 
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/libdecnumber; \
-       cd "$(HOST_SUBDIR)/libdecnumber" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/libbacktrace/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/libbacktrace; \
+       cd "$(HOST_SUBDIR)/libbacktrace" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
-       $(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 libdecnumber
+@endif libbacktrace
 
 
 
-.PHONY: configure-stage1-libdecnumber maybe-configure-stage1-libdecnumber
-maybe-configure-stage1-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stage1-libdecnumber: configure-stage1-libdecnumber
-configure-stage1-libdecnumber:
+.PHONY: configure-stage1-libbacktrace maybe-configure-stage1-libbacktrace
+maybe-configure-stage1-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-configure-stage1-libbacktrace: configure-stage1-libbacktrace
+configure-stage1-libbacktrace:
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-       $(HOST_EXPORTS)  \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libbacktrace/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+       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)/libdecnumber/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
-       $(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} \
           \
-         --disable-intermodule $(STAGE1_CHECKING)        --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif libdecnumber-bootstrap
-
-.PHONY: configure-stage2-libdecnumber maybe-configure-stage2-libdecnumber
-maybe-configure-stage2-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stage2-libdecnumber: configure-stage2-libdecnumber
-configure-stage2-libdecnumber:
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif libbacktrace-bootstrap
+
+.PHONY: configure-stage2-libbacktrace maybe-configure-stage2-libbacktrace
+maybe-configure-stage2-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-configure-stage2-libbacktrace: configure-stage2-libbacktrace
+configure-stage2-libbacktrace:
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libbacktrace/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif libdecnumber-bootstrap
-
-.PHONY: configure-stageb2g0-libdecnumber maybe-configure-stageb2g0-libdecnumber
-maybe-configure-stageb2g0-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stageb2g0-libdecnumber: configure-stageb2g0-libdecnumber
-configure-stageb2g0-libdecnumber:
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
-       echo Configuring stage b2g0 in $(HOST_SUBDIR)/libdecnumber ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+       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)/libdecnumber/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
-       $(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_werror_flag@ 
-@endif libdecnumber-bootstrap
-
-.PHONY: configure-stage3-libdecnumber maybe-configure-stage3-libdecnumber
-maybe-configure-stage3-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stage3-libdecnumber: configure-stage3-libdecnumber
-configure-stage3-libdecnumber:
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif libbacktrace-bootstrap
+
+.PHONY: configure-stage3-libbacktrace maybe-configure-stage3-libbacktrace
+maybe-configure-stage3-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-configure-stage3-libbacktrace: configure-stage3-libbacktrace
+configure-stage3-libbacktrace:
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libbacktrace/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif libdecnumber-bootstrap
-
-.PHONY: configure-stageb3g2-libdecnumber maybe-configure-stageb3g2-libdecnumber
-maybe-configure-stageb3g2-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stageb3g2-libdecnumber: configure-stageb3g2-libdecnumber
-configure-stageb3g2-libdecnumber:
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
-       echo Configuring stage b3g2 in $(HOST_SUBDIR)/libdecnumber ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+       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)/libdecnumber/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
-       $(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_werror_flag@ 
-@endif libdecnumber-bootstrap
-
-.PHONY: configure-stage4-libdecnumber maybe-configure-stage4-libdecnumber
-maybe-configure-stage4-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stage4-libdecnumber: configure-stage4-libdecnumber
-configure-stage4-libdecnumber:
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif libbacktrace-bootstrap
+
+.PHONY: configure-stage4-libbacktrace maybe-configure-stage4-libbacktrace
+maybe-configure-stage4-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-configure-stage4-libbacktrace: configure-stage4-libbacktrace
+configure-stage4-libbacktrace:
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libbacktrace/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/libdecnumber ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+       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)/libdecnumber/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
-       $(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_werror_flag@ 
-@endif libdecnumber-bootstrap
-
-.PHONY: configure-stageprofile-libdecnumber maybe-configure-stageprofile-libdecnumber
-maybe-configure-stageprofile-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
-configure-stageprofile-libdecnumber:
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif libbacktrace-bootstrap
+
+.PHONY: configure-stageprofile-libbacktrace maybe-configure-stageprofile-libbacktrace
+maybe-configure-stageprofile-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-configure-stageprofile-libbacktrace: configure-stageprofile-libbacktrace
+configure-stageprofile-libbacktrace:
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libbacktrace/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/libdecnumber ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       $(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)/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)/libdecnumber/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
-       $(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_werror_flag@ 
-@endif libdecnumber-bootstrap
-
-.PHONY: configure-stagefeedback-libdecnumber maybe-configure-stagefeedback-libdecnumber
-maybe-configure-stagefeedback-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
-configure-stagefeedback-libdecnumber:
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif libbacktrace-bootstrap
+
+.PHONY: configure-stagefeedback-libbacktrace maybe-configure-stagefeedback-libbacktrace
+maybe-configure-stagefeedback-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-configure-stagefeedback-libbacktrace: configure-stagefeedback-libbacktrace
+configure-stagefeedback-libbacktrace:
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libbacktrace/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/libdecnumber ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/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)/libdecnumber/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
-       $(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_werror_flag@ 
-@endif libdecnumber-bootstrap
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif libbacktrace-bootstrap
 
 
 
 
 
-.PHONY: all-libdecnumber maybe-all-libdecnumber
-maybe-all-libdecnumber:
+.PHONY: all-libbacktrace maybe-all-libbacktrace
+maybe-all-libbacktrace:
 @if gcc-bootstrap
-all-libdecnumber: stage_current
+all-libbacktrace: stage_current
 @endif gcc-bootstrap
-@if libdecnumber
-TARGET-libdecnumber=all
-maybe-all-libdecnumber: all-libdecnumber
-all-libdecnumber: configure-libdecnumber
+@if libbacktrace
+TARGET-libbacktrace=all
+maybe-all-libbacktrace: all-libbacktrace
+all-libbacktrace: configure-libbacktrace
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-libdecnumber))
-@endif libdecnumber
-
-
-
-.PHONY: all-stage1-libdecnumber maybe-all-stage1-libdecnumber
-.PHONY: clean-stage1-libdecnumber maybe-clean-stage1-libdecnumber
-maybe-all-stage1-libdecnumber:
-maybe-clean-stage1-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stage1-libdecnumber: all-stage1-libdecnumber
-all-stage1: all-stage1-libdecnumber
-TARGET-stage1-libdecnumber = $(TARGET-libdecnumber)
-all-stage1-libdecnumber: configure-stage1-libdecnumber
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-libbacktrace))
+@endif libbacktrace
+
+
+
+.PHONY: all-stage1-libbacktrace maybe-all-stage1-libbacktrace
+.PHONY: clean-stage1-libbacktrace maybe-clean-stage1-libbacktrace
+maybe-all-stage1-libbacktrace:
+maybe-clean-stage1-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-all-stage1-libbacktrace: all-stage1-libbacktrace
+all-stage1: all-stage1-libbacktrace
+TARGET-stage1-libbacktrace = $(TARGET-libbacktrace)
+all-stage1-libbacktrace: configure-stage1-libbacktrace
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libdecnumber && \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libbacktrace && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-               LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
-               $(TARGET-stage1-libdecnumber)
-
-maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber
-clean-stage1: clean-stage1-libdecnumber
-clean-stage1-libdecnumber:
+               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-libbacktrace)
+
+maybe-clean-stage1-libbacktrace: clean-stage1-libbacktrace
+clean-stage1: clean-stage1-libbacktrace
+clean-stage1-libbacktrace:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage1-libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage1-libbacktrace/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libdecnumber && \
+       cd $(HOST_SUBDIR)/libbacktrace && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
-@endif libdecnumber-bootstrap
-
-
-.PHONY: all-stage2-libdecnumber maybe-all-stage2-libdecnumber
-.PHONY: clean-stage2-libdecnumber maybe-clean-stage2-libdecnumber
-maybe-all-stage2-libdecnumber:
-maybe-clean-stage2-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stage2-libdecnumber: all-stage2-libdecnumber
-all-stage2: all-stage2-libdecnumber
-TARGET-stage2-libdecnumber = $(TARGET-libdecnumber)
-all-stage2-libdecnumber: configure-stage2-libdecnumber
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif libbacktrace-bootstrap
+
+
+.PHONY: all-stage2-libbacktrace maybe-all-stage2-libbacktrace
+.PHONY: clean-stage2-libbacktrace maybe-clean-stage2-libbacktrace
+maybe-all-stage2-libbacktrace:
+maybe-clean-stage2-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-all-stage2-libbacktrace: all-stage2-libbacktrace
+all-stage2: all-stage2-libbacktrace
+TARGET-stage2-libbacktrace = $(TARGET-libbacktrace)
+all-stage2-libbacktrace: configure-stage2-libbacktrace
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libbacktrace && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage2-libdecnumber)
-
-maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber
-clean-stage2: clean-stage2-libdecnumber
-clean-stage2-libdecnumber:
+               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-libbacktrace)
+
+maybe-clean-stage2-libbacktrace: clean-stage2-libbacktrace
+clean-stage2: clean-stage2-libbacktrace
+clean-stage2-libbacktrace:
        @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage2-libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage2-libbacktrace/Makefile ] || exit 0; \
          $(MAKE) stage2-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libdecnumber-bootstrap
-
-
-.PHONY: all-stageb2g0-libdecnumber maybe-all-stageb2g0-libdecnumber
-.PHONY: clean-stageb2g0-libdecnumber maybe-clean-stageb2g0-libdecnumber
-maybe-all-stageb2g0-libdecnumber:
-maybe-clean-stageb2g0-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stageb2g0-libdecnumber: all-stageb2g0-libdecnumber
-all-stageb2g0: all-stageb2g0-libdecnumber
-TARGET-stageb2g0-libdecnumber = $(TARGET-libdecnumber)
-all-stageb2g0-libdecnumber: configure-stageb2g0-libdecnumber
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb2g0-libdecnumber)
-
-maybe-clean-stageb2g0-libdecnumber: clean-stageb2g0-libdecnumber
-clean-stageb2g0: clean-stageb2g0-libdecnumber
-clean-stageb2g0-libdecnumber:
-       @if [ $(current_stage) = stageb2g0 ]; then \
-         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb2g0-libdecnumber/Makefile ] || exit 0; \
-         $(MAKE) stageb2g0-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libdecnumber-bootstrap
-
-
-.PHONY: all-stage3-libdecnumber maybe-all-stage3-libdecnumber
-.PHONY: clean-stage3-libdecnumber maybe-clean-stage3-libdecnumber
-maybe-all-stage3-libdecnumber:
-maybe-clean-stage3-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stage3-libdecnumber: all-stage3-libdecnumber
-all-stage3: all-stage3-libdecnumber
-TARGET-stage3-libdecnumber = $(TARGET-libdecnumber)
-all-stage3-libdecnumber: configure-stage3-libdecnumber
+       cd $(HOST_SUBDIR)/libbacktrace && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libbacktrace-bootstrap
+
+
+.PHONY: all-stage3-libbacktrace maybe-all-stage3-libbacktrace
+.PHONY: clean-stage3-libbacktrace maybe-clean-stage3-libbacktrace
+maybe-all-stage3-libbacktrace:
+maybe-clean-stage3-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-all-stage3-libbacktrace: all-stage3-libbacktrace
+all-stage3: all-stage3-libbacktrace
+TARGET-stage3-libbacktrace = $(TARGET-libbacktrace)
+all-stage3-libbacktrace: configure-stage3-libbacktrace
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libbacktrace && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage3-libdecnumber)
-
-maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber
-clean-stage3: clean-stage3-libdecnumber
-clean-stage3-libdecnumber:
+               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-libbacktrace)
+
+maybe-clean-stage3-libbacktrace: clean-stage3-libbacktrace
+clean-stage3: clean-stage3-libbacktrace
+clean-stage3-libbacktrace:
        @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage3-libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage3-libbacktrace/Makefile ] || exit 0; \
          $(MAKE) stage3-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libdecnumber-bootstrap
-
-
-.PHONY: all-stageb3g2-libdecnumber maybe-all-stageb3g2-libdecnumber
-.PHONY: clean-stageb3g2-libdecnumber maybe-clean-stageb3g2-libdecnumber
-maybe-all-stageb3g2-libdecnumber:
-maybe-clean-stageb3g2-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stageb3g2-libdecnumber: all-stageb3g2-libdecnumber
-all-stageb3g2: all-stageb3g2-libdecnumber
-TARGET-stageb3g2-libdecnumber = $(TARGET-libdecnumber)
-all-stageb3g2-libdecnumber: configure-stageb3g2-libdecnumber
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb3g2-libdecnumber)
-
-maybe-clean-stageb3g2-libdecnumber: clean-stageb3g2-libdecnumber
-clean-stageb3g2: clean-stageb3g2-libdecnumber
-clean-stageb3g2-libdecnumber:
-       @if [ $(current_stage) = stageb3g2 ]; then \
-         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb3g2-libdecnumber/Makefile ] || exit 0; \
-         $(MAKE) stageb3g2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libdecnumber-bootstrap
-
-
-.PHONY: all-stage4-libdecnumber maybe-all-stage4-libdecnumber
-.PHONY: clean-stage4-libdecnumber maybe-clean-stage4-libdecnumber
-maybe-all-stage4-libdecnumber:
-maybe-clean-stage4-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stage4-libdecnumber: all-stage4-libdecnumber
-all-stage4: all-stage4-libdecnumber
-TARGET-stage4-libdecnumber = $(TARGET-libdecnumber)
-all-stage4-libdecnumber: configure-stage4-libdecnumber
+       cd $(HOST_SUBDIR)/libbacktrace && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libbacktrace-bootstrap
+
+
+.PHONY: all-stage4-libbacktrace maybe-all-stage4-libbacktrace
+.PHONY: clean-stage4-libbacktrace maybe-clean-stage4-libbacktrace
+maybe-all-stage4-libbacktrace:
+maybe-clean-stage4-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-all-stage4-libbacktrace: all-stage4-libbacktrace
+all-stage4: all-stage4-libbacktrace
+TARGET-stage4-libbacktrace = $(TARGET-libbacktrace)
+all-stage4-libbacktrace: configure-stage4-libbacktrace
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libbacktrace && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+               CFLAGS="$(STAGE4_CFLAGS)" \
+               CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage4-libdecnumber)
-
-maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber
-clean-stage4: clean-stage4-libdecnumber
-clean-stage4-libdecnumber:
+               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-libbacktrace)
+
+maybe-clean-stage4-libbacktrace: clean-stage4-libbacktrace
+clean-stage4: clean-stage4-libbacktrace
+clean-stage4-libbacktrace:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage4-libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage4-libbacktrace/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libdecnumber-bootstrap
-
-
-.PHONY: all-stageprofile-libdecnumber maybe-all-stageprofile-libdecnumber
-.PHONY: clean-stageprofile-libdecnumber maybe-clean-stageprofile-libdecnumber
-maybe-all-stageprofile-libdecnumber:
-maybe-clean-stageprofile-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stageprofile-libdecnumber: all-stageprofile-libdecnumber
-all-stageprofile: all-stageprofile-libdecnumber
-TARGET-stageprofile-libdecnumber = $(TARGET-libdecnumber)
-all-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
+       cd $(HOST_SUBDIR)/libbacktrace && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libbacktrace-bootstrap
+
+
+.PHONY: all-stageprofile-libbacktrace maybe-all-stageprofile-libbacktrace
+.PHONY: clean-stageprofile-libbacktrace maybe-clean-stageprofile-libbacktrace
+maybe-all-stageprofile-libbacktrace:
+maybe-clean-stageprofile-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-all-stageprofile-libbacktrace: all-stageprofile-libbacktrace
+all-stageprofile: all-stageprofile-libbacktrace
+TARGET-stageprofile-libbacktrace = $(TARGET-libbacktrace)
+all-stageprofile-libbacktrace: configure-stageprofile-libbacktrace
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libbacktrace && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageprofile-libdecnumber)
-
-maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber
-clean-stageprofile: clean-stageprofile-libdecnumber
-clean-stageprofile-libdecnumber:
+               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-libbacktrace)
+
+maybe-clean-stageprofile-libbacktrace: clean-stageprofile-libbacktrace
+clean-stageprofile: clean-stageprofile-libbacktrace
+clean-stageprofile-libbacktrace:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stageprofile-libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageprofile-libbacktrace/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libdecnumber-bootstrap
-
-
-.PHONY: all-stagefeedback-libdecnumber maybe-all-stagefeedback-libdecnumber
-.PHONY: clean-stagefeedback-libdecnumber maybe-clean-stagefeedback-libdecnumber
-maybe-all-stagefeedback-libdecnumber:
-maybe-clean-stagefeedback-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stagefeedback-libdecnumber: all-stagefeedback-libdecnumber
-all-stagefeedback: all-stagefeedback-libdecnumber
-TARGET-stagefeedback-libdecnumber = $(TARGET-libdecnumber)
-all-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
+       cd $(HOST_SUBDIR)/libbacktrace && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libbacktrace-bootstrap
+
+
+.PHONY: all-stagefeedback-libbacktrace maybe-all-stagefeedback-libbacktrace
+.PHONY: clean-stagefeedback-libbacktrace maybe-clean-stagefeedback-libbacktrace
+maybe-all-stagefeedback-libbacktrace:
+maybe-clean-stagefeedback-libbacktrace:
+@if libbacktrace-bootstrap
+maybe-all-stagefeedback-libbacktrace: all-stagefeedback-libbacktrace
+all-stagefeedback: all-stagefeedback-libbacktrace
+TARGET-stagefeedback-libbacktrace = $(TARGET-libbacktrace)
+all-stagefeedback-libbacktrace: configure-stagefeedback-libbacktrace
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libbacktrace && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stagefeedback-libdecnumber)
-
-maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber
-clean-stagefeedback: clean-stagefeedback-libdecnumber
-clean-stagefeedback-libdecnumber:
+               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-libbacktrace)
+
+maybe-clean-stagefeedback-libbacktrace: clean-stagefeedback-libbacktrace
+clean-stagefeedback: clean-stagefeedback-libbacktrace
+clean-stagefeedback-libbacktrace:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-libdecnumber/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stagefeedback-libbacktrace/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libdecnumber-bootstrap
+       cd $(HOST_SUBDIR)/libbacktrace && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libbacktrace-bootstrap
 
 
 
 
 
-.PHONY: check-libdecnumber maybe-check-libdecnumber
-maybe-check-libdecnumber:
-@if libdecnumber
-maybe-check-libdecnumber: check-libdecnumber
+.PHONY: check-libbacktrace maybe-check-libbacktrace
+maybe-check-libbacktrace:
+@if libbacktrace
+maybe-check-libbacktrace: check-libbacktrace
 
-check-libdecnumber:
+check-libbacktrace:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
-@endif libdecnumber
+@endif libbacktrace
 
-.PHONY: install-libdecnumber maybe-install-libdecnumber
-maybe-install-libdecnumber:
-@if libdecnumber
-maybe-install-libdecnumber: install-libdecnumber
+.PHONY: install-libbacktrace maybe-install-libbacktrace
+maybe-install-libbacktrace:
+@if libbacktrace
+maybe-install-libbacktrace: install-libbacktrace
 
-install-libdecnumber: installdirs
+install-libbacktrace: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif libdecnumber
+@endif libbacktrace
+
+.PHONY: install-strip-libbacktrace maybe-install-strip-libbacktrace
+maybe-install-strip-libbacktrace:
+@if libbacktrace
+maybe-install-strip-libbacktrace: install-strip-libbacktrace
+
+install-strip-libbacktrace: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif libbacktrace
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-libdecnumber info-libdecnumber
-maybe-info-libdecnumber:
-@if libdecnumber
-maybe-info-libdecnumber: info-libdecnumber
+.PHONY: maybe-info-libbacktrace info-libbacktrace
+maybe-info-libbacktrace:
+@if libbacktrace
+maybe-info-libbacktrace: info-libbacktrace
 
-info-libdecnumber: \
-    configure-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+info-libbacktrace: \
+    configure-libbacktrace 
+       @[ -f ./libbacktrace/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing info in libbacktrace"; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -25401,24 +20024,24 @@ info-libdecnumber: \
                  info) \
          || exit 1
 
-@endif libdecnumber
+@endif libbacktrace
 
-.PHONY: maybe-dvi-libdecnumber dvi-libdecnumber
-maybe-dvi-libdecnumber:
-@if libdecnumber
-maybe-dvi-libdecnumber: dvi-libdecnumber
+.PHONY: maybe-dvi-libbacktrace dvi-libbacktrace
+maybe-dvi-libbacktrace:
+@if libbacktrace
+maybe-dvi-libbacktrace: dvi-libbacktrace
 
-dvi-libdecnumber: \
-    configure-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+dvi-libbacktrace: \
+    configure-libbacktrace 
+       @[ -f ./libbacktrace/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing dvi in libbacktrace"; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -25426,24 +20049,24 @@ dvi-libdecnumber: \
                  dvi) \
          || exit 1
 
-@endif libdecnumber
+@endif libbacktrace
 
-.PHONY: maybe-pdf-libdecnumber pdf-libdecnumber
-maybe-pdf-libdecnumber:
-@if libdecnumber
-maybe-pdf-libdecnumber: pdf-libdecnumber
+.PHONY: maybe-pdf-libbacktrace pdf-libbacktrace
+maybe-pdf-libbacktrace:
+@if libbacktrace
+maybe-pdf-libbacktrace: pdf-libbacktrace
 
-pdf-libdecnumber: \
-    configure-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+pdf-libbacktrace: \
+    configure-libbacktrace 
+       @[ -f ./libbacktrace/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing pdf in libbacktrace"; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -25451,24 +20074,24 @@ pdf-libdecnumber: \
                  pdf) \
          || exit 1
 
-@endif libdecnumber
+@endif libbacktrace
 
-.PHONY: maybe-html-libdecnumber html-libdecnumber
-maybe-html-libdecnumber:
-@if libdecnumber
-maybe-html-libdecnumber: html-libdecnumber
+.PHONY: maybe-html-libbacktrace html-libbacktrace
+maybe-html-libbacktrace:
+@if libbacktrace
+maybe-html-libbacktrace: html-libbacktrace
 
-html-libdecnumber: \
-    configure-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+html-libbacktrace: \
+    configure-libbacktrace 
+       @[ -f ./libbacktrace/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing html in libbacktrace"; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -25476,24 +20099,24 @@ html-libdecnumber: \
                  html) \
          || exit 1
 
-@endif libdecnumber
+@endif libbacktrace
 
-.PHONY: maybe-TAGS-libdecnumber TAGS-libdecnumber
-maybe-TAGS-libdecnumber:
-@if libdecnumber
-maybe-TAGS-libdecnumber: TAGS-libdecnumber
+.PHONY: maybe-TAGS-libbacktrace TAGS-libbacktrace
+maybe-TAGS-libbacktrace:
+@if libbacktrace
+maybe-TAGS-libbacktrace: TAGS-libbacktrace
 
-TAGS-libdecnumber: \
-    configure-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+TAGS-libbacktrace: \
+    configure-libbacktrace 
+       @[ -f ./libbacktrace/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing TAGS in libbacktrace"; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -25501,25 +20124,25 @@ TAGS-libdecnumber: \
                  TAGS) \
          || exit 1
 
-@endif libdecnumber
-
-.PHONY: maybe-install-info-libdecnumber install-info-libdecnumber
-maybe-install-info-libdecnumber:
-@if libdecnumber
-maybe-install-info-libdecnumber: install-info-libdecnumber
+@endif libbacktrace
 
-install-info-libdecnumber: \
-    configure-libdecnumber \
-    info-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+.PHONY: maybe-install-info-libbacktrace install-info-libbacktrace
+maybe-install-info-libbacktrace:
+@if libbacktrace
+maybe-install-info-libbacktrace: install-info-libbacktrace
+
+install-info-libbacktrace: \
+    configure-libbacktrace \
+    info-libbacktrace 
+       @[ -f ./libbacktrace/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing install-info in libbacktrace"; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -25527,25 +20150,25 @@ install-info-libdecnumber: \
                  install-info) \
          || exit 1
 
-@endif libdecnumber
+@endif libbacktrace
 
-.PHONY: maybe-install-pdf-libdecnumber install-pdf-libdecnumber
-maybe-install-pdf-libdecnumber:
-@if libdecnumber
-maybe-install-pdf-libdecnumber: install-pdf-libdecnumber
+.PHONY: maybe-install-pdf-libbacktrace install-pdf-libbacktrace
+maybe-install-pdf-libbacktrace:
+@if libbacktrace
+maybe-install-pdf-libbacktrace: install-pdf-libbacktrace
 
-install-pdf-libdecnumber: \
-    configure-libdecnumber \
-    pdf-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+install-pdf-libbacktrace: \
+    configure-libbacktrace \
+    pdf-libbacktrace 
+       @[ -f ./libbacktrace/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing install-pdf in libbacktrace"; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -25553,25 +20176,25 @@ install-pdf-libdecnumber: \
                  install-pdf) \
          || exit 1
 
-@endif libdecnumber
+@endif libbacktrace
 
-.PHONY: maybe-install-html-libdecnumber install-html-libdecnumber
-maybe-install-html-libdecnumber:
-@if libdecnumber
-maybe-install-html-libdecnumber: install-html-libdecnumber
+.PHONY: maybe-install-html-libbacktrace install-html-libbacktrace
+maybe-install-html-libbacktrace:
+@if libbacktrace
+maybe-install-html-libbacktrace: install-html-libbacktrace
 
-install-html-libdecnumber: \
-    configure-libdecnumber \
-    html-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+install-html-libbacktrace: \
+    configure-libbacktrace \
+    html-libbacktrace 
+       @[ -f ./libbacktrace/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing install-html in libbacktrace"; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -25579,24 +20202,24 @@ install-html-libdecnumber: \
                  install-html) \
          || exit 1
 
-@endif libdecnumber
+@endif libbacktrace
 
-.PHONY: maybe-installcheck-libdecnumber installcheck-libdecnumber
-maybe-installcheck-libdecnumber:
-@if libdecnumber
-maybe-installcheck-libdecnumber: installcheck-libdecnumber
+.PHONY: maybe-installcheck-libbacktrace installcheck-libbacktrace
+maybe-installcheck-libbacktrace:
+@if libbacktrace
+maybe-installcheck-libbacktrace: installcheck-libbacktrace
 
-installcheck-libdecnumber: \
-    configure-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+installcheck-libbacktrace: \
+    configure-libbacktrace 
+       @[ -f ./libbacktrace/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing installcheck in libbacktrace"; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -25604,23 +20227,23 @@ installcheck-libdecnumber: \
                  installcheck) \
          || exit 1
 
-@endif libdecnumber
+@endif libbacktrace
 
-.PHONY: maybe-mostlyclean-libdecnumber mostlyclean-libdecnumber
-maybe-mostlyclean-libdecnumber:
-@if libdecnumber
-maybe-mostlyclean-libdecnumber: mostlyclean-libdecnumber
+.PHONY: maybe-mostlyclean-libbacktrace mostlyclean-libbacktrace
+maybe-mostlyclean-libbacktrace:
+@if libbacktrace
+maybe-mostlyclean-libbacktrace: mostlyclean-libbacktrace
 
-mostlyclean-libdecnumber: 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+mostlyclean-libbacktrace: 
+       @[ -f ./libbacktrace/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing mostlyclean in libbacktrace"; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -25628,23 +20251,23 @@ mostlyclean-libdecnumber:
                  mostlyclean) \
          || exit 1
 
-@endif libdecnumber
+@endif libbacktrace
 
-.PHONY: maybe-clean-libdecnumber clean-libdecnumber
-maybe-clean-libdecnumber:
-@if libdecnumber
-maybe-clean-libdecnumber: clean-libdecnumber
+.PHONY: maybe-clean-libbacktrace clean-libbacktrace
+maybe-clean-libbacktrace:
+@if libbacktrace
+maybe-clean-libbacktrace: clean-libbacktrace
 
-clean-libdecnumber: 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+clean-libbacktrace: 
+       @[ -f ./libbacktrace/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing clean in libbacktrace"; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -25652,23 +20275,23 @@ clean-libdecnumber:
                  clean) \
          || exit 1
 
-@endif libdecnumber
+@endif libbacktrace
 
-.PHONY: maybe-distclean-libdecnumber distclean-libdecnumber
-maybe-distclean-libdecnumber:
-@if libdecnumber
-maybe-distclean-libdecnumber: distclean-libdecnumber
+.PHONY: maybe-distclean-libbacktrace distclean-libbacktrace
+maybe-distclean-libbacktrace:
+@if libbacktrace
+maybe-distclean-libbacktrace: distclean-libbacktrace
 
-distclean-libdecnumber: 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+distclean-libbacktrace: 
+       @[ -f ./libbacktrace/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing distclean in libbacktrace"; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -25676,23 +20299,23 @@ distclean-libdecnumber:
                  distclean) \
          || exit 1
 
-@endif libdecnumber
+@endif libbacktrace
 
-.PHONY: maybe-maintainer-clean-libdecnumber maintainer-clean-libdecnumber
-maybe-maintainer-clean-libdecnumber:
-@if libdecnumber
-maybe-maintainer-clean-libdecnumber: maintainer-clean-libdecnumber
+.PHONY: maybe-maintainer-clean-libbacktrace maintainer-clean-libbacktrace
+maybe-maintainer-clean-libbacktrace:
+@if libbacktrace
+maybe-maintainer-clean-libbacktrace: maintainer-clean-libbacktrace
 
-maintainer-clean-libdecnumber: 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+maintainer-clean-libbacktrace: 
+       @[ -f ./libbacktrace/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       echo "Doing maintainer-clean in libbacktrace"; \
+       (cd $(HOST_SUBDIR)/libbacktrace && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -25700,113 +20323,580 @@ maintainer-clean-libdecnumber:
                  maintainer-clean) \
          || exit 1
 
-@endif libdecnumber
+@endif libbacktrace
 
 
 
-.PHONY: configure-libgui maybe-configure-libgui
-maybe-configure-libgui:
+.PHONY: configure-libcpp maybe-configure-libcpp
+maybe-configure-libcpp:
 @if gcc-bootstrap
-configure-libgui: stage_current
+configure-libcpp: stage_current
 @endif gcc-bootstrap
-@if libgui
-maybe-configure-libgui: configure-libgui
-configure-libgui: 
-       @: $(MAKE); $(unstage)
+@if libcpp
+maybe-configure-libcpp: configure-libcpp
+configure-libcpp: 
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libgui/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/libgui; \
-       cd "$(HOST_SUBDIR)/libgui" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/libcpp; \
+       cd "$(HOST_SUBDIR)/libcpp" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libgui/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgui"; \
-       libsrcdir="$$s/libgui"; \
-       $(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 libgui
+@endif libcpp
+
+
+
+.PHONY: configure-stage1-libcpp maybe-configure-stage1-libcpp
+maybe-configure-stage1-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stage1-libcpp: configure-stage1-libcpp
+configure-stage1-libcpp:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/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; \
+       module_srcdir=libcpp; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif libcpp-bootstrap
+
+.PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp
+maybe-configure-stage2-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stage2-libcpp: configure-stage2-libcpp
+configure-stage2-libcpp:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/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; \
+       module_srcdir=libcpp; \
+       $(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 libcpp-bootstrap
+
+.PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp
+maybe-configure-stage3-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stage3-libcpp: configure-stage3-libcpp
+configure-stage3-libcpp:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/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; \
+       module_srcdir=libcpp; \
+       $(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 libcpp-bootstrap
+
+.PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp
+maybe-configure-stage4-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stage4-libcpp: configure-stage4-libcpp
+configure-stage4-libcpp:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/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; \
+       module_srcdir=libcpp; \
+       $(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 libcpp-bootstrap
+
+.PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp
+maybe-configure-stageprofile-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp
+configure-stageprofile-libcpp:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage profile in $(HOST_SUBDIR)/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; \
+       module_srcdir=libcpp; \
+       $(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 libcpp-bootstrap
+
+.PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp
+maybe-configure-stagefeedback-libcpp:
+@if libcpp-bootstrap
+maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp
+configure-stagefeedback-libcpp:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/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; \
+       module_srcdir=libcpp; \
+       $(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 libcpp-bootstrap
 
 
 
 
 
-.PHONY: all-libgui maybe-all-libgui
-maybe-all-libgui:
+.PHONY: all-libcpp maybe-all-libcpp
+maybe-all-libcpp:
 @if gcc-bootstrap
-all-libgui: stage_current
+all-libcpp: stage_current
 @endif gcc-bootstrap
-@if libgui
-TARGET-libgui=all
-maybe-all-libgui: all-libgui
-all-libgui: configure-libgui
-       @: $(MAKE); $(unstage)
+@if libcpp
+TARGET-libcpp=all
+maybe-all-libcpp: all-libcpp
+all-libcpp: configure-libcpp
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libcpp && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-libcpp))
+@endif libcpp
+
+
+
+.PHONY: all-stage1-libcpp maybe-all-stage1-libcpp
+.PHONY: clean-stage1-libcpp maybe-clean-stage1-libcpp
+maybe-all-stage1-libcpp:
+maybe-clean-stage1-libcpp:
+@if libcpp-bootstrap
+maybe-all-stage1-libcpp: all-stage1-libcpp
+all-stage1: all-stage1-libcpp
+TARGET-stage1-libcpp = $(TARGET-libcpp)
+all-stage1-libcpp: configure-stage1-libcpp
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libcpp && \
+        \
+       $(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-libcpp)
+
+maybe-clean-stage1-libcpp: clean-stage1-libcpp
+clean-stage1: clean-stage1-libcpp
+clean-stage1-libcpp:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-libcpp/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif libcpp-bootstrap
+
+
+.PHONY: all-stage2-libcpp maybe-all-stage2-libcpp
+.PHONY: clean-stage2-libcpp maybe-clean-stage2-libcpp
+maybe-all-stage2-libcpp:
+maybe-clean-stage2-libcpp:
+@if libcpp-bootstrap
+maybe-all-stage2-libcpp: all-stage2-libcpp
+all-stage2: all-stage2-libcpp
+TARGET-stage2-libcpp = $(TARGET-libcpp)
+all-stage2-libcpp: configure-stage2-libcpp
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libgui && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-libgui))
-@endif libgui
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libcpp && \
+        \
+       $(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-libcpp)
+
+maybe-clean-stage2-libcpp: clean-stage2-libcpp
+clean-stage2: clean-stage2-libcpp
+clean-stage2-libcpp:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-libcpp/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libcpp-bootstrap
 
 
+.PHONY: all-stage3-libcpp maybe-all-stage3-libcpp
+.PHONY: clean-stage3-libcpp maybe-clean-stage3-libcpp
+maybe-all-stage3-libcpp:
+maybe-clean-stage3-libcpp:
+@if libcpp-bootstrap
+maybe-all-stage3-libcpp: all-stage3-libcpp
+all-stage3: all-stage3-libcpp
+TARGET-stage3-libcpp = $(TARGET-libcpp)
+all-stage3-libcpp: configure-stage3-libcpp
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libcpp && \
+        \
+       $(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-libcpp)
 
+maybe-clean-stage3-libcpp: clean-stage3-libcpp
+clean-stage3: clean-stage3-libcpp
+clean-stage3-libcpp:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-libcpp/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libcpp-bootstrap
 
-.PHONY: check-libgui maybe-check-libgui
-maybe-check-libgui:
-@if libgui
-maybe-check-libgui: check-libgui
 
-check-libgui:
-       @: $(MAKE); $(unstage)
+.PHONY: all-stage4-libcpp maybe-all-stage4-libcpp
+.PHONY: clean-stage4-libcpp maybe-clean-stage4-libcpp
+maybe-all-stage4-libcpp:
+maybe-clean-stage4-libcpp:
+@if libcpp-bootstrap
+maybe-all-stage4-libcpp: all-stage4-libcpp
+all-stage4: all-stage4-libcpp
+TARGET-stage4-libcpp = $(TARGET-libcpp)
+all-stage4-libcpp: configure-stage4-libcpp
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libgui && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libcpp && \
+        \
+       $(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-libcpp)
 
-@endif libgui
+maybe-clean-stage4-libcpp: clean-stage4-libcpp
+clean-stage4: clean-stage4-libcpp
+clean-stage4-libcpp:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-libcpp/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libcpp-bootstrap
 
-.PHONY: install-libgui maybe-install-libgui
-maybe-install-libgui:
-@if libgui
-maybe-install-libgui: install-libgui
 
-install-libgui: installdirs
+.PHONY: all-stageprofile-libcpp maybe-all-stageprofile-libcpp
+.PHONY: clean-stageprofile-libcpp maybe-clean-stageprofile-libcpp
+maybe-all-stageprofile-libcpp:
+maybe-clean-stageprofile-libcpp:
+@if libcpp-bootstrap
+maybe-all-stageprofile-libcpp: all-stageprofile-libcpp
+all-stageprofile: all-stageprofile-libcpp
+TARGET-stageprofile-libcpp = $(TARGET-libcpp)
+all-stageprofile-libcpp: configure-stageprofile-libcpp
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libcpp && \
+        \
+       $(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-libcpp)
+
+maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
+clean-stageprofile: clean-stageprofile-libcpp
+clean-stageprofile-libcpp:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-libcpp/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libcpp-bootstrap
+
+
+.PHONY: all-stagefeedback-libcpp maybe-all-stagefeedback-libcpp
+.PHONY: clean-stagefeedback-libcpp maybe-clean-stagefeedback-libcpp
+maybe-all-stagefeedback-libcpp:
+maybe-clean-stagefeedback-libcpp:
+@if libcpp-bootstrap
+maybe-all-stagefeedback-libcpp: all-stagefeedback-libcpp
+all-stagefeedback: all-stagefeedback-libcpp
+TARGET-stagefeedback-libcpp = $(TARGET-libcpp)
+all-stagefeedback-libcpp: configure-stagefeedback-libcpp
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libcpp && \
+        \
+       $(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-libcpp)
+
+maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
+clean-stagefeedback: clean-stagefeedback-libcpp
+clean-stagefeedback-libcpp:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-libcpp/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libcpp && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libcpp-bootstrap
+
+
+
+
+
+.PHONY: check-libcpp maybe-check-libcpp
+maybe-check-libcpp:
+@if libcpp
+maybe-check-libcpp: check-libcpp
+
+check-libcpp:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libcpp && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
+
+@endif libcpp
+
+.PHONY: install-libcpp maybe-install-libcpp
+maybe-install-libcpp:
+@if libcpp
+maybe-install-libcpp: install-libcpp
+
+install-libcpp: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libgui && \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif libgui
+@endif libcpp
+
+.PHONY: install-strip-libcpp maybe-install-strip-libcpp
+maybe-install-strip-libcpp:
+@if libcpp
+maybe-install-strip-libcpp: install-strip-libcpp
+
+install-strip-libcpp: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libcpp && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif libcpp
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-libgui info-libgui
-maybe-info-libgui:
-@if libgui
-maybe-info-libgui: info-libgui
+.PHONY: maybe-info-libcpp info-libcpp
+maybe-info-libcpp:
+@if libcpp
+maybe-info-libcpp: info-libcpp
 
-info-libgui: \
-    configure-libgui 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+info-libcpp: \
+    configure-libcpp 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing info in libcpp"; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -25814,25 +20904,24 @@ info-libgui: \
                  info) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
-.PHONY: maybe-dvi-libgui dvi-libgui
-maybe-dvi-libgui:
-@if libgui
-maybe-dvi-libgui: dvi-libgui
+.PHONY: maybe-dvi-libcpp dvi-libcpp
+maybe-dvi-libcpp:
+@if libcpp
+maybe-dvi-libcpp: dvi-libcpp
 
-dvi-libgui: \
-    configure-libgui 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+dvi-libcpp: \
+    configure-libcpp 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing dvi in libcpp"; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -25840,25 +20929,24 @@ dvi-libgui: \
                  dvi) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
-.PHONY: maybe-pdf-libgui pdf-libgui
-maybe-pdf-libgui:
-@if libgui
-maybe-pdf-libgui: pdf-libgui
+.PHONY: maybe-pdf-libcpp pdf-libcpp
+maybe-pdf-libcpp:
+@if libcpp
+maybe-pdf-libcpp: pdf-libcpp
 
-pdf-libgui: \
-    configure-libgui 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+pdf-libcpp: \
+    configure-libcpp 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing pdf in libcpp"; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -25866,25 +20954,24 @@ pdf-libgui: \
                  pdf) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
-.PHONY: maybe-html-libgui html-libgui
-maybe-html-libgui:
-@if libgui
-maybe-html-libgui: html-libgui
+.PHONY: maybe-html-libcpp html-libcpp
+maybe-html-libcpp:
+@if libcpp
+maybe-html-libcpp: html-libcpp
 
-html-libgui: \
-    configure-libgui 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+html-libcpp: \
+    configure-libcpp 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing html in libcpp"; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -25892,25 +20979,24 @@ html-libgui: \
                  html) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
-.PHONY: maybe-TAGS-libgui TAGS-libgui
-maybe-TAGS-libgui:
-@if libgui
-maybe-TAGS-libgui: TAGS-libgui
+.PHONY: maybe-TAGS-libcpp TAGS-libcpp
+maybe-TAGS-libcpp:
+@if libcpp
+maybe-TAGS-libcpp: TAGS-libcpp
 
-TAGS-libgui: \
-    configure-libgui 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+TAGS-libcpp: \
+    configure-libcpp 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing TAGS in libcpp"; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -25918,26 +21004,25 @@ TAGS-libgui: \
                  TAGS) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
-.PHONY: maybe-install-info-libgui install-info-libgui
-maybe-install-info-libgui:
-@if libgui
-maybe-install-info-libgui: install-info-libgui
+.PHONY: maybe-install-info-libcpp install-info-libcpp
+maybe-install-info-libcpp:
+@if libcpp
+maybe-install-info-libcpp: install-info-libcpp
 
-install-info-libgui: \
-    configure-libgui \
-    info-libgui 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+install-info-libcpp: \
+    configure-libcpp \
+    info-libcpp 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing install-info in libcpp"; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -25945,26 +21030,25 @@ install-info-libgui: \
                  install-info) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
-.PHONY: maybe-install-pdf-libgui install-pdf-libgui
-maybe-install-pdf-libgui:
-@if libgui
-maybe-install-pdf-libgui: install-pdf-libgui
+.PHONY: maybe-install-pdf-libcpp install-pdf-libcpp
+maybe-install-pdf-libcpp:
+@if libcpp
+maybe-install-pdf-libcpp: install-pdf-libcpp
 
-install-pdf-libgui: \
-    configure-libgui \
-    pdf-libgui 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+install-pdf-libcpp: \
+    configure-libcpp \
+    pdf-libcpp 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing install-pdf in libcpp"; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -25972,26 +21056,25 @@ install-pdf-libgui: \
                  install-pdf) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
-.PHONY: maybe-install-html-libgui install-html-libgui
-maybe-install-html-libgui:
-@if libgui
-maybe-install-html-libgui: install-html-libgui
+.PHONY: maybe-install-html-libcpp install-html-libcpp
+maybe-install-html-libcpp:
+@if libcpp
+maybe-install-html-libcpp: install-html-libcpp
 
-install-html-libgui: \
-    configure-libgui \
-    html-libgui 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+install-html-libcpp: \
+    configure-libcpp \
+    html-libcpp 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing install-html in libcpp"; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -25999,25 +21082,24 @@ install-html-libgui: \
                  install-html) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
-.PHONY: maybe-installcheck-libgui installcheck-libgui
-maybe-installcheck-libgui:
-@if libgui
-maybe-installcheck-libgui: installcheck-libgui
+.PHONY: maybe-installcheck-libcpp installcheck-libcpp
+maybe-installcheck-libcpp:
+@if libcpp
+maybe-installcheck-libcpp: installcheck-libcpp
 
-installcheck-libgui: \
-    configure-libgui 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+installcheck-libcpp: \
+    configure-libcpp 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing installcheck in libcpp"; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -26025,24 +21107,23 @@ installcheck-libgui: \
                  installcheck) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
-.PHONY: maybe-mostlyclean-libgui mostlyclean-libgui
-maybe-mostlyclean-libgui:
-@if libgui
-maybe-mostlyclean-libgui: mostlyclean-libgui
+.PHONY: maybe-mostlyclean-libcpp mostlyclean-libcpp
+maybe-mostlyclean-libcpp:
+@if libcpp
+maybe-mostlyclean-libcpp: mostlyclean-libcpp
 
-mostlyclean-libgui: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+mostlyclean-libcpp: 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing mostlyclean in libcpp"; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -26050,24 +21131,23 @@ mostlyclean-libgui:
                  mostlyclean) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
-.PHONY: maybe-clean-libgui clean-libgui
-maybe-clean-libgui:
-@if libgui
-maybe-clean-libgui: clean-libgui
+.PHONY: maybe-clean-libcpp clean-libcpp
+maybe-clean-libcpp:
+@if libcpp
+maybe-clean-libcpp: clean-libcpp
 
-clean-libgui: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+clean-libcpp: 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing clean in libcpp"; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -26075,24 +21155,23 @@ clean-libgui:
                  clean) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
-.PHONY: maybe-distclean-libgui distclean-libgui
-maybe-distclean-libgui:
-@if libgui
-maybe-distclean-libgui: distclean-libgui
+.PHONY: maybe-distclean-libcpp distclean-libcpp
+maybe-distclean-libcpp:
+@if libcpp
+maybe-distclean-libcpp: distclean-libcpp
 
-distclean-libgui: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+distclean-libcpp: 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing distclean in libcpp"; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -26100,24 +21179,23 @@ distclean-libgui:
                  distclean) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
-.PHONY: maybe-maintainer-clean-libgui maintainer-clean-libgui
-maybe-maintainer-clean-libgui:
-@if libgui
-maybe-maintainer-clean-libgui: maintainer-clean-libgui
+.PHONY: maybe-maintainer-clean-libcpp maintainer-clean-libcpp
+maybe-maintainer-clean-libcpp:
+@if libcpp
+maybe-maintainer-clean-libcpp: maintainer-clean-libcpp
 
-maintainer-clean-libgui: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libgui/Makefile ] || exit 0; \
+maintainer-clean-libcpp: 
+       @[ -f ./libcpp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       echo "Doing maintainer-clean in libcpp"; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -26125,663 +21203,580 @@ maintainer-clean-libgui:
                  maintainer-clean) \
          || exit 1
 
-@endif libgui
+@endif libcpp
 
 
 
-.PHONY: configure-libiberty maybe-configure-libiberty
-maybe-configure-libiberty:
+.PHONY: configure-libdecnumber maybe-configure-libdecnumber
+maybe-configure-libdecnumber:
 @if gcc-bootstrap
-configure-libiberty: stage_current
+configure-libdecnumber: stage_current
 @endif gcc-bootstrap
-@if libiberty
-maybe-configure-libiberty: configure-libiberty
-configure-libiberty: 
+@if libdecnumber
+maybe-configure-libdecnumber: configure-libdecnumber
+configure-libdecnumber: 
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/libiberty; \
-       cd "$(HOST_SUBDIR)/libiberty" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/libdecnumber; \
+       cd "$(HOST_SUBDIR)/libdecnumber" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(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 libiberty
+@endif libdecnumber
 
 
 
-.PHONY: configure-stage1-libiberty maybe-configure-stage1-libiberty
-maybe-configure-stage1-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stage1-libiberty: configure-stage1-libiberty
-configure-stage1-libiberty:
+.PHONY: configure-stage1-libdecnumber maybe-configure-stage1-libdecnumber
+maybe-configure-stage1-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stage1-libdecnumber: configure-stage1-libdecnumber
+configure-stage1-libdecnumber:
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-       $(HOST_EXPORTS)  \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-       cd $(HOST_SUBDIR)/libiberty || exit 1; \
+       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber; \
+       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(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} \
           \
-         --disable-intermodule $(STAGE1_CHECKING)        --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif libiberty-bootstrap
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
 
-.PHONY: configure-stage2-libiberty maybe-configure-stage2-libiberty
-maybe-configure-stage2-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stage2-libiberty: configure-stage2-libiberty
-configure-stage2-libiberty:
+.PHONY: configure-stage2-libdecnumber maybe-configure-stage2-libdecnumber
+maybe-configure-stage2-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stage2-libdecnumber: configure-stage2-libdecnumber
+configure-stage2-libdecnumber:
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif libiberty-bootstrap
-
-.PHONY: configure-stageb2g0-libiberty maybe-configure-stageb2g0-libiberty
-maybe-configure-stageb2g0-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stageb2g0-libiberty: configure-stageb2g0-libiberty
-configure-stageb2g0-libiberty:
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
-       echo Configuring stage b2g0 in $(HOST_SUBDIR)/libiberty ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-       cd $(HOST_SUBDIR)/libiberty || exit 1; \
+       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/libdecnumber; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber; \
+       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(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_werror_flag@ 
-@endif libiberty-bootstrap
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
 
-.PHONY: configure-stage3-libiberty maybe-configure-stage3-libiberty
-maybe-configure-stage3-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stage3-libiberty: configure-stage3-libiberty
-configure-stage3-libiberty:
+.PHONY: configure-stage3-libdecnumber maybe-configure-stage3-libdecnumber
+maybe-configure-stage3-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stage3-libdecnumber: configure-stage3-libdecnumber
+configure-stage3-libdecnumber:
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif libiberty-bootstrap
-
-.PHONY: configure-stageb3g2-libiberty maybe-configure-stageb3g2-libiberty
-maybe-configure-stageb3g2-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stageb3g2-libiberty: configure-stageb3g2-libiberty
-configure-stageb3g2-libiberty:
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
-       echo Configuring stage b3g2 in $(HOST_SUBDIR)/libiberty ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-       cd $(HOST_SUBDIR)/libiberty || exit 1; \
+       CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/libdecnumber; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber; \
+       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(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_werror_flag@ 
-@endif libiberty-bootstrap
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
 
-.PHONY: configure-stage4-libiberty maybe-configure-stage4-libiberty
-maybe-configure-stage4-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stage4-libiberty: configure-stage4-libiberty
-configure-stage4-libiberty:
+.PHONY: configure-stage4-libdecnumber maybe-configure-stage4-libdecnumber
+maybe-configure-stage4-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stage4-libdecnumber: configure-stage4-libdecnumber
+configure-stage4-libdecnumber:
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
+       $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-       cd $(HOST_SUBDIR)/libiberty || exit 1; \
+       CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/libdecnumber; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber; \
+       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(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_werror_flag@ 
-@endif libiberty-bootstrap
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
 
-.PHONY: configure-stageprofile-libiberty maybe-configure-stageprofile-libiberty
-maybe-configure-stageprofile-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stageprofile-libiberty: configure-stageprofile-libiberty
-configure-stageprofile-libiberty:
+.PHONY: configure-stageprofile-libdecnumber maybe-configure-stageprofile-libdecnumber
+maybe-configure-stageprofile-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
+configure-stageprofile-libdecnumber:
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/libiberty ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-       cd $(HOST_SUBDIR)/libiberty || exit 1; \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage profile in $(HOST_SUBDIR)/libdecnumber; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber; \
+       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(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_werror_flag@ 
-@endif libiberty-bootstrap
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
 
-.PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty
-maybe-configure-stagefeedback-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stagefeedback-libiberty: configure-stagefeedback-libiberty
-configure-stagefeedback-libiberty:
+.PHONY: configure-stagefeedback-libdecnumber maybe-configure-stagefeedback-libdecnumber
+maybe-configure-stagefeedback-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-configure-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
+configure-stagefeedback-libdecnumber:
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-       cd $(HOST_SUBDIR)/libiberty || exit 1; \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/libdecnumber; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber; \
+       cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(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_werror_flag@ 
-@endif libiberty-bootstrap
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
 
 
 
 
 
-.PHONY: all-libiberty maybe-all-libiberty
-maybe-all-libiberty:
+.PHONY: all-libdecnumber maybe-all-libdecnumber
+maybe-all-libdecnumber:
 @if gcc-bootstrap
-all-libiberty: stage_current
+all-libdecnumber: stage_current
 @endif gcc-bootstrap
-@if libiberty
-TARGET-libiberty=all
-maybe-all-libiberty: all-libiberty
-all-libiberty: configure-libiberty
+@if libdecnumber
+TARGET-libdecnumber=all
+maybe-all-libdecnumber: all-libdecnumber
+all-libdecnumber: configure-libdecnumber
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libiberty && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-libiberty))
-@endif libiberty
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-libdecnumber))
+@endif libdecnumber
 
 
 
-.PHONY: all-stage1-libiberty maybe-all-stage1-libiberty
-.PHONY: clean-stage1-libiberty maybe-clean-stage1-libiberty
-maybe-all-stage1-libiberty:
-maybe-clean-stage1-libiberty:
-@if libiberty-bootstrap
-maybe-all-stage1-libiberty: all-stage1-libiberty
-all-stage1: all-stage1-libiberty
-TARGET-stage1-libiberty = $(TARGET-libiberty)
-all-stage1-libiberty: configure-stage1-libiberty
+.PHONY: all-stage1-libdecnumber maybe-all-stage1-libdecnumber
+.PHONY: clean-stage1-libdecnumber maybe-clean-stage1-libdecnumber
+maybe-all-stage1-libdecnumber:
+maybe-clean-stage1-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stage1-libdecnumber: all-stage1-libdecnumber
+all-stage1: all-stage1-libdecnumber
+TARGET-stage1-libdecnumber = $(TARGET-libdecnumber)
+all-stage1-libdecnumber: configure-stage1-libdecnumber
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-               LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
-               $(TARGET-stage1-libiberty)
-
-maybe-clean-stage1-libiberty: clean-stage1-libiberty
-clean-stage1: clean-stage1-libiberty
-clean-stage1-libiberty:
-       @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage1-libiberty/Makefile ] || exit 0; \
-         $(MAKE) stage1-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
-@endif libiberty-bootstrap
-
-
-.PHONY: all-stage2-libiberty maybe-all-stage2-libiberty
-.PHONY: clean-stage2-libiberty maybe-clean-stage2-libiberty
-maybe-all-stage2-libiberty:
-maybe-clean-stage2-libiberty:
-@if libiberty-bootstrap
-maybe-all-stage2-libiberty: all-stage2-libiberty
-all-stage2: all-stage2-libiberty
-TARGET-stage2-libiberty = $(TARGET-libiberty)
-all-stage2-libiberty: configure-stage2-libiberty
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libiberty && \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libdecnumber && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage2-libiberty)
-
-maybe-clean-stage2-libiberty: clean-stage2-libiberty
-clean-stage2: clean-stage2-libiberty
-clean-stage2-libiberty:
-       @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage2-libiberty/Makefile ] || exit 0; \
-         $(MAKE) stage2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libiberty-bootstrap
-
+               CFLAGS="$(STAGE1_CFLAGS)" \
+               CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+               LIBCFLAGS="$(LIBCFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
+               $(TARGET-stage1-libdecnumber)
 
-.PHONY: all-stageb2g0-libiberty maybe-all-stageb2g0-libiberty
-.PHONY: clean-stageb2g0-libiberty maybe-clean-stageb2g0-libiberty
-maybe-all-stageb2g0-libiberty:
-maybe-clean-stageb2g0-libiberty:
-@if libiberty-bootstrap
-maybe-all-stageb2g0-libiberty: all-stageb2g0-libiberty
-all-stageb2g0: all-stageb2g0-libiberty
-TARGET-stageb2g0-libiberty = $(TARGET-libiberty)
-all-stageb2g0-libiberty: configure-stageb2g0-libiberty
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb2g0-libiberty)
-
-maybe-clean-stageb2g0-libiberty: clean-stageb2g0-libiberty
-clean-stageb2g0: clean-stageb2g0-libiberty
-clean-stageb2g0-libiberty:
-       @if [ $(current_stage) = stageb2g0 ]; then \
-         [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
+maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber
+clean-stage1: clean-stage1-libdecnumber
+clean-stage1-libdecnumber:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stageb2g0-libiberty/Makefile ] || exit 0; \
-         $(MAKE) stageb2g0-start; \
+         [ -f $(HOST_SUBDIR)/stage1-libdecnumber/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libiberty && \
+       cd $(HOST_SUBDIR)/libdecnumber && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libiberty-bootstrap
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif libdecnumber-bootstrap
 
 
-.PHONY: all-stage3-libiberty maybe-all-stage3-libiberty
-.PHONY: clean-stage3-libiberty maybe-clean-stage3-libiberty
-maybe-all-stage3-libiberty:
-maybe-clean-stage3-libiberty:
-@if libiberty-bootstrap
-maybe-all-stage3-libiberty: all-stage3-libiberty
-all-stage3: all-stage3-libiberty
-TARGET-stage3-libiberty = $(TARGET-libiberty)
-all-stage3-libiberty: configure-stage3-libiberty
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+.PHONY: all-stage2-libdecnumber maybe-all-stage2-libdecnumber
+.PHONY: clean-stage2-libdecnumber maybe-clean-stage2-libdecnumber
+maybe-all-stage2-libdecnumber:
+maybe-clean-stage2-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stage2-libdecnumber: all-stage2-libdecnumber
+all-stage2: all-stage2-libdecnumber
+TARGET-stage2-libdecnumber = $(TARGET-libdecnumber)
+all-stage2-libdecnumber: configure-stage2-libdecnumber
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libiberty && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libdecnumber && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage3-libiberty)
+               CFLAGS="$(STAGE2_CFLAGS)" \
+               CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGE2_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
+               $(TARGET-stage2-libdecnumber)
 
-maybe-clean-stage3-libiberty: clean-stage3-libiberty
-clean-stage3: clean-stage3-libiberty
-clean-stage3-libiberty:
-       @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
+maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber
+clean-stage2: clean-stage2-libdecnumber
+clean-stage2-libdecnumber:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage3-libiberty/Makefile ] || exit 0; \
-         $(MAKE) stage3-start; \
+         [ -f $(HOST_SUBDIR)/stage2-libdecnumber/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libiberty-bootstrap
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libdecnumber-bootstrap
 
 
-.PHONY: all-stageb3g2-libiberty maybe-all-stageb3g2-libiberty
-.PHONY: clean-stageb3g2-libiberty maybe-clean-stageb3g2-libiberty
-maybe-all-stageb3g2-libiberty:
-maybe-clean-stageb3g2-libiberty:
-@if libiberty-bootstrap
-maybe-all-stageb3g2-libiberty: all-stageb3g2-libiberty
-all-stageb3g2: all-stageb3g2-libiberty
-TARGET-stageb3g2-libiberty = $(TARGET-libiberty)
-all-stageb3g2-libiberty: configure-stageb3g2-libiberty
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
+.PHONY: all-stage3-libdecnumber maybe-all-stage3-libdecnumber
+.PHONY: clean-stage3-libdecnumber maybe-clean-stage3-libdecnumber
+maybe-all-stage3-libdecnumber:
+maybe-clean-stage3-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stage3-libdecnumber: all-stage3-libdecnumber
+all-stage3: all-stage3-libdecnumber
+TARGET-stage3-libdecnumber = $(TARGET-libdecnumber)
+all-stage3-libdecnumber: configure-stage3-libdecnumber
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libiberty && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libdecnumber && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb3g2-libiberty)
-
-maybe-clean-stageb3g2-libiberty: clean-stageb3g2-libiberty
-clean-stageb3g2: clean-stageb3g2-libiberty
-clean-stageb3g2-libiberty:
-       @if [ $(current_stage) = stageb3g2 ]; then \
-         [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
+               CFLAGS="$(STAGE3_CFLAGS)" \
+               CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGE3_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
+               $(TARGET-stage3-libdecnumber)
+
+maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber
+clean-stage3: clean-stage3-libdecnumber
+clean-stage3-libdecnumber:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stageb3g2-libiberty/Makefile ] || exit 0; \
-         $(MAKE) stageb3g2-start; \
+         [ -f $(HOST_SUBDIR)/stage3-libdecnumber/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libiberty-bootstrap
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libdecnumber-bootstrap
 
 
-.PHONY: all-stage4-libiberty maybe-all-stage4-libiberty
-.PHONY: clean-stage4-libiberty maybe-clean-stage4-libiberty
-maybe-all-stage4-libiberty:
-maybe-clean-stage4-libiberty:
-@if libiberty-bootstrap
-maybe-all-stage4-libiberty: all-stage4-libiberty
-all-stage4: all-stage4-libiberty
-TARGET-stage4-libiberty = $(TARGET-libiberty)
-all-stage4-libiberty: configure-stage4-libiberty
+.PHONY: all-stage4-libdecnumber maybe-all-stage4-libdecnumber
+.PHONY: clean-stage4-libdecnumber maybe-clean-stage4-libdecnumber
+maybe-all-stage4-libdecnumber:
+maybe-clean-stage4-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stage4-libdecnumber: all-stage4-libdecnumber
+all-stage4: all-stage4-libdecnumber
+TARGET-stage4-libdecnumber = $(TARGET-libdecnumber)
+all-stage4-libdecnumber: configure-stage4-libdecnumber
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libiberty && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libdecnumber && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
+               CFLAGS="$(STAGE4_CFLAGS)" \
+               CXXFLAGS="$(STAGE4_CXXFLAGS)" \
                LIBCFLAGS="$(STAGE4_CFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage4-libiberty)
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
+               $(TARGET-stage4-libdecnumber)
 
-maybe-clean-stage4-libiberty: clean-stage4-libiberty
-clean-stage4: clean-stage4-libiberty
-clean-stage4-libiberty:
+maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber
+clean-stage4: clean-stage4-libdecnumber
+clean-stage4-libdecnumber:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage4-libiberty/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage4-libdecnumber/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libiberty-bootstrap
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libdecnumber-bootstrap
 
 
-.PHONY: all-stageprofile-libiberty maybe-all-stageprofile-libiberty
-.PHONY: clean-stageprofile-libiberty maybe-clean-stageprofile-libiberty
-maybe-all-stageprofile-libiberty:
-maybe-clean-stageprofile-libiberty:
-@if libiberty-bootstrap
-maybe-all-stageprofile-libiberty: all-stageprofile-libiberty
-all-stageprofile: all-stageprofile-libiberty
-TARGET-stageprofile-libiberty = $(TARGET-libiberty)
-all-stageprofile-libiberty: configure-stageprofile-libiberty
+.PHONY: all-stageprofile-libdecnumber maybe-all-stageprofile-libdecnumber
+.PHONY: clean-stageprofile-libdecnumber maybe-clean-stageprofile-libdecnumber
+maybe-all-stageprofile-libdecnumber:
+maybe-clean-stageprofile-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stageprofile-libdecnumber: all-stageprofile-libdecnumber
+all-stageprofile: all-stageprofile-libdecnumber
+TARGET-stageprofile-libdecnumber = $(TARGET-libdecnumber)
+all-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libiberty && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libdecnumber && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageprofile-libiberty)
+               CFLAGS="$(STAGEprofile_CFLAGS)" \
+               CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
+               $(TARGET-stageprofile-libdecnumber)
 
-maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
-clean-stageprofile: clean-stageprofile-libiberty
-clean-stageprofile-libiberty:
+maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber
+clean-stageprofile: clean-stageprofile-libdecnumber
+clean-stageprofile-libdecnumber:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stageprofile-libiberty/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageprofile-libdecnumber/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libiberty-bootstrap
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libdecnumber-bootstrap
 
 
-.PHONY: all-stagefeedback-libiberty maybe-all-stagefeedback-libiberty
-.PHONY: clean-stagefeedback-libiberty maybe-clean-stagefeedback-libiberty
-maybe-all-stagefeedback-libiberty:
-maybe-clean-stagefeedback-libiberty:
-@if libiberty-bootstrap
-maybe-all-stagefeedback-libiberty: all-stagefeedback-libiberty
-all-stagefeedback: all-stagefeedback-libiberty
-TARGET-stagefeedback-libiberty = $(TARGET-libiberty)
-all-stagefeedback-libiberty: configure-stagefeedback-libiberty
+.PHONY: all-stagefeedback-libdecnumber maybe-all-stagefeedback-libdecnumber
+.PHONY: clean-stagefeedback-libdecnumber maybe-clean-stagefeedback-libdecnumber
+maybe-all-stagefeedback-libdecnumber:
+maybe-clean-stagefeedback-libdecnumber:
+@if libdecnumber-bootstrap
+maybe-all-stagefeedback-libdecnumber: all-stagefeedback-libdecnumber
+all-stagefeedback: all-stagefeedback-libdecnumber
+TARGET-stagefeedback-libdecnumber = $(TARGET-libdecnumber)
+all-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/libiberty && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libdecnumber && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stagefeedback-libiberty)
+               CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
+               $(TARGET-stagefeedback-libdecnumber)
 
-maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
-clean-stagefeedback: clean-stagefeedback-libiberty
-clean-stagefeedback-libiberty:
+maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber
+clean-stagefeedback: clean-stagefeedback-libdecnumber
+clean-stagefeedback-libdecnumber:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-libiberty/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stagefeedback-libdecnumber/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libiberty && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libiberty-bootstrap
+       cd $(HOST_SUBDIR)/libdecnumber && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libdecnumber-bootstrap
 
 
 
 
 
-.PHONY: check-libiberty maybe-check-libiberty
-maybe-check-libiberty:
-@if libiberty
-maybe-check-libiberty: check-libiberty
+.PHONY: check-libdecnumber maybe-check-libdecnumber
+maybe-check-libdecnumber:
+@if libdecnumber
+maybe-check-libdecnumber: check-libdecnumber
 
-check-libiberty:
+check-libdecnumber:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libiberty && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
-@endif libiberty
+@endif libdecnumber
 
-.PHONY: install-libiberty maybe-install-libiberty
-maybe-install-libiberty:
-@if libiberty
-maybe-install-libiberty: install-libiberty
+.PHONY: install-libdecnumber maybe-install-libdecnumber
+maybe-install-libdecnumber:
+@if libdecnumber
+maybe-install-libdecnumber: install-libdecnumber
 
-install-libiberty: installdirs
+install-libdecnumber: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libiberty && \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif libiberty
+@endif libdecnumber
+
+.PHONY: install-strip-libdecnumber maybe-install-strip-libdecnumber
+maybe-install-strip-libdecnumber:
+@if libdecnumber
+maybe-install-strip-libdecnumber: install-strip-libdecnumber
+
+install-strip-libdecnumber: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif libdecnumber
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-libiberty info-libiberty
-maybe-info-libiberty:
-@if libiberty
-maybe-info-libiberty: info-libiberty
+.PHONY: maybe-info-libdecnumber info-libdecnumber
+maybe-info-libdecnumber:
+@if libdecnumber
+maybe-info-libdecnumber: info-libdecnumber
 
-info-libiberty: \
-    configure-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+info-libdecnumber: \
+    configure-libdecnumber 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in libiberty" ; \
-       (cd $(HOST_SUBDIR)/libiberty && \
+       echo "Doing info in libdecnumber"; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -26789,24 +21784,24 @@ info-libiberty: \
                  info) \
          || exit 1
 
-@endif libiberty
+@endif libdecnumber
 
-.PHONY: maybe-dvi-libiberty dvi-libiberty
-maybe-dvi-libiberty:
-@if libiberty
-maybe-dvi-libiberty: dvi-libiberty
+.PHONY: maybe-dvi-libdecnumber dvi-libdecnumber
+maybe-dvi-libdecnumber:
+@if libdecnumber
+maybe-dvi-libdecnumber: dvi-libdecnumber
 
-dvi-libiberty: \
-    configure-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+dvi-libdecnumber: \
+    configure-libdecnumber 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in libiberty" ; \
-       (cd $(HOST_SUBDIR)/libiberty && \
+       echo "Doing dvi in libdecnumber"; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -26814,24 +21809,24 @@ dvi-libiberty: \
                  dvi) \
          || exit 1
 
-@endif libiberty
+@endif libdecnumber
 
-.PHONY: maybe-pdf-libiberty pdf-libiberty
-maybe-pdf-libiberty:
-@if libiberty
-maybe-pdf-libiberty: pdf-libiberty
+.PHONY: maybe-pdf-libdecnumber pdf-libdecnumber
+maybe-pdf-libdecnumber:
+@if libdecnumber
+maybe-pdf-libdecnumber: pdf-libdecnumber
 
-pdf-libiberty: \
-    configure-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+pdf-libdecnumber: \
+    configure-libdecnumber 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in libiberty" ; \
-       (cd $(HOST_SUBDIR)/libiberty && \
+       echo "Doing pdf in libdecnumber"; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -26839,24 +21834,24 @@ pdf-libiberty: \
                  pdf) \
          || exit 1
 
-@endif libiberty
+@endif libdecnumber
 
-.PHONY: maybe-html-libiberty html-libiberty
-maybe-html-libiberty:
-@if libiberty
-maybe-html-libiberty: html-libiberty
+.PHONY: maybe-html-libdecnumber html-libdecnumber
+maybe-html-libdecnumber:
+@if libdecnumber
+maybe-html-libdecnumber: html-libdecnumber
 
-html-libiberty: \
-    configure-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+html-libdecnumber: \
+    configure-libdecnumber 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in libiberty" ; \
-       (cd $(HOST_SUBDIR)/libiberty && \
+       echo "Doing html in libdecnumber"; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -26864,24 +21859,24 @@ html-libiberty: \
                  html) \
          || exit 1
 
-@endif libiberty
+@endif libdecnumber
 
-.PHONY: maybe-TAGS-libiberty TAGS-libiberty
-maybe-TAGS-libiberty:
-@if libiberty
-maybe-TAGS-libiberty: TAGS-libiberty
+.PHONY: maybe-TAGS-libdecnumber TAGS-libdecnumber
+maybe-TAGS-libdecnumber:
+@if libdecnumber
+maybe-TAGS-libdecnumber: TAGS-libdecnumber
 
-TAGS-libiberty: \
-    configure-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+TAGS-libdecnumber: \
+    configure-libdecnumber 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in libiberty" ; \
-       (cd $(HOST_SUBDIR)/libiberty && \
+       echo "Doing TAGS in libdecnumber"; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -26889,25 +21884,25 @@ TAGS-libiberty: \
                  TAGS) \
          || exit 1
 
-@endif libiberty
+@endif libdecnumber
 
-.PHONY: maybe-install-info-libiberty install-info-libiberty
-maybe-install-info-libiberty:
-@if libiberty
-maybe-install-info-libiberty: install-info-libiberty
+.PHONY: maybe-install-info-libdecnumber install-info-libdecnumber
+maybe-install-info-libdecnumber:
+@if libdecnumber
+maybe-install-info-libdecnumber: install-info-libdecnumber
 
-install-info-libiberty: \
-    configure-libiberty \
-    info-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+install-info-libdecnumber: \
+    configure-libdecnumber \
+    info-libdecnumber 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in libiberty" ; \
-       (cd $(HOST_SUBDIR)/libiberty && \
+       echo "Doing install-info in libdecnumber"; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -26915,25 +21910,25 @@ install-info-libiberty: \
                  install-info) \
          || exit 1
 
-@endif libiberty
+@endif libdecnumber
 
-.PHONY: maybe-install-pdf-libiberty install-pdf-libiberty
-maybe-install-pdf-libiberty:
-@if libiberty
-maybe-install-pdf-libiberty: install-pdf-libiberty
+.PHONY: maybe-install-pdf-libdecnumber install-pdf-libdecnumber
+maybe-install-pdf-libdecnumber:
+@if libdecnumber
+maybe-install-pdf-libdecnumber: install-pdf-libdecnumber
 
-install-pdf-libiberty: \
-    configure-libiberty \
-    pdf-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+install-pdf-libdecnumber: \
+    configure-libdecnumber \
+    pdf-libdecnumber 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in libiberty" ; \
-       (cd $(HOST_SUBDIR)/libiberty && \
+       echo "Doing install-pdf in libdecnumber"; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -26941,25 +21936,25 @@ install-pdf-libiberty: \
                  install-pdf) \
          || exit 1
 
-@endif libiberty
+@endif libdecnumber
 
-.PHONY: maybe-install-html-libiberty install-html-libiberty
-maybe-install-html-libiberty:
-@if libiberty
-maybe-install-html-libiberty: install-html-libiberty
+.PHONY: maybe-install-html-libdecnumber install-html-libdecnumber
+maybe-install-html-libdecnumber:
+@if libdecnumber
+maybe-install-html-libdecnumber: install-html-libdecnumber
 
-install-html-libiberty: \
-    configure-libiberty \
-    html-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+install-html-libdecnumber: \
+    configure-libdecnumber \
+    html-libdecnumber 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in libiberty" ; \
-       (cd $(HOST_SUBDIR)/libiberty && \
+       echo "Doing install-html in libdecnumber"; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -26967,24 +21962,24 @@ install-html-libiberty: \
                  install-html) \
          || exit 1
 
-@endif libiberty
+@endif libdecnumber
 
-.PHONY: maybe-installcheck-libiberty installcheck-libiberty
-maybe-installcheck-libiberty:
-@if libiberty
-maybe-installcheck-libiberty: installcheck-libiberty
+.PHONY: maybe-installcheck-libdecnumber installcheck-libdecnumber
+maybe-installcheck-libdecnumber:
+@if libdecnumber
+maybe-installcheck-libdecnumber: installcheck-libdecnumber
 
-installcheck-libiberty: \
-    configure-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+installcheck-libdecnumber: \
+    configure-libdecnumber 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in libiberty" ; \
-       (cd $(HOST_SUBDIR)/libiberty && \
+       echo "Doing installcheck in libdecnumber"; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -26992,23 +21987,23 @@ installcheck-libiberty: \
                  installcheck) \
          || exit 1
 
-@endif libiberty
+@endif libdecnumber
 
-.PHONY: maybe-mostlyclean-libiberty mostlyclean-libiberty
-maybe-mostlyclean-libiberty:
-@if libiberty
-maybe-mostlyclean-libiberty: mostlyclean-libiberty
+.PHONY: maybe-mostlyclean-libdecnumber mostlyclean-libdecnumber
+maybe-mostlyclean-libdecnumber:
+@if libdecnumber
+maybe-mostlyclean-libdecnumber: mostlyclean-libdecnumber
 
-mostlyclean-libiberty: 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+mostlyclean-libdecnumber: 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in libiberty" ; \
-       (cd $(HOST_SUBDIR)/libiberty && \
+       echo "Doing mostlyclean in libdecnumber"; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -27016,23 +22011,23 @@ mostlyclean-libiberty:
                  mostlyclean) \
          || exit 1
 
-@endif libiberty
+@endif libdecnumber
 
-.PHONY: maybe-clean-libiberty clean-libiberty
-maybe-clean-libiberty:
-@if libiberty
-maybe-clean-libiberty: clean-libiberty
+.PHONY: maybe-clean-libdecnumber clean-libdecnumber
+maybe-clean-libdecnumber:
+@if libdecnumber
+maybe-clean-libdecnumber: clean-libdecnumber
 
-clean-libiberty: 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+clean-libdecnumber: 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in libiberty" ; \
-       (cd $(HOST_SUBDIR)/libiberty && \
+       echo "Doing clean in libdecnumber"; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -27040,23 +22035,23 @@ clean-libiberty:
                  clean) \
          || exit 1
 
-@endif libiberty
+@endif libdecnumber
 
-.PHONY: maybe-distclean-libiberty distclean-libiberty
-maybe-distclean-libiberty:
-@if libiberty
-maybe-distclean-libiberty: distclean-libiberty
+.PHONY: maybe-distclean-libdecnumber distclean-libdecnumber
+maybe-distclean-libdecnumber:
+@if libdecnumber
+maybe-distclean-libdecnumber: distclean-libdecnumber
 
-distclean-libiberty: 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+distclean-libdecnumber: 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in libiberty" ; \
-       (cd $(HOST_SUBDIR)/libiberty && \
+       echo "Doing distclean in libdecnumber"; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -27064,23 +22059,23 @@ distclean-libiberty:
                  distclean) \
          || exit 1
 
-@endif libiberty
+@endif libdecnumber
 
-.PHONY: maybe-maintainer-clean-libiberty maintainer-clean-libiberty
-maybe-maintainer-clean-libiberty:
-@if libiberty
-maybe-maintainer-clean-libiberty: maintainer-clean-libiberty
+.PHONY: maybe-maintainer-clean-libdecnumber maintainer-clean-libdecnumber
+maybe-maintainer-clean-libdecnumber:
+@if libdecnumber
+maybe-maintainer-clean-libdecnumber: maintainer-clean-libdecnumber
 
-maintainer-clean-libiberty: 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+maintainer-clean-libdecnumber: 
+       @[ -f ./libdecnumber/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in libiberty" ; \
-       (cd $(HOST_SUBDIR)/libiberty && \
+       echo "Doing maintainer-clean in libdecnumber"; \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -27088,113 +22083,129 @@ maintainer-clean-libiberty:
                  maintainer-clean) \
          || exit 1
 
-@endif libiberty
+@endif libdecnumber
 
 
 
-.PHONY: configure-libtool maybe-configure-libtool
-maybe-configure-libtool:
+.PHONY: configure-libgui maybe-configure-libgui
+maybe-configure-libgui:
 @if gcc-bootstrap
-configure-libtool: stage_current
+configure-libgui: stage_current
 @endif gcc-bootstrap
-@if libtool
-maybe-configure-libtool: configure-libtool
-configure-libtool: 
+@if libgui
+maybe-configure-libgui: configure-libgui
+configure-libgui: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/libtool/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtool ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/libtool; \
-       cd "$(HOST_SUBDIR)/libtool" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/libgui/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/libgui; \
+       cd "$(HOST_SUBDIR)/libgui" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libtool/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libgui/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libtool"; \
-       libsrcdir="$$s/libtool"; \
-       $(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 libtool
+@endif libgui
+
+
+
+
+
+.PHONY: all-libgui maybe-all-libgui
+maybe-all-libgui:
+@if gcc-bootstrap
+all-libgui: stage_current
+@endif gcc-bootstrap
+@if libgui
+TARGET-libgui=all
+maybe-all-libgui: all-libgui
+all-libgui: configure-libgui
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-libgui))
+@endif libgui
 
 
 
 
+.PHONY: check-libgui maybe-check-libgui
+maybe-check-libgui:
+@if libgui
+maybe-check-libgui: check-libgui
 
-.PHONY: all-libtool maybe-all-libtool
-maybe-all-libtool:
-@if gcc-bootstrap
-all-libtool: stage_current
-@endif gcc-bootstrap
-@if libtool
-TARGET-libtool=all
-maybe-all-libtool: all-libtool
-all-libtool: configure-libtool
+check-libgui:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libtool && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-libtool))
-@endif libtool
-
-
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
 
+@endif libgui
 
-.PHONY: check-libtool maybe-check-libtool
-maybe-check-libtool:
-@if libtool
-maybe-check-libtool: check-libtool
+.PHONY: install-libgui maybe-install-libgui
+maybe-install-libgui:
+@if libgui
+maybe-install-libgui: install-libgui
 
-check-libtool:
+install-libgui: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libtool && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif libtool
+@endif libgui
 
-.PHONY: install-libtool maybe-install-libtool
-maybe-install-libtool:
-@if libtool
-maybe-install-libtool: install-libtool
+.PHONY: install-strip-libgui maybe-install-strip-libgui
+maybe-install-strip-libgui:
+@if libgui
+maybe-install-strip-libgui: install-strip-libgui
 
-install-libtool: installdirs
+install-strip-libgui: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libtool && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+       (cd $(HOST_SUBDIR)/libgui && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif libtool
+@endif libgui
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-libtool info-libtool
-maybe-info-libtool:
-@if libtool
-maybe-info-libtool: info-libtool
+.PHONY: maybe-info-libgui info-libgui
+maybe-info-libgui:
+@if libgui
+maybe-info-libgui: info-libgui
 
-info-libtool: \
-    configure-libtool 
+info-libgui: \
+    configure-libgui 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/Makefile ] || exit 0; \
+       @[ -f ./libgui/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       echo "Doing info in libgui"; \
+       (cd $(HOST_SUBDIR)/libgui && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -27202,25 +22213,25 @@ info-libtool: \
                  info) \
          || exit 1
 
-@endif libtool
+@endif libgui
 
-.PHONY: maybe-dvi-libtool dvi-libtool
-maybe-dvi-libtool:
-@if libtool
-maybe-dvi-libtool: dvi-libtool
+.PHONY: maybe-dvi-libgui dvi-libgui
+maybe-dvi-libgui:
+@if libgui
+maybe-dvi-libgui: dvi-libgui
 
-dvi-libtool: \
-    configure-libtool 
+dvi-libgui: \
+    configure-libgui 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/Makefile ] || exit 0; \
+       @[ -f ./libgui/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       echo "Doing dvi in libgui"; \
+       (cd $(HOST_SUBDIR)/libgui && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -27228,25 +22239,25 @@ dvi-libtool: \
                  dvi) \
          || exit 1
 
-@endif libtool
+@endif libgui
 
-.PHONY: maybe-pdf-libtool pdf-libtool
-maybe-pdf-libtool:
-@if libtool
-maybe-pdf-libtool: pdf-libtool
+.PHONY: maybe-pdf-libgui pdf-libgui
+maybe-pdf-libgui:
+@if libgui
+maybe-pdf-libgui: pdf-libgui
 
-pdf-libtool: \
-    configure-libtool 
+pdf-libgui: \
+    configure-libgui 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/Makefile ] || exit 0; \
+       @[ -f ./libgui/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       echo "Doing pdf in libgui"; \
+       (cd $(HOST_SUBDIR)/libgui && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -27254,25 +22265,25 @@ pdf-libtool: \
                  pdf) \
          || exit 1
 
-@endif libtool
+@endif libgui
 
-.PHONY: maybe-html-libtool html-libtool
-maybe-html-libtool:
-@if libtool
-maybe-html-libtool: html-libtool
+.PHONY: maybe-html-libgui html-libgui
+maybe-html-libgui:
+@if libgui
+maybe-html-libgui: html-libgui
 
-html-libtool: \
-    configure-libtool 
+html-libgui: \
+    configure-libgui 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/Makefile ] || exit 0; \
+       @[ -f ./libgui/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       echo "Doing html in libgui"; \
+       (cd $(HOST_SUBDIR)/libgui && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -27280,25 +22291,25 @@ html-libtool: \
                  html) \
          || exit 1
 
-@endif libtool
+@endif libgui
 
-.PHONY: maybe-TAGS-libtool TAGS-libtool
-maybe-TAGS-libtool:
-@if libtool
-maybe-TAGS-libtool: TAGS-libtool
+.PHONY: maybe-TAGS-libgui TAGS-libgui
+maybe-TAGS-libgui:
+@if libgui
+maybe-TAGS-libgui: TAGS-libgui
 
-TAGS-libtool: \
-    configure-libtool 
+TAGS-libgui: \
+    configure-libgui 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/Makefile ] || exit 0; \
+       @[ -f ./libgui/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       echo "Doing TAGS in libgui"; \
+       (cd $(HOST_SUBDIR)/libgui && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -27306,26 +22317,26 @@ TAGS-libtool: \
                  TAGS) \
          || exit 1
 
-@endif libtool
+@endif libgui
 
-.PHONY: maybe-install-info-libtool install-info-libtool
-maybe-install-info-libtool:
-@if libtool
-maybe-install-info-libtool: install-info-libtool
+.PHONY: maybe-install-info-libgui install-info-libgui
+maybe-install-info-libgui:
+@if libgui
+maybe-install-info-libgui: install-info-libgui
 
-install-info-libtool: \
-    configure-libtool \
-    info-libtool 
+install-info-libgui: \
+    configure-libgui \
+    info-libgui 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/Makefile ] || exit 0; \
+       @[ -f ./libgui/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       echo "Doing install-info in libgui"; \
+       (cd $(HOST_SUBDIR)/libgui && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -27333,26 +22344,26 @@ install-info-libtool: \
                  install-info) \
          || exit 1
 
-@endif libtool
+@endif libgui
 
-.PHONY: maybe-install-pdf-libtool install-pdf-libtool
-maybe-install-pdf-libtool:
-@if libtool
-maybe-install-pdf-libtool: install-pdf-libtool
+.PHONY: maybe-install-pdf-libgui install-pdf-libgui
+maybe-install-pdf-libgui:
+@if libgui
+maybe-install-pdf-libgui: install-pdf-libgui
 
-install-pdf-libtool: \
-    configure-libtool \
-    pdf-libtool 
+install-pdf-libgui: \
+    configure-libgui \
+    pdf-libgui 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/Makefile ] || exit 0; \
+       @[ -f ./libgui/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       echo "Doing install-pdf in libgui"; \
+       (cd $(HOST_SUBDIR)/libgui && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -27360,26 +22371,26 @@ install-pdf-libtool: \
                  install-pdf) \
          || exit 1
 
-@endif libtool
+@endif libgui
 
-.PHONY: maybe-install-html-libtool install-html-libtool
-maybe-install-html-libtool:
-@if libtool
-maybe-install-html-libtool: install-html-libtool
+.PHONY: maybe-install-html-libgui install-html-libgui
+maybe-install-html-libgui:
+@if libgui
+maybe-install-html-libgui: install-html-libgui
 
-install-html-libtool: \
-    configure-libtool \
-    html-libtool 
+install-html-libgui: \
+    configure-libgui \
+    html-libgui 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/Makefile ] || exit 0; \
+       @[ -f ./libgui/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       echo "Doing install-html in libgui"; \
+       (cd $(HOST_SUBDIR)/libgui && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -27387,25 +22398,25 @@ install-html-libtool: \
                  install-html) \
          || exit 1
 
-@endif libtool
+@endif libgui
 
-.PHONY: maybe-installcheck-libtool installcheck-libtool
-maybe-installcheck-libtool:
-@if libtool
-maybe-installcheck-libtool: installcheck-libtool
+.PHONY: maybe-installcheck-libgui installcheck-libgui
+maybe-installcheck-libgui:
+@if libgui
+maybe-installcheck-libgui: installcheck-libgui
 
-installcheck-libtool: \
-    configure-libtool 
+installcheck-libgui: \
+    configure-libgui 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/Makefile ] || exit 0; \
+       @[ -f ./libgui/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       echo "Doing installcheck in libgui"; \
+       (cd $(HOST_SUBDIR)/libgui && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -27413,24 +22424,24 @@ installcheck-libtool: \
                  installcheck) \
          || exit 1
 
-@endif libtool
+@endif libgui
 
-.PHONY: maybe-mostlyclean-libtool mostlyclean-libtool
-maybe-mostlyclean-libtool:
-@if libtool
-maybe-mostlyclean-libtool: mostlyclean-libtool
+.PHONY: maybe-mostlyclean-libgui mostlyclean-libgui
+maybe-mostlyclean-libgui:
+@if libgui
+maybe-mostlyclean-libgui: mostlyclean-libgui
 
-mostlyclean-libtool: 
+mostlyclean-libgui: 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/Makefile ] || exit 0; \
+       @[ -f ./libgui/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       echo "Doing mostlyclean in libgui"; \
+       (cd $(HOST_SUBDIR)/libgui && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -27438,24 +22449,24 @@ mostlyclean-libtool:
                  mostlyclean) \
          || exit 1
 
-@endif libtool
+@endif libgui
 
-.PHONY: maybe-clean-libtool clean-libtool
-maybe-clean-libtool:
-@if libtool
-maybe-clean-libtool: clean-libtool
+.PHONY: maybe-clean-libgui clean-libgui
+maybe-clean-libgui:
+@if libgui
+maybe-clean-libgui: clean-libgui
 
-clean-libtool: 
+clean-libgui: 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/Makefile ] || exit 0; \
+       @[ -f ./libgui/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       echo "Doing clean in libgui"; \
+       (cd $(HOST_SUBDIR)/libgui && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -27463,24 +22474,24 @@ clean-libtool:
                  clean) \
          || exit 1
 
-@endif libtool
+@endif libgui
 
-.PHONY: maybe-distclean-libtool distclean-libtool
-maybe-distclean-libtool:
-@if libtool
-maybe-distclean-libtool: distclean-libtool
+.PHONY: maybe-distclean-libgui distclean-libgui
+maybe-distclean-libgui:
+@if libgui
+maybe-distclean-libgui: distclean-libgui
 
-distclean-libtool: 
+distclean-libgui: 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/Makefile ] || exit 0; \
+       @[ -f ./libgui/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       echo "Doing distclean in libgui"; \
+       (cd $(HOST_SUBDIR)/libgui && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -27488,24 +22499,24 @@ distclean-libtool:
                  distclean) \
          || exit 1
 
-@endif libtool
+@endif libgui
 
-.PHONY: maybe-maintainer-clean-libtool maintainer-clean-libtool
-maybe-maintainer-clean-libtool:
-@if libtool
-maybe-maintainer-clean-libtool: maintainer-clean-libtool
+.PHONY: maybe-maintainer-clean-libgui maintainer-clean-libgui
+maybe-maintainer-clean-libgui:
+@if libgui
+maybe-maintainer-clean-libgui: maintainer-clean-libgui
 
-maintainer-clean-libtool: 
+maintainer-clean-libgui: 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/Makefile ] || exit 0; \
+       @[ -f ./libgui/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       echo "Doing maintainer-clean in libgui"; \
+       (cd $(HOST_SUBDIR)/libgui && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -27513,538 +22524,586 @@ maintainer-clean-libtool:
                  maintainer-clean) \
          || exit 1
 
-@endif libtool
+@endif libgui
 
 
 
-.PHONY: configure-m4 maybe-configure-m4
-maybe-configure-m4:
+.PHONY: configure-libiberty maybe-configure-libiberty
+maybe-configure-libiberty:
 @if gcc-bootstrap
-configure-m4: stage_current
+configure-libiberty: stage_current
 @endif gcc-bootstrap
-@if m4
-maybe-configure-m4: configure-m4
-configure-m4: 
-       @: $(MAKE); $(unstage)
+@if libiberty
+maybe-configure-libiberty: configure-libiberty
+configure-libiberty: 
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/m4/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/m4 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/m4; \
-       cd "$(HOST_SUBDIR)/m4" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/libiberty; \
+       cd "$(HOST_SUBDIR)/libiberty" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/m4/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/m4"; \
-       libsrcdir="$$s/m4"; \
-       $(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} @extra_host_libiberty_configure_flags@ \
          || exit 1
-@endif m4
-
-
+@endif libiberty
 
 
 
-.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)
+.PHONY: configure-stage1-libiberty maybe-configure-stage1-libiberty
+maybe-configure-stage1-libiberty:
+@if libiberty-bootstrap
+maybe-configure-stage1-libiberty: configure-stage1-libiberty
+configure-stage1-libiberty:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/m4 && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-m4))
-@endif m4
-
-
-
-
-.PHONY: check-m4 maybe-check-m4
-maybe-check-m4:
-@if m4
-maybe-check-m4: check-m4
+       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; \
+       cd $(HOST_SUBDIR)/libiberty || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@
+@endif libiberty-bootstrap
 
-check-m4:
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage2-libiberty maybe-configure-stage2-libiberty
+maybe-configure-stage2-libiberty:
+@if libiberty-bootstrap
+maybe-configure-stage2-libiberty: configure-stage2-libiberty
+configure-stage2-libiberty:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
        $(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
+       $(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; \
+       $(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; \
+       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@
+@endif libiberty-bootstrap
 
-install-m4: installdirs
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage3-libiberty maybe-configure-stage3-libiberty
+maybe-configure-stage3-libiberty:
+@if libiberty-bootstrap
+maybe-configure-stage3-libiberty: configure-stage3-libiberty
+configure-stage3-libiberty:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/m4 && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@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
+       $(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; \
+       $(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; \
+       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@
+@endif libiberty-bootstrap
 
-html-m4: \
-    configure-m4 
-       @: $(MAKE); $(unstage)
-       @[ -f ./m4/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: configure-stage4-libiberty maybe-configure-stage4-libiberty
+maybe-configure-stage4-libiberty:
+@if libiberty-bootstrap
+maybe-configure-stage4-libiberty: configure-stage4-libiberty
+configure-stage4-libiberty:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing 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
+       $(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; \
+       $(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; \
+       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@
+@endif libiberty-bootstrap
 
-TAGS-m4: \
-    configure-m4 
-       @: $(MAKE); $(unstage)
-       @[ -f ./m4/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: configure-stageprofile-libiberty maybe-configure-stageprofile-libiberty
+maybe-configure-stageprofile-libiberty:
+@if libiberty-bootstrap
+maybe-configure-stageprofile-libiberty: configure-stageprofile-libiberty
+configure-stageprofile-libiberty:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing 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
+       $(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; \
+       $(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; \
+       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@
+@endif libiberty-bootstrap
 
-install-info-m4: \
-    configure-m4 \
-    info-m4 
-       @: $(MAKE); $(unstage)
-       @[ -f ./m4/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty
+maybe-configure-stagefeedback-libiberty:
+@if libiberty-bootstrap
+maybe-configure-stagefeedback-libiberty: configure-stagefeedback-libiberty
+configure-stagefeedback-libiberty:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing 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
+       $(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; \
+       $(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; \
+       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@
+@endif libiberty-bootstrap
 
-.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; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 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-html) \
-         || exit 1
+.PHONY: all-libiberty maybe-all-libiberty
+maybe-all-libiberty:
+@if gcc-bootstrap
+all-libiberty: stage_current
+@endif gcc-bootstrap
+@if libiberty
+TARGET-libiberty=all
+maybe-all-libiberty: all-libiberty
+all-libiberty: configure-libiberty
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libiberty && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-libiberty))
+@endif libiberty
 
-@endif m4
 
-.PHONY: maybe-installcheck-m4 installcheck-m4
-maybe-installcheck-m4:
-@if m4
-maybe-installcheck-m4: installcheck-m4
 
-installcheck-m4: \
-    configure-m4 
-       @: $(MAKE); $(unstage)
-       @[ -f ./m4/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stage1-libiberty maybe-all-stage1-libiberty
+.PHONY: clean-stage1-libiberty maybe-clean-stage1-libiberty
+maybe-all-stage1-libiberty:
+maybe-clean-stage1-libiberty:
+@if libiberty-bootstrap
+maybe-all-stage1-libiberty: all-stage1-libiberty
+all-stage1: all-stage1-libiberty
+TARGET-stage1-libiberty = $(TARGET-libiberty)
+all-stage1-libiberty: configure-stage1-libiberty
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing installcheck 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}" \
-                 installcheck) \
-         || exit 1
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty && \
+        \
+       $(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-libiberty)
 
-@endif m4
+maybe-clean-stage1-libiberty: clean-stage1-libiberty
+clean-stage1: clean-stage1-libiberty
+clean-stage1-libiberty:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-libiberty/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif libiberty-bootstrap
 
-.PHONY: maybe-mostlyclean-m4 mostlyclean-m4
-maybe-mostlyclean-m4:
-@if m4
-maybe-mostlyclean-m4: mostlyclean-m4
 
-mostlyclean-m4: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./m4/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stage2-libiberty maybe-all-stage2-libiberty
+.PHONY: clean-stage2-libiberty maybe-clean-stage2-libiberty
+maybe-all-stage2-libiberty:
+maybe-clean-stage2-libiberty:
+@if libiberty-bootstrap
+maybe-all-stage2-libiberty: all-stage2-libiberty
+all-stage2: all-stage2-libiberty
+TARGET-stage2-libiberty = $(TARGET-libiberty)
+all-stage2-libiberty: configure-stage2-libiberty
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 mostlyclean) \
-         || exit 1
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty && \
+        \
+       $(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-libiberty)
 
-@endif m4
+maybe-clean-stage2-libiberty: clean-stage2-libiberty
+clean-stage2: clean-stage2-libiberty
+clean-stage2-libiberty:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-libiberty/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libiberty-bootstrap
 
-.PHONY: maybe-clean-m4 clean-m4
-maybe-clean-m4:
-@if m4
-maybe-clean-m4: clean-m4
 
-clean-m4: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./m4/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stage3-libiberty maybe-all-stage3-libiberty
+.PHONY: clean-stage3-libiberty maybe-clean-stage3-libiberty
+maybe-all-stage3-libiberty:
+maybe-clean-stage3-libiberty:
+@if libiberty-bootstrap
+maybe-all-stage3-libiberty: all-stage3-libiberty
+all-stage3: all-stage3-libiberty
+TARGET-stage3-libiberty = $(TARGET-libiberty)
+all-stage3-libiberty: configure-stage3-libiberty
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 clean) \
-         || exit 1
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty && \
+        \
+       $(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-libiberty)
 
-@endif m4
+maybe-clean-stage3-libiberty: clean-stage3-libiberty
+clean-stage3: clean-stage3-libiberty
+clean-stage3-libiberty:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-libiberty/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libiberty-bootstrap
 
-.PHONY: maybe-distclean-m4 distclean-m4
-maybe-distclean-m4:
-@if m4
-maybe-distclean-m4: distclean-m4
 
-distclean-m4: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./m4/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stage4-libiberty maybe-all-stage4-libiberty
+.PHONY: clean-stage4-libiberty maybe-clean-stage4-libiberty
+maybe-all-stage4-libiberty:
+maybe-clean-stage4-libiberty:
+@if libiberty-bootstrap
+maybe-all-stage4-libiberty: all-stage4-libiberty
+all-stage4: all-stage4-libiberty
+TARGET-stage4-libiberty = $(TARGET-libiberty)
+all-stage4-libiberty: configure-stage4-libiberty
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 distclean) \
-         || exit 1
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty && \
+        \
+       $(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-libiberty)
 
-@endif m4
+maybe-clean-stage4-libiberty: clean-stage4-libiberty
+clean-stage4: clean-stage4-libiberty
+clean-stage4-libiberty:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-libiberty/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libiberty-bootstrap
 
-.PHONY: maybe-maintainer-clean-m4 maintainer-clean-m4
-maybe-maintainer-clean-m4:
-@if m4
-maybe-maintainer-clean-m4: maintainer-clean-m4
 
-maintainer-clean-m4: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./m4/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stageprofile-libiberty maybe-all-stageprofile-libiberty
+.PHONY: clean-stageprofile-libiberty maybe-clean-stageprofile-libiberty
+maybe-all-stageprofile-libiberty:
+maybe-clean-stageprofile-libiberty:
+@if libiberty-bootstrap
+maybe-all-stageprofile-libiberty: all-stageprofile-libiberty
+all-stageprofile: all-stageprofile-libiberty
+TARGET-stageprofile-libiberty = $(TARGET-libiberty)
+all-stageprofile-libiberty: configure-stageprofile-libiberty
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
        $(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 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}" \
-                 maintainer-clean) \
-         || exit 1
-
-@endif m4
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty && \
+        \
+       $(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-libiberty)
 
+maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
+clean-stageprofile: clean-stageprofile-libiberty
+clean-stageprofile-libiberty:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-libiberty/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libiberty-bootstrap
 
 
-.PHONY: configure-make maybe-configure-make
-maybe-configure-make:
-@if gcc-bootstrap
-configure-make: stage_current
-@endif gcc-bootstrap
-@if make
-maybe-configure-make: configure-make
-configure-make: 
-       @: $(MAKE); $(unstage)
+.PHONY: all-stagefeedback-libiberty maybe-all-stagefeedback-libiberty
+.PHONY: clean-stagefeedback-libiberty maybe-clean-stagefeedback-libiberty
+maybe-all-stagefeedback-libiberty:
+maybe-clean-stagefeedback-libiberty:
+@if libiberty-bootstrap
+maybe-all-stagefeedback-libiberty: all-stagefeedback-libiberty
+all-stagefeedback: all-stagefeedback-libiberty
+TARGET-stagefeedback-libiberty = $(TARGET-libiberty)
+all-stagefeedback-libiberty: configure-stagefeedback-libiberty
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/make/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/make ; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/make; \
-       cd "$(HOST_SUBDIR)/make" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/make/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/make"; \
-       libsrcdir="$$s/make"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif make
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiberty && \
+        \
+       $(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-libiberty)
+
+maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
+clean-stagefeedback: clean-stagefeedback-libiberty
+clean-stagefeedback-libiberty:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-libiberty/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiberty && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libiberty-bootstrap
 
 
 
 
 
-.PHONY: all-make maybe-all-make
-maybe-all-make:
-@if gcc-bootstrap
-all-make: stage_current
-@endif gcc-bootstrap
-@if make
-TARGET-make=all
-maybe-all-make: all-make
-all-make: configure-make
+.PHONY: check-libiberty maybe-check-libiberty
+maybe-check-libiberty:
+@if libiberty
+maybe-check-libiberty: check-libiberty
+
+check-libiberty:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/make && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-make))
-@endif make
-
-
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libiberty && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
+@endif libiberty
 
-.PHONY: check-make maybe-check-make
-maybe-check-make:
-@if make
-maybe-check-make: check-make
+.PHONY: install-libiberty maybe-install-libiberty
+maybe-install-libiberty:
+@if libiberty
+maybe-install-libiberty: install-libiberty
 
-check-make:
+install-libiberty: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/make && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       (cd $(HOST_SUBDIR)/libiberty && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif make
+@endif libiberty
 
-.PHONY: install-make maybe-install-make
-maybe-install-make:
-@if make
-maybe-install-make: install-make
+.PHONY: install-strip-libiberty maybe-install-strip-libiberty
+maybe-install-strip-libiberty:
+@if libiberty
+maybe-install-strip-libiberty: install-strip-libiberty
 
-install-make: installdirs
+install-strip-libiberty: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/make && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+       (cd $(HOST_SUBDIR)/libiberty && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif make
+@endif libiberty
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-make info-make
-maybe-info-make:
-@if make
-maybe-info-make: info-make
+.PHONY: maybe-info-libiberty info-libiberty
+maybe-info-libiberty:
+@if libiberty
+maybe-info-libiberty: info-libiberty
 
-info-make: \
-    configure-make 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
+info-libiberty: \
+    configure-libiberty 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 make" ; \
-       (cd $(HOST_SUBDIR)/make && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -28052,25 +23111,24 @@ info-make: \
                  info) \
          || exit 1
 
-@endif make
+@endif libiberty
 
-.PHONY: maybe-dvi-make dvi-make
-maybe-dvi-make:
-@if make
-maybe-dvi-make: dvi-make
+.PHONY: maybe-dvi-libiberty dvi-libiberty
+maybe-dvi-libiberty:
+@if libiberty
+maybe-dvi-libiberty: dvi-libiberty
 
-dvi-make: \
-    configure-make 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
+dvi-libiberty: \
+    configure-libiberty 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 make" ; \
-       (cd $(HOST_SUBDIR)/make && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -28078,25 +23136,24 @@ dvi-make: \
                  dvi) \
          || exit 1
 
-@endif make
+@endif libiberty
 
-.PHONY: maybe-pdf-make pdf-make
-maybe-pdf-make:
-@if make
-maybe-pdf-make: pdf-make
+.PHONY: maybe-pdf-libiberty pdf-libiberty
+maybe-pdf-libiberty:
+@if libiberty
+maybe-pdf-libiberty: pdf-libiberty
 
-pdf-make: \
-    configure-make 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
+pdf-libiberty: \
+    configure-libiberty 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 make" ; \
-       (cd $(HOST_SUBDIR)/make && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -28104,25 +23161,24 @@ pdf-make: \
                  pdf) \
          || exit 1
 
-@endif make
+@endif libiberty
 
-.PHONY: maybe-html-make html-make
-maybe-html-make:
-@if make
-maybe-html-make: html-make
+.PHONY: maybe-html-libiberty html-libiberty
+maybe-html-libiberty:
+@if libiberty
+maybe-html-libiberty: html-libiberty
 
-html-make: \
-    configure-make 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
+html-libiberty: \
+    configure-libiberty 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 make" ; \
-       (cd $(HOST_SUBDIR)/make && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -28130,25 +23186,24 @@ html-make: \
                  html) \
          || exit 1
 
-@endif make
+@endif libiberty
 
-.PHONY: maybe-TAGS-make TAGS-make
-maybe-TAGS-make:
-@if make
-maybe-TAGS-make: TAGS-make
+.PHONY: maybe-TAGS-libiberty TAGS-libiberty
+maybe-TAGS-libiberty:
+@if libiberty
+maybe-TAGS-libiberty: TAGS-libiberty
 
-TAGS-make: \
-    configure-make 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
+TAGS-libiberty: \
+    configure-libiberty 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 make" ; \
-       (cd $(HOST_SUBDIR)/make && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -28156,26 +23211,25 @@ TAGS-make: \
                  TAGS) \
          || exit 1
 
-@endif make
+@endif libiberty
 
-.PHONY: maybe-install-info-make install-info-make
-maybe-install-info-make:
-@if make
-maybe-install-info-make: install-info-make
+.PHONY: maybe-install-info-libiberty install-info-libiberty
+maybe-install-info-libiberty:
+@if libiberty
+maybe-install-info-libiberty: install-info-libiberty
 
-install-info-make: \
-    configure-make \
-    info-make 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
+install-info-libiberty: \
+    configure-libiberty \
+    info-libiberty 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 make" ; \
-       (cd $(HOST_SUBDIR)/make && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -28183,26 +23237,25 @@ install-info-make: \
                  install-info) \
          || exit 1
 
-@endif make
+@endif libiberty
 
-.PHONY: maybe-install-pdf-make install-pdf-make
-maybe-install-pdf-make:
-@if make
-maybe-install-pdf-make: install-pdf-make
+.PHONY: maybe-install-pdf-libiberty install-pdf-libiberty
+maybe-install-pdf-libiberty:
+@if libiberty
+maybe-install-pdf-libiberty: install-pdf-libiberty
 
-install-pdf-make: \
-    configure-make \
-    pdf-make 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
+install-pdf-libiberty: \
+    configure-libiberty \
+    pdf-libiberty 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 make" ; \
-       (cd $(HOST_SUBDIR)/make && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -28210,26 +23263,25 @@ install-pdf-make: \
                  install-pdf) \
          || exit 1
 
-@endif make
+@endif libiberty
 
-.PHONY: maybe-install-html-make install-html-make
-maybe-install-html-make:
-@if make
-maybe-install-html-make: install-html-make
+.PHONY: maybe-install-html-libiberty install-html-libiberty
+maybe-install-html-libiberty:
+@if libiberty
+maybe-install-html-libiberty: install-html-libiberty
 
-install-html-make: \
-    configure-make \
-    html-make 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
+install-html-libiberty: \
+    configure-libiberty \
+    html-libiberty 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 make" ; \
-       (cd $(HOST_SUBDIR)/make && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -28237,25 +23289,24 @@ install-html-make: \
                  install-html) \
          || exit 1
 
-@endif make
+@endif libiberty
 
-.PHONY: maybe-installcheck-make installcheck-make
-maybe-installcheck-make:
-@if make
-maybe-installcheck-make: installcheck-make
+.PHONY: maybe-installcheck-libiberty installcheck-libiberty
+maybe-installcheck-libiberty:
+@if libiberty
+maybe-installcheck-libiberty: installcheck-libiberty
 
-installcheck-make: \
-    configure-make 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
+installcheck-libiberty: \
+    configure-libiberty 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 make" ; \
-       (cd $(HOST_SUBDIR)/make && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -28263,24 +23314,23 @@ installcheck-make: \
                  installcheck) \
          || exit 1
 
-@endif make
+@endif libiberty
 
-.PHONY: maybe-mostlyclean-make mostlyclean-make
-maybe-mostlyclean-make:
-@if make
-maybe-mostlyclean-make: mostlyclean-make
+.PHONY: maybe-mostlyclean-libiberty mostlyclean-libiberty
+maybe-mostlyclean-libiberty:
+@if libiberty
+maybe-mostlyclean-libiberty: mostlyclean-libiberty
 
-mostlyclean-make: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
+mostlyclean-libiberty: 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 make" ; \
-       (cd $(HOST_SUBDIR)/make && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -28288,24 +23338,23 @@ mostlyclean-make:
                  mostlyclean) \
          || exit 1
 
-@endif make
+@endif libiberty
 
-.PHONY: maybe-clean-make clean-make
-maybe-clean-make:
-@if make
-maybe-clean-make: clean-make
+.PHONY: maybe-clean-libiberty clean-libiberty
+maybe-clean-libiberty:
+@if libiberty
+maybe-clean-libiberty: clean-libiberty
 
-clean-make: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
+clean-libiberty: 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 make" ; \
-       (cd $(HOST_SUBDIR)/make && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -28313,24 +23362,23 @@ clean-make:
                  clean) \
          || exit 1
 
-@endif make
+@endif libiberty
 
-.PHONY: maybe-distclean-make distclean-make
-maybe-distclean-make:
-@if make
-maybe-distclean-make: distclean-make
+.PHONY: maybe-distclean-libiberty distclean-libiberty
+maybe-distclean-libiberty:
+@if libiberty
+maybe-distclean-libiberty: distclean-libiberty
 
-distclean-make: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
+distclean-libiberty: 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 make" ; \
-       (cd $(HOST_SUBDIR)/make && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -28338,132 +23386,610 @@ distclean-make:
                  distclean) \
          || exit 1
 
-@endif make
+@endif libiberty
 
-.PHONY: maybe-maintainer-clean-make maintainer-clean-make
-maybe-maintainer-clean-make:
-@if make
-maybe-maintainer-clean-make: maintainer-clean-make
+.PHONY: maybe-maintainer-clean-libiberty maintainer-clean-libiberty
+maybe-maintainer-clean-libiberty:
+@if libiberty
+maybe-maintainer-clean-libiberty: maintainer-clean-libiberty
 
-maintainer-clean-make: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
+maintainer-clean-libiberty: 
+       @[ -f ./libiberty/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 make" ; \
-       (cd $(HOST_SUBDIR)/make && \
-         $(MAKE) $(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 make
-
-
-
-.PHONY: configure-mmalloc maybe-configure-mmalloc
-maybe-configure-mmalloc:
-@if gcc-bootstrap
-configure-mmalloc: stage_current
-@endif gcc-bootstrap
-@if mmalloc
-maybe-configure-mmalloc: configure-mmalloc
-configure-mmalloc: 
-       @: $(MAKE); $(unstage)
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       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}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 maintainer-clean) \
+         || exit 1
+
+@endif libiberty
+
+
+
+.PHONY: configure-libiberty-linker-plugin maybe-configure-libiberty-linker-plugin
+maybe-configure-libiberty-linker-plugin:
+@if gcc-bootstrap
+configure-libiberty-linker-plugin: stage_current
+@endif gcc-bootstrap
+@if libiberty-linker-plugin
+maybe-configure-libiberty-linker-plugin: configure-libiberty-linker-plugin
+configure-libiberty-linker-plugin: 
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       cd "$(HOST_SUBDIR)/libiberty-linker-plugin" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiberty; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ \
+         || exit 1
+@endif libiberty-linker-plugin
+
+
+
+.PHONY: configure-stage1-libiberty-linker-plugin maybe-configure-stage1-libiberty-linker-plugin
+maybe-configure-stage1-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-configure-stage1-libiberty-linker-plugin: configure-stage1-libiberty-linker-plugin
+configure-stage1-libiberty-linker-plugin:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif libiberty-linker-plugin-bootstrap
+
+.PHONY: configure-stage2-libiberty-linker-plugin maybe-configure-stage2-libiberty-linker-plugin
+maybe-configure-stage2-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-configure-stage2-libiberty-linker-plugin: configure-stage2-libiberty-linker-plugin
+configure-stage2-libiberty-linker-plugin:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE2_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif libiberty-linker-plugin-bootstrap
+
+.PHONY: configure-stage3-libiberty-linker-plugin maybe-configure-stage3-libiberty-linker-plugin
+maybe-configure-stage3-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-configure-stage3-libiberty-linker-plugin: configure-stage3-libiberty-linker-plugin
+configure-stage3-libiberty-linker-plugin:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE3_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif libiberty-linker-plugin-bootstrap
+
+.PHONY: configure-stage4-libiberty-linker-plugin maybe-configure-stage4-libiberty-linker-plugin
+maybe-configure-stage4-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-configure-stage4-libiberty-linker-plugin: configure-stage4-libiberty-linker-plugin
+configure-stage4-libiberty-linker-plugin:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE4_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif libiberty-linker-plugin-bootstrap
+
+.PHONY: configure-stageprofile-libiberty-linker-plugin maybe-configure-stageprofile-libiberty-linker-plugin
+maybe-configure-stageprofile-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-configure-stageprofile-libiberty-linker-plugin: configure-stageprofile-libiberty-linker-plugin
+configure-stageprofile-libiberty-linker-plugin:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage profile in $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \
+       cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libiberty; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEprofile_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif libiberty-linker-plugin-bootstrap
+
+.PHONY: configure-stagefeedback-libiberty-linker-plugin maybe-configure-stagefeedback-libiberty-linker-plugin
+maybe-configure-stagefeedback-libiberty-linker-plugin:
+@if libiberty-linker-plugin-bootstrap
+maybe-configure-stagefeedback-libiberty-linker-plugin: configure-stagefeedback-libiberty-linker-plugin
+configure-stagefeedback-libiberty-linker-plugin:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/mmalloc/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mmalloc ; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/mmalloc; \
-       cd "$(HOST_SUBDIR)/mmalloc" || exit 1; \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/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)/mmalloc/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mmalloc"; \
-       libsrcdir="$$s/mmalloc"; \
-       $(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}  \
-         || exit 1
-@endif mmalloc
+         --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-mmalloc maybe-all-mmalloc
-maybe-all-mmalloc:
+.PHONY: all-libiberty-linker-plugin maybe-all-libiberty-linker-plugin
+maybe-all-libiberty-linker-plugin:
 @if gcc-bootstrap
-all-mmalloc: stage_current
+all-libiberty-linker-plugin: stage_current
 @endif gcc-bootstrap
-@if mmalloc
-TARGET-mmalloc=all
-maybe-all-mmalloc: all-mmalloc
-all-mmalloc: configure-mmalloc
-       @: $(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)/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) \
-       (cd $(HOST_SUBDIR)/mmalloc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-mmalloc))
-@endif mmalloc
+       $(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-mmalloc maybe-check-mmalloc
-maybe-check-mmalloc:
-@if mmalloc
-maybe-check-mmalloc: check-mmalloc
 
-check-mmalloc:
+.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) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ $(EXTRA_BOOTSTRAP_FLAGS) check)
 
-@endif mmalloc
+@endif libiberty-linker-plugin
 
-.PHONY: install-mmalloc maybe-install-mmalloc
-maybe-install-mmalloc:
-@if mmalloc
-maybe-install-mmalloc: install-mmalloc
+.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-mmalloc: installdirs
+install-libiberty-linker-plugin: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/mmalloc && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ install)
+
+@endif libiberty-linker-plugin
+
+.PHONY: install-strip-libiberty-linker-plugin maybe-install-strip-libiberty-linker-plugin
+maybe-install-strip-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-install-strip-libiberty-linker-plugin: install-strip-libiberty-linker-plugin
+
+install-strip-libiberty-linker-plugin: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ install-strip)
 
-@endif mmalloc
+@endif libiberty-linker-plugin
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-mmalloc info-mmalloc
-maybe-info-mmalloc:
-@if mmalloc
-maybe-info-mmalloc: info-mmalloc
+.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-mmalloc: \
-    configure-mmalloc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -28471,25 +23997,24 @@ info-mmalloc: \
                  info) \
          || exit 1
 
-@endif mmalloc
+@endif libiberty-linker-plugin
 
-.PHONY: maybe-dvi-mmalloc dvi-mmalloc
-maybe-dvi-mmalloc:
-@if mmalloc
-maybe-dvi-mmalloc: dvi-mmalloc
+.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-mmalloc: \
-    configure-mmalloc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -28497,25 +24022,24 @@ dvi-mmalloc: \
                  dvi) \
          || exit 1
 
-@endif mmalloc
+@endif libiberty-linker-plugin
 
-.PHONY: maybe-pdf-mmalloc pdf-mmalloc
-maybe-pdf-mmalloc:
-@if mmalloc
-maybe-pdf-mmalloc: pdf-mmalloc
+.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-mmalloc: \
-    configure-mmalloc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -28523,25 +24047,24 @@ pdf-mmalloc: \
                  pdf) \
          || exit 1
 
-@endif mmalloc
+@endif libiberty-linker-plugin
 
-.PHONY: maybe-html-mmalloc html-mmalloc
-maybe-html-mmalloc:
-@if mmalloc
-maybe-html-mmalloc: html-mmalloc
+.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-mmalloc: \
-    configure-mmalloc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -28549,25 +24072,24 @@ html-mmalloc: \
                  html) \
          || exit 1
 
-@endif mmalloc
+@endif libiberty-linker-plugin
 
-.PHONY: maybe-TAGS-mmalloc TAGS-mmalloc
-maybe-TAGS-mmalloc:
-@if mmalloc
-maybe-TAGS-mmalloc: TAGS-mmalloc
+.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-mmalloc: \
-    configure-mmalloc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -28575,26 +24097,25 @@ TAGS-mmalloc: \
                  TAGS) \
          || exit 1
 
-@endif mmalloc
+@endif libiberty-linker-plugin
 
-.PHONY: maybe-install-info-mmalloc install-info-mmalloc
-maybe-install-info-mmalloc:
-@if mmalloc
-maybe-install-info-mmalloc: install-info-mmalloc
+.PHONY: maybe-install-info-libiberty-linker-plugin install-info-libiberty-linker-plugin
+maybe-install-info-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-install-info-libiberty-linker-plugin: install-info-libiberty-linker-plugin
 
-install-info-mmalloc: \
-    configure-mmalloc \
-    info-mmalloc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/Makefile ] || exit 0; \
+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) ; 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 mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -28602,26 +24123,25 @@ install-info-mmalloc: \
                  install-info) \
          || exit 1
 
-@endif mmalloc
+@endif libiberty-linker-plugin
 
-.PHONY: maybe-install-pdf-mmalloc install-pdf-mmalloc
-maybe-install-pdf-mmalloc:
-@if mmalloc
-maybe-install-pdf-mmalloc: install-pdf-mmalloc
+.PHONY: maybe-install-pdf-libiberty-linker-plugin install-pdf-libiberty-linker-plugin
+maybe-install-pdf-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-install-pdf-libiberty-linker-plugin: install-pdf-libiberty-linker-plugin
 
-install-pdf-mmalloc: \
-    configure-mmalloc \
-    pdf-mmalloc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/Makefile ] || exit 0; \
+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) ; 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 mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -28629,26 +24149,25 @@ install-pdf-mmalloc: \
                  install-pdf) \
          || exit 1
 
-@endif mmalloc
+@endif libiberty-linker-plugin
 
-.PHONY: maybe-install-html-mmalloc install-html-mmalloc
-maybe-install-html-mmalloc:
-@if mmalloc
-maybe-install-html-mmalloc: install-html-mmalloc
+.PHONY: maybe-install-html-libiberty-linker-plugin install-html-libiberty-linker-plugin
+maybe-install-html-libiberty-linker-plugin:
+@if libiberty-linker-plugin
+maybe-install-html-libiberty-linker-plugin: install-html-libiberty-linker-plugin
 
-install-html-mmalloc: \
-    configure-mmalloc \
-    html-mmalloc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/Makefile ] || exit 0; \
+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) ; 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 mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -28656,25 +24175,24 @@ install-html-mmalloc: \
                  install-html) \
          || exit 1
 
-@endif mmalloc
+@endif libiberty-linker-plugin
 
-.PHONY: maybe-installcheck-mmalloc installcheck-mmalloc
-maybe-installcheck-mmalloc:
-@if mmalloc
-maybe-installcheck-mmalloc: installcheck-mmalloc
+.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-mmalloc: \
-    configure-mmalloc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -28682,24 +24200,23 @@ installcheck-mmalloc: \
                  installcheck) \
          || exit 1
 
-@endif mmalloc
+@endif libiberty-linker-plugin
 
-.PHONY: maybe-mostlyclean-mmalloc mostlyclean-mmalloc
-maybe-mostlyclean-mmalloc:
-@if mmalloc
-maybe-mostlyclean-mmalloc: mostlyclean-mmalloc
+.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-mmalloc: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -28707,24 +24224,23 @@ mostlyclean-mmalloc:
                  mostlyclean) \
          || exit 1
 
-@endif mmalloc
+@endif libiberty-linker-plugin
 
-.PHONY: maybe-clean-mmalloc clean-mmalloc
-maybe-clean-mmalloc:
-@if mmalloc
-maybe-clean-mmalloc: clean-mmalloc
+.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-mmalloc: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -28732,24 +24248,23 @@ clean-mmalloc:
                  clean) \
          || exit 1
 
-@endif mmalloc
+@endif libiberty-linker-plugin
 
-.PHONY: maybe-distclean-mmalloc distclean-mmalloc
-maybe-distclean-mmalloc:
-@if mmalloc
-maybe-distclean-mmalloc: distclean-mmalloc
+.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-mmalloc: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -28757,24 +24272,23 @@ distclean-mmalloc:
                  distclean) \
          || exit 1
 
-@endif mmalloc
+@endif libiberty-linker-plugin
 
-.PHONY: maybe-maintainer-clean-mmalloc maintainer-clean-mmalloc
-maybe-maintainer-clean-mmalloc:
-@if mmalloc
-maybe-maintainer-clean-mmalloc: maintainer-clean-mmalloc
+.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-mmalloc: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -28782,139 +24296,584 @@ maintainer-clean-mmalloc:
                  maintainer-clean) \
          || exit 1
 
-@endif mmalloc
+@endif libiberty-linker-plugin
 
 
 
-.PHONY: configure-patch maybe-configure-patch
-maybe-configure-patch:
+.PHONY: configure-libiconv maybe-configure-libiconv
+maybe-configure-libiconv:
 @if gcc-bootstrap
-configure-patch: stage_current
+configure-libiconv: stage_current
 @endif gcc-bootstrap
-@if patch
-maybe-configure-patch: configure-patch
-configure-patch: 
-       @: $(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)/patch/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/patch ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/patch; \
-       cd "$(HOST_SUBDIR)/patch" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/libiconv/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/libiconv; \
+       cd "$(HOST_SUBDIR)/libiconv" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/patch/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/patch"; \
-       libsrcdir="$$s/patch"; \
-       $(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 patch
+@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: 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-patch maybe-all-patch
-maybe-all-patch:
+.PHONY: all-libiconv maybe-all-libiconv
+maybe-all-libiconv:
 @if gcc-bootstrap
-all-patch: stage_current
+all-libiconv: stage_current
 @endif gcc-bootstrap
-@if patch
-TARGET-patch=all
-maybe-all-patch: all-patch
-all-patch: configure-patch
-       @: $(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)/libiconv && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-libiconv))
+@endif libiconv
+
+
+
+.PHONY: all-stage1-libiconv maybe-all-stage1-libiconv
+.PHONY: clean-stage1-libiconv maybe-clean-stage1-libiconv
+maybe-all-stage1-libiconv:
+maybe-clean-stage1-libiconv:
+@if libiconv-bootstrap
+maybe-all-stage1-libiconv: all-stage1-libiconv
+all-stage1: all-stage1-libiconv
+TARGET-stage1-libiconv = $(TARGET-libiconv)
+all-stage1-libiconv: configure-stage1-libiconv
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiconv && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE1_CFLAGS)" \
+               CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+               LIBCFLAGS="$(LIBCFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
+               $(TARGET-stage1-libiconv)
+
+maybe-clean-stage1-libiconv: clean-stage1-libiconv
+clean-stage1: clean-stage1-libiconv
+clean-stage1-libiconv:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/libiconv/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-libiconv/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiconv && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif libiconv-bootstrap
+
+
+.PHONY: all-stage2-libiconv maybe-all-stage2-libiconv
+.PHONY: clean-stage2-libiconv maybe-clean-stage2-libiconv
+maybe-all-stage2-libiconv:
+maybe-clean-stage2-libiconv:
+@if libiconv-bootstrap
+maybe-all-stage2-libiconv: all-stage2-libiconv
+all-stage2: all-stage2-libiconv
+TARGET-stage2-libiconv = $(TARGET-libiconv)
+all-stage2-libiconv: configure-stage2-libiconv
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiconv && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE2_CFLAGS)" \
+               CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGE2_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
+               $(TARGET-stage2-libiconv)
+
+maybe-clean-stage2-libiconv: clean-stage2-libiconv
+clean-stage2: clean-stage2-libiconv
+clean-stage2-libiconv:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/libiconv/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-libiconv/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiconv && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libiconv-bootstrap
+
+
+.PHONY: all-stage3-libiconv maybe-all-stage3-libiconv
+.PHONY: clean-stage3-libiconv maybe-clean-stage3-libiconv
+maybe-all-stage3-libiconv:
+maybe-clean-stage3-libiconv:
+@if libiconv-bootstrap
+maybe-all-stage3-libiconv: all-stage3-libiconv
+all-stage3: all-stage3-libiconv
+TARGET-stage3-libiconv = $(TARGET-libiconv)
+all-stage3-libiconv: configure-stage3-libiconv
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiconv && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE3_CFLAGS)" \
+               CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGE3_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
+               $(TARGET-stage3-libiconv)
+
+maybe-clean-stage3-libiconv: clean-stage3-libiconv
+clean-stage3: clean-stage3-libiconv
+clean-stage3-libiconv:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/libiconv/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-libiconv/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiconv && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libiconv-bootstrap
+
+
+.PHONY: all-stage4-libiconv maybe-all-stage4-libiconv
+.PHONY: clean-stage4-libiconv maybe-clean-stage4-libiconv
+maybe-all-stage4-libiconv:
+maybe-clean-stage4-libiconv:
+@if libiconv-bootstrap
+maybe-all-stage4-libiconv: all-stage4-libiconv
+all-stage4: all-stage4-libiconv
+TARGET-stage4-libiconv = $(TARGET-libiconv)
+all-stage4-libiconv: configure-stage4-libiconv
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiconv && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE4_CFLAGS)" \
+               CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGE4_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
+               $(TARGET-stage4-libiconv)
+
+maybe-clean-stage4-libiconv: clean-stage4-libiconv
+clean-stage4: clean-stage4-libiconv
+clean-stage4-libiconv:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/libiconv/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-libiconv/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiconv && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libiconv-bootstrap
+
+
+.PHONY: all-stageprofile-libiconv maybe-all-stageprofile-libiconv
+.PHONY: clean-stageprofile-libiconv maybe-clean-stageprofile-libiconv
+maybe-all-stageprofile-libiconv:
+maybe-clean-stageprofile-libiconv:
+@if libiconv-bootstrap
+maybe-all-stageprofile-libiconv: all-stageprofile-libiconv
+all-stageprofile: all-stageprofile-libiconv
+TARGET-stageprofile-libiconv = $(TARGET-libiconv)
+all-stageprofile-libiconv: configure-stageprofile-libiconv
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiconv && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGEprofile_CFLAGS)" \
+               CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
+               $(TARGET-stageprofile-libiconv)
+
+maybe-clean-stageprofile-libiconv: clean-stageprofile-libiconv
+clean-stageprofile: clean-stageprofile-libiconv
+clean-stageprofile-libiconv:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/libiconv/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-libiconv/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiconv && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libiconv-bootstrap
+
+
+.PHONY: all-stagefeedback-libiconv maybe-all-stagefeedback-libiconv
+.PHONY: clean-stagefeedback-libiconv maybe-clean-stagefeedback-libiconv
+maybe-all-stagefeedback-libiconv:
+maybe-clean-stagefeedback-libiconv:
+@if libiconv-bootstrap
+maybe-all-stagefeedback-libiconv: all-stagefeedback-libiconv
+all-stagefeedback: all-stagefeedback-libiconv
+TARGET-stagefeedback-libiconv = $(TARGET-libiconv)
+all-stagefeedback-libiconv: configure-stagefeedback-libiconv
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/patch && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-patch))
-@endif patch
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libiconv && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
+               $(TARGET-stagefeedback-libiconv)
+
+maybe-clean-stagefeedback-libiconv: clean-stagefeedback-libiconv
+clean-stagefeedback: clean-stagefeedback-libiconv
+clean-stagefeedback-libiconv:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/libiconv/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-libiconv/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libiconv && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libiconv-bootstrap
+
 
 
 
 
-.PHONY: check-patch maybe-check-patch
-maybe-check-patch:
-@if patch
-maybe-check-patch: check-patch
+.PHONY: check-libiconv maybe-check-libiconv
+maybe-check-libiconv:
+@if libiconv
+maybe-check-libiconv: check-libiconv
 
-check-patch:
+check-libiconv:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/patch && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/libiconv && \
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
-@endif patch
+@endif libiconv
 
-.PHONY: install-patch maybe-install-patch
-maybe-install-patch:
-@if patch
-maybe-install-patch: install-patch
+.PHONY: install-libiconv maybe-install-libiconv
+maybe-install-libiconv:
+@if libiconv
+maybe-install-libiconv: install-libiconv
 
-install-patch: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/patch && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+install-libiconv:
+
+@endif libiconv
 
-@endif patch
+.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-patch info-patch
-maybe-info-patch:
-@if patch
-maybe-info-patch: info-patch
+.PHONY: maybe-info-libiconv info-libiconv
+maybe-info-libiconv:
+@if libiconv
+maybe-info-libiconv: info-libiconv
 
-info-patch: \
-    configure-patch 
-       @: $(MAKE); $(unstage)
-       @[ -f ./patch/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 patch" ; \
-       (cd $(HOST_SUBDIR)/patch && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 info) \
-         || exit 1
+# libiconv doesn't support info.
+info-libiconv:
 
-@endif patch
+@endif libiconv
 
-.PHONY: maybe-dvi-patch dvi-patch
-maybe-dvi-patch:
-@if patch
-maybe-dvi-patch: dvi-patch
+.PHONY: maybe-dvi-libiconv dvi-libiconv
+maybe-dvi-libiconv:
+@if libiconv
+maybe-dvi-libiconv: dvi-libiconv
 
-dvi-patch: \
-    configure-patch 
-       @: $(MAKE); $(unstage)
-       @[ -f ./patch/Makefile ] || exit 0; \
+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 dvi in patch" ; \
-       (cd $(HOST_SUBDIR)/patch && \
+       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}" \
@@ -28922,77 +24881,44 @@ dvi-patch: \
                  dvi) \
          || exit 1
 
-@endif patch
+@endif libiconv
 
-.PHONY: maybe-pdf-patch pdf-patch
-maybe-pdf-patch:
-@if patch
-maybe-pdf-patch: pdf-patch
+.PHONY: maybe-pdf-libiconv pdf-libiconv
+maybe-pdf-libiconv:
+@if libiconv
+maybe-pdf-libiconv: pdf-libiconv
 
-pdf-patch: \
-    configure-patch 
-       @: $(MAKE); $(unstage)
-       @[ -f ./patch/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 patch" ; \
-       (cd $(HOST_SUBDIR)/patch && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 pdf) \
-         || exit 1
+# libiconv doesn't support pdf.
+pdf-libiconv:
 
-@endif patch
+@endif libiconv
 
-.PHONY: maybe-html-patch html-patch
-maybe-html-patch:
-@if patch
-maybe-html-patch: html-patch
+.PHONY: maybe-html-libiconv html-libiconv
+maybe-html-libiconv:
+@if libiconv
+maybe-html-libiconv: html-libiconv
 
-html-patch: \
-    configure-patch 
-       @: $(MAKE); $(unstage)
-       @[ -f ./patch/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 patch" ; \
-       (cd $(HOST_SUBDIR)/patch && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 html) \
-         || exit 1
+# libiconv doesn't support html.
+html-libiconv:
 
-@endif patch
+@endif libiconv
 
-.PHONY: maybe-TAGS-patch TAGS-patch
-maybe-TAGS-patch:
-@if patch
-maybe-TAGS-patch: TAGS-patch
+.PHONY: maybe-TAGS-libiconv TAGS-libiconv
+maybe-TAGS-libiconv:
+@if libiconv
+maybe-TAGS-libiconv: TAGS-libiconv
 
-TAGS-patch: \
-    configure-patch 
-       @: $(MAKE); $(unstage)
-       @[ -f ./patch/Makefile ] || exit 0; \
+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 TAGS in patch" ; \
-       (cd $(HOST_SUBDIR)/patch && \
+       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}" \
@@ -29000,106 +24926,54 @@ TAGS-patch: \
                  TAGS) \
          || exit 1
 
-@endif patch
+@endif libiconv
 
-.PHONY: maybe-install-info-patch install-info-patch
-maybe-install-info-patch:
-@if patch
-maybe-install-info-patch: install-info-patch
+.PHONY: maybe-install-info-libiconv install-info-libiconv
+maybe-install-info-libiconv:
+@if libiconv
+maybe-install-info-libiconv: install-info-libiconv
 
-install-info-patch: \
-    configure-patch \
-    info-patch 
-       @: $(MAKE); $(unstage)
-       @[ -f ./patch/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 patch" ; \
-       (cd $(HOST_SUBDIR)/patch && \
-         $(MAKE) $(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
+# libiconv doesn't support install-info.
+install-info-libiconv:
 
-@endif patch
+@endif libiconv
 
-.PHONY: maybe-install-pdf-patch install-pdf-patch
-maybe-install-pdf-patch:
-@if patch
-maybe-install-pdf-patch: install-pdf-patch
+.PHONY: maybe-install-pdf-libiconv install-pdf-libiconv
+maybe-install-pdf-libiconv:
+@if libiconv
+maybe-install-pdf-libiconv: install-pdf-libiconv
 
-install-pdf-patch: \
-    configure-patch \
-    pdf-patch 
-       @: $(MAKE); $(unstage)
-       @[ -f ./patch/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 patch" ; \
-       (cd $(HOST_SUBDIR)/patch && \
-         $(MAKE) $(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
+# libiconv doesn't support install-pdf.
+install-pdf-libiconv:
 
-@endif patch
+@endif libiconv
 
-.PHONY: maybe-install-html-patch install-html-patch
-maybe-install-html-patch:
-@if patch
-maybe-install-html-patch: install-html-patch
+.PHONY: maybe-install-html-libiconv install-html-libiconv
+maybe-install-html-libiconv:
+@if libiconv
+maybe-install-html-libiconv: install-html-libiconv
 
-install-html-patch: \
-    configure-patch \
-    html-patch 
-       @: $(MAKE); $(unstage)
-       @[ -f ./patch/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 patch" ; \
-       (cd $(HOST_SUBDIR)/patch && \
-         $(MAKE) $(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
+# libiconv doesn't support install-html.
+install-html-libiconv:
 
-@endif patch
+@endif libiconv
 
-.PHONY: maybe-installcheck-patch installcheck-patch
-maybe-installcheck-patch:
-@if patch
-maybe-installcheck-patch: installcheck-patch
+.PHONY: maybe-installcheck-libiconv installcheck-libiconv
+maybe-installcheck-libiconv:
+@if libiconv
+maybe-installcheck-libiconv: installcheck-libiconv
 
-installcheck-patch: \
-    configure-patch 
-       @: $(MAKE); $(unstage)
-       @[ -f ./patch/Makefile ] || exit 0; \
+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 installcheck in patch" ; \
-       (cd $(HOST_SUBDIR)/patch && \
+       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}" \
@@ -29107,24 +24981,23 @@ installcheck-patch: \
                  installcheck) \
          || exit 1
 
-@endif patch
+@endif libiconv
 
-.PHONY: maybe-mostlyclean-patch mostlyclean-patch
-maybe-mostlyclean-patch:
-@if patch
-maybe-mostlyclean-patch: mostlyclean-patch
+.PHONY: maybe-mostlyclean-libiconv mostlyclean-libiconv
+maybe-mostlyclean-libiconv:
+@if libiconv
+maybe-mostlyclean-libiconv: mostlyclean-libiconv
 
-mostlyclean-patch: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./patch/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 mostlyclean in patch" ; \
-       (cd $(HOST_SUBDIR)/patch && \
+       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}" \
@@ -29132,24 +25005,23 @@ mostlyclean-patch:
                  mostlyclean) \
          || exit 1
 
-@endif patch
+@endif libiconv
 
-.PHONY: maybe-clean-patch clean-patch
-maybe-clean-patch:
-@if patch
-maybe-clean-patch: clean-patch
+.PHONY: maybe-clean-libiconv clean-libiconv
+maybe-clean-libiconv:
+@if libiconv
+maybe-clean-libiconv: clean-libiconv
 
-clean-patch: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./patch/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 clean in patch" ; \
-       (cd $(HOST_SUBDIR)/patch && \
+       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}" \
@@ -29157,24 +25029,23 @@ clean-patch:
                  clean) \
          || exit 1
 
-@endif patch
+@endif libiconv
 
-.PHONY: maybe-distclean-patch distclean-patch
-maybe-distclean-patch:
-@if patch
-maybe-distclean-patch: distclean-patch
+.PHONY: maybe-distclean-libiconv distclean-libiconv
+maybe-distclean-libiconv:
+@if libiconv
+maybe-distclean-libiconv: distclean-libiconv
 
-distclean-patch: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./patch/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 distclean in patch" ; \
-       (cd $(HOST_SUBDIR)/patch && \
+       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}" \
@@ -29182,24 +25053,23 @@ distclean-patch:
                  distclean) \
          || exit 1
 
-@endif patch
+@endif libiconv
 
-.PHONY: maybe-maintainer-clean-patch maintainer-clean-patch
-maybe-maintainer-clean-patch:
-@if patch
-maybe-maintainer-clean-patch: maintainer-clean-patch
+.PHONY: maybe-maintainer-clean-libiconv maintainer-clean-libiconv
+maybe-maintainer-clean-libiconv:
+@if libiconv
+maybe-maintainer-clean-libiconv: maintainer-clean-libiconv
 
-maintainer-clean-patch: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./patch/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 maintainer-clean in patch" ; \
-       (cd $(HOST_SUBDIR)/patch && \
+       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}" \
@@ -29207,113 +25077,129 @@ maintainer-clean-patch:
                  maintainer-clean) \
          || exit 1
 
-@endif patch
+@endif libiconv
 
 
 
-.PHONY: configure-perl maybe-configure-perl
-maybe-configure-perl:
+.PHONY: configure-m4 maybe-configure-m4
+maybe-configure-m4:
 @if gcc-bootstrap
-configure-perl: stage_current
+configure-m4: stage_current
 @endif gcc-bootstrap
-@if perl
-maybe-configure-perl: configure-perl
-configure-perl: 
+@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)/perl/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/perl ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/perl; \
-       cd "$(HOST_SUBDIR)/perl" || exit 1; \
+       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)/perl/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/m4/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/perl"; \
-       libsrcdir="$$s/perl"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=m4; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
-@endif perl
+@endif m4
 
 
 
 
 
-.PHONY: all-perl maybe-all-perl
-maybe-all-perl:
+.PHONY: all-m4 maybe-all-m4
+maybe-all-m4:
 @if gcc-bootstrap
-all-perl: stage_current
+all-m4: stage_current
 @endif gcc-bootstrap
-@if perl
-TARGET-perl=all
-maybe-all-perl: all-perl
-all-perl: configure-perl
+@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)/perl && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-perl))
-@endif perl
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/m4 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-m4))
+@endif m4
 
 
 
 
-.PHONY: check-perl maybe-check-perl
-maybe-check-perl:
-@if perl
-maybe-check-perl: check-perl
+.PHONY: check-m4 maybe-check-m4
+maybe-check-m4:
+@if m4
+maybe-check-m4: check-m4
 
-check-perl:
+check-m4:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/perl && \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/m4 && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif perl
+@endif m4
 
-.PHONY: install-perl maybe-install-perl
-maybe-install-perl:
-@if perl
-maybe-install-perl: install-perl
+.PHONY: install-m4 maybe-install-m4
+maybe-install-m4:
+@if m4
+maybe-install-m4: install-m4
 
-install-perl: installdirs
+install-m4: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/perl && \
+       (cd $(HOST_SUBDIR)/m4 && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif perl
+@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-perl info-perl
-maybe-info-perl:
-@if perl
-maybe-info-perl: info-perl
+.PHONY: maybe-info-m4 info-m4
+maybe-info-m4:
+@if m4
+maybe-info-m4: info-m4
 
-info-perl: \
-    configure-perl 
+info-m4: \
+    configure-m4 
        @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
+       @[ -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 perl" ; \
-       (cd $(HOST_SUBDIR)/perl && \
+       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}" \
@@ -29321,25 +25207,25 @@ info-perl: \
                  info) \
          || exit 1
 
-@endif perl
+@endif m4
 
-.PHONY: maybe-dvi-perl dvi-perl
-maybe-dvi-perl:
-@if perl
-maybe-dvi-perl: dvi-perl
+.PHONY: maybe-dvi-m4 dvi-m4
+maybe-dvi-m4:
+@if m4
+maybe-dvi-m4: dvi-m4
 
-dvi-perl: \
-    configure-perl 
+dvi-m4: \
+    configure-m4 
        @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
+       @[ -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 perl" ; \
-       (cd $(HOST_SUBDIR)/perl && \
+       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}" \
@@ -29347,25 +25233,25 @@ dvi-perl: \
                  dvi) \
          || exit 1
 
-@endif perl
+@endif m4
 
-.PHONY: maybe-pdf-perl pdf-perl
-maybe-pdf-perl:
-@if perl
-maybe-pdf-perl: pdf-perl
+.PHONY: maybe-pdf-m4 pdf-m4
+maybe-pdf-m4:
+@if m4
+maybe-pdf-m4: pdf-m4
 
-pdf-perl: \
-    configure-perl 
+pdf-m4: \
+    configure-m4 
        @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
+       @[ -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 perl" ; \
-       (cd $(HOST_SUBDIR)/perl && \
+       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}" \
@@ -29373,25 +25259,25 @@ pdf-perl: \
                  pdf) \
          || exit 1
 
-@endif perl
+@endif m4
 
-.PHONY: maybe-html-perl html-perl
-maybe-html-perl:
-@if perl
-maybe-html-perl: html-perl
+.PHONY: maybe-html-m4 html-m4
+maybe-html-m4:
+@if m4
+maybe-html-m4: html-m4
 
-html-perl: \
-    configure-perl 
+html-m4: \
+    configure-m4 
        @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
+       @[ -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 perl" ; \
-       (cd $(HOST_SUBDIR)/perl && \
+       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}" \
@@ -29399,25 +25285,25 @@ html-perl: \
                  html) \
          || exit 1
 
-@endif perl
+@endif m4
 
-.PHONY: maybe-TAGS-perl TAGS-perl
-maybe-TAGS-perl:
-@if perl
-maybe-TAGS-perl: TAGS-perl
+.PHONY: maybe-TAGS-m4 TAGS-m4
+maybe-TAGS-m4:
+@if m4
+maybe-TAGS-m4: TAGS-m4
 
-TAGS-perl: \
-    configure-perl 
+TAGS-m4: \
+    configure-m4 
        @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
+       @[ -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 perl" ; \
-       (cd $(HOST_SUBDIR)/perl && \
+       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}" \
@@ -29425,26 +25311,26 @@ TAGS-perl: \
                  TAGS) \
          || exit 1
 
-@endif perl
+@endif m4
 
-.PHONY: maybe-install-info-perl install-info-perl
-maybe-install-info-perl:
-@if perl
-maybe-install-info-perl: install-info-perl
+.PHONY: maybe-install-info-m4 install-info-m4
+maybe-install-info-m4:
+@if m4
+maybe-install-info-m4: install-info-m4
 
-install-info-perl: \
-    configure-perl \
-    info-perl 
+install-info-m4: \
+    configure-m4 \
+    info-m4 
        @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
+       @[ -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 perl" ; \
-       (cd $(HOST_SUBDIR)/perl && \
+       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}" \
@@ -29452,26 +25338,26 @@ install-info-perl: \
                  install-info) \
          || exit 1
 
-@endif perl
+@endif m4
 
-.PHONY: maybe-install-pdf-perl install-pdf-perl
-maybe-install-pdf-perl:
-@if perl
-maybe-install-pdf-perl: install-pdf-perl
+.PHONY: maybe-install-pdf-m4 install-pdf-m4
+maybe-install-pdf-m4:
+@if m4
+maybe-install-pdf-m4: install-pdf-m4
 
-install-pdf-perl: \
-    configure-perl \
-    pdf-perl 
+install-pdf-m4: \
+    configure-m4 \
+    pdf-m4 
        @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
+       @[ -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 perl" ; \
-       (cd $(HOST_SUBDIR)/perl && \
+       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}" \
@@ -29479,26 +25365,26 @@ install-pdf-perl: \
                  install-pdf) \
          || exit 1
 
-@endif perl
+@endif m4
 
-.PHONY: maybe-install-html-perl install-html-perl
-maybe-install-html-perl:
-@if perl
-maybe-install-html-perl: install-html-perl
+.PHONY: maybe-install-html-m4 install-html-m4
+maybe-install-html-m4:
+@if m4
+maybe-install-html-m4: install-html-m4
 
-install-html-perl: \
-    configure-perl \
-    html-perl 
+install-html-m4: \
+    configure-m4 \
+    html-m4 
        @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
+       @[ -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-html in perl" ; \
-       (cd $(HOST_SUBDIR)/perl && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -29506,25 +25392,25 @@ install-html-perl: \
                  install-html) \
          || exit 1
 
-@endif perl
+@endif m4
 
-.PHONY: maybe-installcheck-perl installcheck-perl
-maybe-installcheck-perl:
-@if perl
-maybe-installcheck-perl: installcheck-perl
+.PHONY: maybe-installcheck-m4 installcheck-m4
+maybe-installcheck-m4:
+@if m4
+maybe-installcheck-m4: installcheck-m4
 
-installcheck-perl: \
-    configure-perl 
+installcheck-m4: \
+    configure-m4 
        @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
+       @[ -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 installcheck in perl" ; \
-       (cd $(HOST_SUBDIR)/perl && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -29532,24 +25418,24 @@ installcheck-perl: \
                  installcheck) \
          || exit 1
 
-@endif perl
+@endif m4
 
-.PHONY: maybe-mostlyclean-perl mostlyclean-perl
-maybe-mostlyclean-perl:
-@if perl
-maybe-mostlyclean-perl: mostlyclean-perl
+.PHONY: maybe-mostlyclean-m4 mostlyclean-m4
+maybe-mostlyclean-m4:
+@if m4
+maybe-mostlyclean-m4: mostlyclean-m4
 
-mostlyclean-perl: 
+mostlyclean-m4: 
        @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
+       @[ -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 mostlyclean in perl" ; \
-       (cd $(HOST_SUBDIR)/perl && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -29557,24 +25443,24 @@ mostlyclean-perl:
                  mostlyclean) \
          || exit 1
 
-@endif perl
+@endif m4
 
-.PHONY: maybe-clean-perl clean-perl
-maybe-clean-perl:
-@if perl
-maybe-clean-perl: clean-perl
+.PHONY: maybe-clean-m4 clean-m4
+maybe-clean-m4:
+@if m4
+maybe-clean-m4: clean-m4
 
-clean-perl: 
+clean-m4: 
        @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
+       @[ -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 clean in perl" ; \
-       (cd $(HOST_SUBDIR)/perl && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -29582,24 +25468,24 @@ clean-perl:
                  clean) \
          || exit 1
 
-@endif perl
+@endif m4
 
-.PHONY: maybe-distclean-perl distclean-perl
-maybe-distclean-perl:
-@if perl
-maybe-distclean-perl: distclean-perl
+.PHONY: maybe-distclean-m4 distclean-m4
+maybe-distclean-m4:
+@if m4
+maybe-distclean-m4: distclean-m4
 
-distclean-perl: 
+distclean-m4: 
        @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
+       @[ -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 distclean in perl" ; \
-       (cd $(HOST_SUBDIR)/perl && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -29607,24 +25493,24 @@ distclean-perl:
                  distclean) \
          || exit 1
 
-@endif perl
+@endif m4
 
-.PHONY: maybe-maintainer-clean-perl maintainer-clean-perl
-maybe-maintainer-clean-perl:
-@if perl
-maybe-maintainer-clean-perl: maintainer-clean-perl
+.PHONY: maybe-maintainer-clean-m4 maintainer-clean-m4
+maybe-maintainer-clean-m4:
+@if m4
+maybe-maintainer-clean-m4: maintainer-clean-m4
 
-maintainer-clean-perl: 
+maintainer-clean-m4: 
        @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
+       @[ -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 maintainer-clean in perl" ; \
-       (cd $(HOST_SUBDIR)/perl && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -29632,113 +25518,129 @@ maintainer-clean-perl:
                  maintainer-clean) \
          || exit 1
 
-@endif perl
+@endif m4
 
 
 
-.PHONY: configure-prms maybe-configure-prms
-maybe-configure-prms:
+.PHONY: configure-readline maybe-configure-readline
+maybe-configure-readline:
 @if gcc-bootstrap
-configure-prms: stage_current
+configure-readline: stage_current
 @endif gcc-bootstrap
-@if prms
-maybe-configure-prms: configure-prms
-configure-prms: 
+@if readline
+maybe-configure-readline: configure-readline
+configure-readline: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/prms/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/prms ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/prms; \
-       cd "$(HOST_SUBDIR)/prms" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/readline/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/readline; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/readline; \
+       cd "$(HOST_SUBDIR)/readline" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/prms/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/readline/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/prms"; \
-       libsrcdir="$$s/prms"; \
-       $(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 prms
+@endif readline
 
 
 
 
 
-.PHONY: all-prms maybe-all-prms
-maybe-all-prms:
+.PHONY: all-readline maybe-all-readline
+maybe-all-readline:
 @if gcc-bootstrap
-all-prms: stage_current
+all-readline: stage_current
 @endif gcc-bootstrap
-@if prms
-TARGET-prms=all
-maybe-all-prms: all-prms
-all-prms: configure-prms
+@if readline
+TARGET-readline=all
+maybe-all-readline: all-readline
+all-readline: configure-readline
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/prms && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-prms))
-@endif prms
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/readline && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-readline))
+@endif readline
 
 
 
 
-.PHONY: check-prms maybe-check-prms
-maybe-check-prms:
-@if prms
-maybe-check-prms: check-prms
+.PHONY: check-readline maybe-check-readline
+maybe-check-readline:
+@if readline
+maybe-check-readline: check-readline
 
-check-prms:
+check-readline:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/prms && \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/readline && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif prms
+@endif readline
 
-.PHONY: install-prms maybe-install-prms
-maybe-install-prms:
-@if prms
-maybe-install-prms: install-prms
+.PHONY: install-readline maybe-install-readline
+maybe-install-readline:
+@if readline
+maybe-install-readline: install-readline
 
-install-prms: installdirs
+install-readline: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/prms && \
+       (cd $(HOST_SUBDIR)/readline && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif prms
+@endif readline
+
+.PHONY: install-strip-readline maybe-install-strip-readline
+maybe-install-strip-readline:
+@if readline
+maybe-install-strip-readline: install-strip-readline
+
+install-strip-readline: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/readline && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif readline
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-prms info-prms
-maybe-info-prms:
-@if prms
-maybe-info-prms: info-prms
+.PHONY: maybe-info-readline info-readline
+maybe-info-readline:
+@if readline
+maybe-info-readline: info-readline
 
-info-prms: \
-    configure-prms 
+info-readline: \
+    configure-readline 
        @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
+       @[ -f ./readline/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 prms" ; \
-       (cd $(HOST_SUBDIR)/prms && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -29746,25 +25648,25 @@ info-prms: \
                  info) \
          || exit 1
 
-@endif prms
+@endif readline
 
-.PHONY: maybe-dvi-prms dvi-prms
-maybe-dvi-prms:
-@if prms
-maybe-dvi-prms: dvi-prms
+.PHONY: maybe-dvi-readline dvi-readline
+maybe-dvi-readline:
+@if readline
+maybe-dvi-readline: dvi-readline
 
-dvi-prms: \
-    configure-prms 
+dvi-readline: \
+    configure-readline 
        @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
+       @[ -f ./readline/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 prms" ; \
-       (cd $(HOST_SUBDIR)/prms && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -29772,25 +25674,25 @@ dvi-prms: \
                  dvi) \
          || exit 1
 
-@endif prms
+@endif readline
 
-.PHONY: maybe-pdf-prms pdf-prms
-maybe-pdf-prms:
-@if prms
-maybe-pdf-prms: pdf-prms
+.PHONY: maybe-pdf-readline pdf-readline
+maybe-pdf-readline:
+@if readline
+maybe-pdf-readline: pdf-readline
 
-pdf-prms: \
-    configure-prms 
+pdf-readline: \
+    configure-readline 
        @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
+       @[ -f ./readline/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 prms" ; \
-       (cd $(HOST_SUBDIR)/prms && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -29798,25 +25700,25 @@ pdf-prms: \
                  pdf) \
          || exit 1
 
-@endif prms
+@endif readline
 
-.PHONY: maybe-html-prms html-prms
-maybe-html-prms:
-@if prms
-maybe-html-prms: html-prms
+.PHONY: maybe-html-readline html-readline
+maybe-html-readline:
+@if readline
+maybe-html-readline: html-readline
 
-html-prms: \
-    configure-prms 
+html-readline: \
+    configure-readline 
        @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
+       @[ -f ./readline/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 prms" ; \
-       (cd $(HOST_SUBDIR)/prms && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -29824,25 +25726,25 @@ html-prms: \
                  html) \
          || exit 1
 
-@endif prms
+@endif readline
 
-.PHONY: maybe-TAGS-prms TAGS-prms
-maybe-TAGS-prms:
-@if prms
-maybe-TAGS-prms: TAGS-prms
+.PHONY: maybe-TAGS-readline TAGS-readline
+maybe-TAGS-readline:
+@if readline
+maybe-TAGS-readline: TAGS-readline
 
-TAGS-prms: \
-    configure-prms 
+TAGS-readline: \
+    configure-readline 
        @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
+       @[ -f ./readline/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 prms" ; \
-       (cd $(HOST_SUBDIR)/prms && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -29850,26 +25752,26 @@ TAGS-prms: \
                  TAGS) \
          || exit 1
 
-@endif prms
+@endif readline
 
-.PHONY: maybe-install-info-prms install-info-prms
-maybe-install-info-prms:
-@if prms
-maybe-install-info-prms: install-info-prms
+.PHONY: maybe-install-info-readline install-info-readline
+maybe-install-info-readline:
+@if readline
+maybe-install-info-readline: install-info-readline
 
-install-info-prms: \
-    configure-prms \
-    info-prms 
+install-info-readline: \
+    configure-readline \
+    info-readline 
        @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
+       @[ -f ./readline/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 prms" ; \
-       (cd $(HOST_SUBDIR)/prms && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -29877,26 +25779,26 @@ install-info-prms: \
                  install-info) \
          || exit 1
 
-@endif prms
+@endif readline
 
-.PHONY: maybe-install-pdf-prms install-pdf-prms
-maybe-install-pdf-prms:
-@if prms
-maybe-install-pdf-prms: install-pdf-prms
+.PHONY: maybe-install-pdf-readline install-pdf-readline
+maybe-install-pdf-readline:
+@if readline
+maybe-install-pdf-readline: install-pdf-readline
 
-install-pdf-prms: \
-    configure-prms \
-    pdf-prms 
+install-pdf-readline: \
+    configure-readline \
+    pdf-readline 
        @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
+       @[ -f ./readline/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 prms" ; \
-       (cd $(HOST_SUBDIR)/prms && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -29904,26 +25806,26 @@ install-pdf-prms: \
                  install-pdf) \
          || exit 1
 
-@endif prms
+@endif readline
 
-.PHONY: maybe-install-html-prms install-html-prms
-maybe-install-html-prms:
-@if prms
-maybe-install-html-prms: install-html-prms
+.PHONY: maybe-install-html-readline install-html-readline
+maybe-install-html-readline:
+@if readline
+maybe-install-html-readline: install-html-readline
 
-install-html-prms: \
-    configure-prms \
-    html-prms 
+install-html-readline: \
+    configure-readline \
+    html-readline 
        @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
+       @[ -f ./readline/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 prms" ; \
-       (cd $(HOST_SUBDIR)/prms && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -29931,25 +25833,25 @@ install-html-prms: \
                  install-html) \
          || exit 1
 
-@endif prms
+@endif readline
 
-.PHONY: maybe-installcheck-prms installcheck-prms
-maybe-installcheck-prms:
-@if prms
-maybe-installcheck-prms: installcheck-prms
+.PHONY: maybe-installcheck-readline installcheck-readline
+maybe-installcheck-readline:
+@if readline
+maybe-installcheck-readline: installcheck-readline
 
-installcheck-prms: \
-    configure-prms 
+installcheck-readline: \
+    configure-readline 
        @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
+       @[ -f ./readline/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 prms" ; \
-       (cd $(HOST_SUBDIR)/prms && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -29957,24 +25859,24 @@ installcheck-prms: \
                  installcheck) \
          || exit 1
 
-@endif prms
+@endif readline
 
-.PHONY: maybe-mostlyclean-prms mostlyclean-prms
-maybe-mostlyclean-prms:
-@if prms
-maybe-mostlyclean-prms: mostlyclean-prms
+.PHONY: maybe-mostlyclean-readline mostlyclean-readline
+maybe-mostlyclean-readline:
+@if readline
+maybe-mostlyclean-readline: mostlyclean-readline
 
-mostlyclean-prms: 
+mostlyclean-readline: 
        @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
+       @[ -f ./readline/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 prms" ; \
-       (cd $(HOST_SUBDIR)/prms && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -29982,24 +25884,24 @@ mostlyclean-prms:
                  mostlyclean) \
          || exit 1
 
-@endif prms
+@endif readline
 
-.PHONY: maybe-clean-prms clean-prms
-maybe-clean-prms:
-@if prms
-maybe-clean-prms: clean-prms
+.PHONY: maybe-clean-readline clean-readline
+maybe-clean-readline:
+@if readline
+maybe-clean-readline: clean-readline
 
-clean-prms: 
+clean-readline: 
        @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
+       @[ -f ./readline/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 prms" ; \
-       (cd $(HOST_SUBDIR)/prms && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30007,24 +25909,24 @@ clean-prms:
                  clean) \
          || exit 1
 
-@endif prms
+@endif readline
 
-.PHONY: maybe-distclean-prms distclean-prms
-maybe-distclean-prms:
-@if prms
-maybe-distclean-prms: distclean-prms
+.PHONY: maybe-distclean-readline distclean-readline
+maybe-distclean-readline:
+@if readline
+maybe-distclean-readline: distclean-readline
 
-distclean-prms: 
+distclean-readline: 
        @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
+       @[ -f ./readline/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 prms" ; \
-       (cd $(HOST_SUBDIR)/prms && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30032,24 +25934,24 @@ distclean-prms:
                  distclean) \
          || exit 1
 
-@endif prms
+@endif readline
 
-.PHONY: maybe-maintainer-clean-prms maintainer-clean-prms
-maybe-maintainer-clean-prms:
-@if prms
-maybe-maintainer-clean-prms: maintainer-clean-prms
+.PHONY: maybe-maintainer-clean-readline maintainer-clean-readline
+maybe-maintainer-clean-readline:
+@if readline
+maybe-maintainer-clean-readline: maintainer-clean-readline
 
-maintainer-clean-prms: 
+maintainer-clean-readline: 
        @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
+       @[ -f ./readline/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 prms" ; \
-       (cd $(HOST_SUBDIR)/prms && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30057,113 +25959,129 @@ maintainer-clean-prms:
                  maintainer-clean) \
          || exit 1
 
-@endif prms
+@endif readline
 
 
 
-.PHONY: configure-rcs maybe-configure-rcs
-maybe-configure-rcs:
+.PHONY: configure-sid maybe-configure-sid
+maybe-configure-sid:
 @if gcc-bootstrap
-configure-rcs: stage_current
+configure-sid: stage_current
 @endif gcc-bootstrap
-@if rcs
-maybe-configure-rcs: configure-rcs
-configure-rcs: 
+@if sid
+maybe-configure-sid: configure-sid
+configure-sid: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/rcs/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/rcs ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/rcs; \
-       cd "$(HOST_SUBDIR)/rcs" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/sid/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sid; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/sid; \
+       cd "$(HOST_SUBDIR)/sid" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/rcs/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/sid/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/rcs"; \
-       libsrcdir="$$s/rcs"; \
-       $(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 rcs
+@endif sid
 
 
 
 
 
-.PHONY: all-rcs maybe-all-rcs
-maybe-all-rcs:
+.PHONY: all-sid maybe-all-sid
+maybe-all-sid:
 @if gcc-bootstrap
-all-rcs: stage_current
+all-sid: stage_current
 @endif gcc-bootstrap
-@if rcs
-TARGET-rcs=all
-maybe-all-rcs: all-rcs
-all-rcs: configure-rcs
+@if sid
+TARGET-sid=all
+maybe-all-sid: all-sid
+all-sid: configure-sid
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/rcs && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-rcs))
-@endif rcs
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/sid && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-sid))
+@endif sid
 
 
 
 
-.PHONY: check-rcs maybe-check-rcs
-maybe-check-rcs:
-@if rcs
-maybe-check-rcs: check-rcs
+.PHONY: check-sid maybe-check-sid
+maybe-check-sid:
+@if sid
+maybe-check-sid: check-sid
 
-check-rcs:
+check-sid:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/rcs && \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/sid && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif rcs
+@endif sid
 
-.PHONY: install-rcs maybe-install-rcs
-maybe-install-rcs:
-@if rcs
-maybe-install-rcs: install-rcs
+.PHONY: install-sid maybe-install-sid
+maybe-install-sid:
+@if sid
+maybe-install-sid: install-sid
 
-install-rcs: installdirs
+install-sid: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/rcs && \
+       (cd $(HOST_SUBDIR)/sid && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif rcs
+@endif sid
+
+.PHONY: install-strip-sid maybe-install-strip-sid
+maybe-install-strip-sid:
+@if sid
+maybe-install-strip-sid: install-strip-sid
+
+install-strip-sid: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/sid && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif sid
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-rcs info-rcs
-maybe-info-rcs:
-@if rcs
-maybe-info-rcs: info-rcs
+.PHONY: maybe-info-sid info-sid
+maybe-info-sid:
+@if sid
+maybe-info-sid: info-sid
 
-info-rcs: \
-    configure-rcs 
+info-sid: \
+    configure-sid 
        @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
+       @[ -f ./sid/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 rcs" ; \
-       (cd $(HOST_SUBDIR)/rcs && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30171,25 +26089,25 @@ info-rcs: \
                  info) \
          || exit 1
 
-@endif rcs
+@endif sid
 
-.PHONY: maybe-dvi-rcs dvi-rcs
-maybe-dvi-rcs:
-@if rcs
-maybe-dvi-rcs: dvi-rcs
+.PHONY: maybe-dvi-sid dvi-sid
+maybe-dvi-sid:
+@if sid
+maybe-dvi-sid: dvi-sid
 
-dvi-rcs: \
-    configure-rcs 
+dvi-sid: \
+    configure-sid 
        @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
+       @[ -f ./sid/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 rcs" ; \
-       (cd $(HOST_SUBDIR)/rcs && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30197,25 +26115,25 @@ dvi-rcs: \
                  dvi) \
          || exit 1
 
-@endif rcs
+@endif sid
 
-.PHONY: maybe-pdf-rcs pdf-rcs
-maybe-pdf-rcs:
-@if rcs
-maybe-pdf-rcs: pdf-rcs
+.PHONY: maybe-pdf-sid pdf-sid
+maybe-pdf-sid:
+@if sid
+maybe-pdf-sid: pdf-sid
 
-pdf-rcs: \
-    configure-rcs 
+pdf-sid: \
+    configure-sid 
        @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
+       @[ -f ./sid/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 rcs" ; \
-       (cd $(HOST_SUBDIR)/rcs && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30223,25 +26141,25 @@ pdf-rcs: \
                  pdf) \
          || exit 1
 
-@endif rcs
+@endif sid
 
-.PHONY: maybe-html-rcs html-rcs
-maybe-html-rcs:
-@if rcs
-maybe-html-rcs: html-rcs
+.PHONY: maybe-html-sid html-sid
+maybe-html-sid:
+@if sid
+maybe-html-sid: html-sid
 
-html-rcs: \
-    configure-rcs 
+html-sid: \
+    configure-sid 
        @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
+       @[ -f ./sid/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 rcs" ; \
-       (cd $(HOST_SUBDIR)/rcs && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30249,25 +26167,25 @@ html-rcs: \
                  html) \
          || exit 1
 
-@endif rcs
+@endif sid
 
-.PHONY: maybe-TAGS-rcs TAGS-rcs
-maybe-TAGS-rcs:
-@if rcs
-maybe-TAGS-rcs: TAGS-rcs
+.PHONY: maybe-TAGS-sid TAGS-sid
+maybe-TAGS-sid:
+@if sid
+maybe-TAGS-sid: TAGS-sid
 
-TAGS-rcs: \
-    configure-rcs 
+TAGS-sid: \
+    configure-sid 
        @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
+       @[ -f ./sid/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 rcs" ; \
-       (cd $(HOST_SUBDIR)/rcs && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30275,26 +26193,26 @@ TAGS-rcs: \
                  TAGS) \
          || exit 1
 
-@endif rcs
+@endif sid
 
-.PHONY: maybe-install-info-rcs install-info-rcs
-maybe-install-info-rcs:
-@if rcs
-maybe-install-info-rcs: install-info-rcs
+.PHONY: maybe-install-info-sid install-info-sid
+maybe-install-info-sid:
+@if sid
+maybe-install-info-sid: install-info-sid
 
-install-info-rcs: \
-    configure-rcs \
-    info-rcs 
+install-info-sid: \
+    configure-sid \
+    info-sid 
        @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
+       @[ -f ./sid/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 rcs" ; \
-       (cd $(HOST_SUBDIR)/rcs && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30302,26 +26220,26 @@ install-info-rcs: \
                  install-info) \
          || exit 1
 
-@endif rcs
+@endif sid
 
-.PHONY: maybe-install-pdf-rcs install-pdf-rcs
-maybe-install-pdf-rcs:
-@if rcs
-maybe-install-pdf-rcs: install-pdf-rcs
+.PHONY: maybe-install-pdf-sid install-pdf-sid
+maybe-install-pdf-sid:
+@if sid
+maybe-install-pdf-sid: install-pdf-sid
 
-install-pdf-rcs: \
-    configure-rcs \
-    pdf-rcs 
+install-pdf-sid: \
+    configure-sid \
+    pdf-sid 
        @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
+       @[ -f ./sid/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 rcs" ; \
-       (cd $(HOST_SUBDIR)/rcs && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30329,26 +26247,26 @@ install-pdf-rcs: \
                  install-pdf) \
          || exit 1
 
-@endif rcs
+@endif sid
 
-.PHONY: maybe-install-html-rcs install-html-rcs
-maybe-install-html-rcs:
-@if rcs
-maybe-install-html-rcs: install-html-rcs
+.PHONY: maybe-install-html-sid install-html-sid
+maybe-install-html-sid:
+@if sid
+maybe-install-html-sid: install-html-sid
 
-install-html-rcs: \
-    configure-rcs \
-    html-rcs 
+install-html-sid: \
+    configure-sid \
+    html-sid 
        @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
+       @[ -f ./sid/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 rcs" ; \
-       (cd $(HOST_SUBDIR)/rcs && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30356,25 +26274,25 @@ install-html-rcs: \
                  install-html) \
          || exit 1
 
-@endif rcs
+@endif sid
 
-.PHONY: maybe-installcheck-rcs installcheck-rcs
-maybe-installcheck-rcs:
-@if rcs
-maybe-installcheck-rcs: installcheck-rcs
+.PHONY: maybe-installcheck-sid installcheck-sid
+maybe-installcheck-sid:
+@if sid
+maybe-installcheck-sid: installcheck-sid
 
-installcheck-rcs: \
-    configure-rcs 
+installcheck-sid: \
+    configure-sid 
        @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
+       @[ -f ./sid/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 rcs" ; \
-       (cd $(HOST_SUBDIR)/rcs && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30382,24 +26300,24 @@ installcheck-rcs: \
                  installcheck) \
          || exit 1
 
-@endif rcs
+@endif sid
 
-.PHONY: maybe-mostlyclean-rcs mostlyclean-rcs
-maybe-mostlyclean-rcs:
-@if rcs
-maybe-mostlyclean-rcs: mostlyclean-rcs
+.PHONY: maybe-mostlyclean-sid mostlyclean-sid
+maybe-mostlyclean-sid:
+@if sid
+maybe-mostlyclean-sid: mostlyclean-sid
 
-mostlyclean-rcs: 
+mostlyclean-sid: 
        @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
+       @[ -f ./sid/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 rcs" ; \
-       (cd $(HOST_SUBDIR)/rcs && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30407,24 +26325,24 @@ mostlyclean-rcs:
                  mostlyclean) \
          || exit 1
 
-@endif rcs
+@endif sid
 
-.PHONY: maybe-clean-rcs clean-rcs
-maybe-clean-rcs:
-@if rcs
-maybe-clean-rcs: clean-rcs
+.PHONY: maybe-clean-sid clean-sid
+maybe-clean-sid:
+@if sid
+maybe-clean-sid: clean-sid
 
-clean-rcs: 
+clean-sid: 
        @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
+       @[ -f ./sid/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 rcs" ; \
-       (cd $(HOST_SUBDIR)/rcs && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30432,24 +26350,24 @@ clean-rcs:
                  clean) \
          || exit 1
 
-@endif rcs
+@endif sid
 
-.PHONY: maybe-distclean-rcs distclean-rcs
-maybe-distclean-rcs:
-@if rcs
-maybe-distclean-rcs: distclean-rcs
+.PHONY: maybe-distclean-sid distclean-sid
+maybe-distclean-sid:
+@if sid
+maybe-distclean-sid: distclean-sid
 
-distclean-rcs: 
+distclean-sid: 
        @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
+       @[ -f ./sid/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 rcs" ; \
-       (cd $(HOST_SUBDIR)/rcs && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30457,24 +26375,24 @@ distclean-rcs:
                  distclean) \
          || exit 1
 
-@endif rcs
+@endif sid
 
-.PHONY: maybe-maintainer-clean-rcs maintainer-clean-rcs
-maybe-maintainer-clean-rcs:
-@if rcs
-maybe-maintainer-clean-rcs: maintainer-clean-rcs
+.PHONY: maybe-maintainer-clean-sid maintainer-clean-sid
+maybe-maintainer-clean-sid:
+@if sid
+maybe-maintainer-clean-sid: maintainer-clean-sid
 
-maintainer-clean-rcs: 
+maintainer-clean-sid: 
        @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
+       @[ -f ./sid/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 rcs" ; \
-       (cd $(HOST_SUBDIR)/rcs && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30482,113 +26400,129 @@ maintainer-clean-rcs:
                  maintainer-clean) \
          || exit 1
 
-@endif rcs
+@endif sid
 
 
 
-.PHONY: configure-readline maybe-configure-readline
-maybe-configure-readline:
+.PHONY: configure-sim maybe-configure-sim
+maybe-configure-sim:
 @if gcc-bootstrap
-configure-readline: stage_current
+configure-sim: stage_current
 @endif gcc-bootstrap
-@if readline
-maybe-configure-readline: configure-readline
-configure-readline: 
+@if sim
+maybe-configure-sim: configure-sim
+configure-sim: 
        @: $(MAKE); $(unstage)
        @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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/readline; \
-       cd "$(HOST_SUBDIR)/readline" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/sim/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sim; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/sim; \
+       cd "$(HOST_SUBDIR)/sim" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/readline/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/sim/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/readline"; \
-       libsrcdir="$$s/readline"; \
-       $(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 readline
+@endif sim
 
 
 
 
 
-.PHONY: all-readline maybe-all-readline
-maybe-all-readline:
+.PHONY: all-sim maybe-all-sim
+maybe-all-sim:
 @if gcc-bootstrap
-all-readline: stage_current
+all-sim: stage_current
 @endif gcc-bootstrap
-@if readline
-TARGET-readline=all
-maybe-all-readline: all-readline
-all-readline: configure-readline
+@if sim
+TARGET-sim=all
+maybe-all-sim: all-sim
+all-sim: configure-sim
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/readline && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-readline))
-@endif readline
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/sim && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-sim))
+@endif sim
 
 
 
 
-.PHONY: check-readline maybe-check-readline
-maybe-check-readline:
-@if readline
-maybe-check-readline: check-readline
+.PHONY: check-sim maybe-check-sim
+maybe-check-sim:
+@if sim
+maybe-check-sim: check-sim
 
-check-readline:
+check-sim:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/readline && \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/sim && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif readline
+@endif sim
 
-.PHONY: install-readline maybe-install-readline
-maybe-install-readline:
-@if readline
-maybe-install-readline: install-readline
+.PHONY: install-sim maybe-install-sim
+maybe-install-sim:
+@if sim
+maybe-install-sim: install-sim
 
-install-readline: installdirs
+install-sim: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/readline && \
+       (cd $(HOST_SUBDIR)/sim && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif readline
+@endif sim
+
+.PHONY: install-strip-sim maybe-install-strip-sim
+maybe-install-strip-sim:
+@if sim
+maybe-install-strip-sim: install-strip-sim
+
+install-strip-sim: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/sim && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif sim
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-readline info-readline
-maybe-info-readline:
-@if readline
-maybe-info-readline: info-readline
+.PHONY: maybe-info-sim info-sim
+maybe-info-sim:
+@if sim
+maybe-info-sim: info-sim
 
-info-readline: \
-    configure-readline 
+info-sim: \
+    configure-sim 
        @: $(MAKE); $(unstage)
-       @[ -f ./readline/Makefile ] || exit 0; \
+       @[ -f ./sim/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30596,25 +26530,25 @@ info-readline: \
                  info) \
          || exit 1
 
-@endif readline
+@endif sim
 
-.PHONY: maybe-dvi-readline dvi-readline
-maybe-dvi-readline:
-@if readline
-maybe-dvi-readline: dvi-readline
+.PHONY: maybe-dvi-sim dvi-sim
+maybe-dvi-sim:
+@if sim
+maybe-dvi-sim: dvi-sim
 
-dvi-readline: \
-    configure-readline 
+dvi-sim: \
+    configure-sim 
        @: $(MAKE); $(unstage)
-       @[ -f ./readline/Makefile ] || exit 0; \
+       @[ -f ./sim/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30622,25 +26556,25 @@ dvi-readline: \
                  dvi) \
          || exit 1
 
-@endif readline
+@endif sim
 
-.PHONY: maybe-pdf-readline pdf-readline
-maybe-pdf-readline:
-@if readline
-maybe-pdf-readline: pdf-readline
+.PHONY: maybe-pdf-sim pdf-sim
+maybe-pdf-sim:
+@if sim
+maybe-pdf-sim: pdf-sim
 
-pdf-readline: \
-    configure-readline 
+pdf-sim: \
+    configure-sim 
        @: $(MAKE); $(unstage)
-       @[ -f ./readline/Makefile ] || exit 0; \
+       @[ -f ./sim/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30648,25 +26582,25 @@ pdf-readline: \
                  pdf) \
          || exit 1
 
-@endif readline
+@endif sim
 
-.PHONY: maybe-html-readline html-readline
-maybe-html-readline:
-@if readline
-maybe-html-readline: html-readline
+.PHONY: maybe-html-sim html-sim
+maybe-html-sim:
+@if sim
+maybe-html-sim: html-sim
 
-html-readline: \
-    configure-readline 
+html-sim: \
+    configure-sim 
        @: $(MAKE); $(unstage)
-       @[ -f ./readline/Makefile ] || exit 0; \
+       @[ -f ./sim/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30674,25 +26608,25 @@ html-readline: \
                  html) \
          || exit 1
 
-@endif readline
+@endif sim
 
-.PHONY: maybe-TAGS-readline TAGS-readline
-maybe-TAGS-readline:
-@if readline
-maybe-TAGS-readline: TAGS-readline
+.PHONY: maybe-TAGS-sim TAGS-sim
+maybe-TAGS-sim:
+@if sim
+maybe-TAGS-sim: TAGS-sim
 
-TAGS-readline: \
-    configure-readline 
+TAGS-sim: \
+    configure-sim 
        @: $(MAKE); $(unstage)
-       @[ -f ./readline/Makefile ] || exit 0; \
+       @[ -f ./sim/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30700,26 +26634,26 @@ TAGS-readline: \
                  TAGS) \
          || exit 1
 
-@endif readline
+@endif sim
 
-.PHONY: maybe-install-info-readline install-info-readline
-maybe-install-info-readline:
-@if readline
-maybe-install-info-readline: install-info-readline
+.PHONY: maybe-install-info-sim install-info-sim
+maybe-install-info-sim:
+@if sim
+maybe-install-info-sim: install-info-sim
 
-install-info-readline: \
-    configure-readline \
-    info-readline 
+install-info-sim: \
+    configure-sim \
+    info-sim 
        @: $(MAKE); $(unstage)
-       @[ -f ./readline/Makefile ] || exit 0; \
+       @[ -f ./sim/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30727,26 +26661,26 @@ install-info-readline: \
                  install-info) \
          || exit 1
 
-@endif readline
+@endif sim
 
-.PHONY: maybe-install-pdf-readline install-pdf-readline
-maybe-install-pdf-readline:
-@if readline
-maybe-install-pdf-readline: install-pdf-readline
+.PHONY: maybe-install-pdf-sim install-pdf-sim
+maybe-install-pdf-sim:
+@if sim
+maybe-install-pdf-sim: install-pdf-sim
 
-install-pdf-readline: \
-    configure-readline \
-    pdf-readline 
+install-pdf-sim: \
+    configure-sim \
+    pdf-sim 
        @: $(MAKE); $(unstage)
-       @[ -f ./readline/Makefile ] || exit 0; \
+       @[ -f ./sim/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30754,26 +26688,26 @@ install-pdf-readline: \
                  install-pdf) \
          || exit 1
 
-@endif readline
+@endif sim
 
-.PHONY: maybe-install-html-readline install-html-readline
-maybe-install-html-readline:
-@if readline
-maybe-install-html-readline: install-html-readline
+.PHONY: maybe-install-html-sim install-html-sim
+maybe-install-html-sim:
+@if sim
+maybe-install-html-sim: install-html-sim
 
-install-html-readline: \
-    configure-readline \
-    html-readline 
+install-html-sim: \
+    configure-sim \
+    html-sim 
        @: $(MAKE); $(unstage)
-       @[ -f ./readline/Makefile ] || exit 0; \
+       @[ -f ./sim/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30781,25 +26715,25 @@ install-html-readline: \
                  install-html) \
          || exit 1
 
-@endif readline
+@endif sim
 
-.PHONY: maybe-installcheck-readline installcheck-readline
-maybe-installcheck-readline:
-@if readline
-maybe-installcheck-readline: installcheck-readline
+.PHONY: maybe-installcheck-sim installcheck-sim
+maybe-installcheck-sim:
+@if sim
+maybe-installcheck-sim: installcheck-sim
 
-installcheck-readline: \
-    configure-readline 
+installcheck-sim: \
+    configure-sim 
        @: $(MAKE); $(unstage)
-       @[ -f ./readline/Makefile ] || exit 0; \
+       @[ -f ./sim/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30807,24 +26741,24 @@ installcheck-readline: \
                  installcheck) \
          || exit 1
 
-@endif readline
+@endif sim
 
-.PHONY: maybe-mostlyclean-readline mostlyclean-readline
-maybe-mostlyclean-readline:
-@if readline
-maybe-mostlyclean-readline: mostlyclean-readline
+.PHONY: maybe-mostlyclean-sim mostlyclean-sim
+maybe-mostlyclean-sim:
+@if sim
+maybe-mostlyclean-sim: mostlyclean-sim
 
-mostlyclean-readline: 
+mostlyclean-sim: 
        @: $(MAKE); $(unstage)
-       @[ -f ./readline/Makefile ] || exit 0; \
+       @[ -f ./sim/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30832,24 +26766,24 @@ mostlyclean-readline:
                  mostlyclean) \
          || exit 1
 
-@endif readline
+@endif sim
 
-.PHONY: maybe-clean-readline clean-readline
-maybe-clean-readline:
-@if readline
-maybe-clean-readline: clean-readline
+.PHONY: maybe-clean-sim clean-sim
+maybe-clean-sim:
+@if sim
+maybe-clean-sim: clean-sim
 
-clean-readline: 
+clean-sim: 
        @: $(MAKE); $(unstage)
-       @[ -f ./readline/Makefile ] || exit 0; \
+       @[ -f ./sim/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30857,24 +26791,24 @@ clean-readline:
                  clean) \
          || exit 1
 
-@endif readline
+@endif sim
 
-.PHONY: maybe-distclean-readline distclean-readline
-maybe-distclean-readline:
-@if readline
-maybe-distclean-readline: distclean-readline
+.PHONY: maybe-distclean-sim distclean-sim
+maybe-distclean-sim:
+@if sim
+maybe-distclean-sim: distclean-sim
 
-distclean-readline: 
+distclean-sim: 
        @: $(MAKE); $(unstage)
-       @[ -f ./readline/Makefile ] || exit 0; \
+       @[ -f ./sim/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30882,24 +26816,24 @@ distclean-readline:
                  distclean) \
          || exit 1
 
-@endif readline
+@endif sim
 
-.PHONY: maybe-maintainer-clean-readline maintainer-clean-readline
-maybe-maintainer-clean-readline:
-@if readline
-maybe-maintainer-clean-readline: maintainer-clean-readline
+.PHONY: maybe-maintainer-clean-sim maintainer-clean-sim
+maybe-maintainer-clean-sim:
+@if sim
+maybe-maintainer-clean-sim: maintainer-clean-sim
 
-maintainer-clean-readline: 
+maintainer-clean-sim: 
        @: $(MAKE); $(unstage)
-       @[ -f ./readline/Makefile ] || exit 0; \
+       @[ -f ./sim/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -30907,101 +26841,117 @@ maintainer-clean-readline:
                  maintainer-clean) \
          || exit 1
 
-@endif readline
+@endif sim
 
 
 
-.PHONY: configure-release maybe-configure-release
-maybe-configure-release:
+.PHONY: configure-texinfo maybe-configure-texinfo
+maybe-configure-texinfo:
 @if gcc-bootstrap
-configure-release: stage_current
+configure-texinfo: stage_current
 @endif gcc-bootstrap
-@if release
-maybe-configure-release: configure-release
-configure-release: 
+@if texinfo
+maybe-configure-texinfo: configure-texinfo
+configure-texinfo: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/release/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/release ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/release; \
-       cd "$(HOST_SUBDIR)/release" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/texinfo/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/texinfo; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/texinfo; \
+       cd "$(HOST_SUBDIR)/texinfo" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/release/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/texinfo/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/release"; \
-       libsrcdir="$$s/release"; \
-       $(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 release
+@endif texinfo
 
 
 
 
 
-.PHONY: all-release maybe-all-release
-maybe-all-release:
+.PHONY: all-texinfo maybe-all-texinfo
+maybe-all-texinfo:
 @if gcc-bootstrap
-all-release: stage_current
+all-texinfo: stage_current
 @endif gcc-bootstrap
-@if release
-TARGET-release=all
-maybe-all-release: all-release
-all-release: configure-release
+@if texinfo
+TARGET-texinfo=all
+maybe-all-texinfo: all-texinfo
+all-texinfo: configure-texinfo
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/release && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-release))
-@endif release
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/texinfo && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-texinfo))
+@endif texinfo
+
 
 
 
+.PHONY: check-texinfo maybe-check-texinfo
+maybe-check-texinfo:
+@if texinfo
+maybe-check-texinfo: check-texinfo
+
+check-texinfo:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/texinfo && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif texinfo
 
-.PHONY: check-release maybe-check-release
-maybe-check-release:
-@if release
-maybe-check-release: check-release
+.PHONY: install-texinfo maybe-install-texinfo
+maybe-install-texinfo:
+@if texinfo
+maybe-install-texinfo: install-texinfo
 
-check-release:
+install-texinfo:
 
-@endif release
+@endif texinfo
 
-.PHONY: install-release maybe-install-release
-maybe-install-release:
-@if release
-maybe-install-release: install-release
+.PHONY: install-strip-texinfo maybe-install-strip-texinfo
+maybe-install-strip-texinfo:
+@if texinfo
+maybe-install-strip-texinfo: install-strip-texinfo
 
-install-release:
+install-strip-texinfo:
 
-@endif release
+@endif texinfo
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-release info-release
-maybe-info-release:
-@if release
-maybe-info-release: info-release
+.PHONY: maybe-info-texinfo info-texinfo
+maybe-info-texinfo:
+@if texinfo
+maybe-info-texinfo: info-texinfo
 
-info-release: \
-    configure-release 
+info-texinfo: \
+    configure-texinfo 
        @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
+       @[ -f ./texinfo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 release" ; \
-       (cd $(HOST_SUBDIR)/release && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -31009,25 +26959,25 @@ info-release: \
                  info) \
          || exit 1
 
-@endif release
+@endif texinfo
 
-.PHONY: maybe-dvi-release dvi-release
-maybe-dvi-release:
-@if release
-maybe-dvi-release: dvi-release
+.PHONY: maybe-dvi-texinfo dvi-texinfo
+maybe-dvi-texinfo:
+@if texinfo
+maybe-dvi-texinfo: dvi-texinfo
 
-dvi-release: \
-    configure-release 
+dvi-texinfo: \
+    configure-texinfo 
        @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
+       @[ -f ./texinfo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 release" ; \
-       (cd $(HOST_SUBDIR)/release && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -31035,25 +26985,25 @@ dvi-release: \
                  dvi) \
          || exit 1
 
-@endif release
+@endif texinfo
 
-.PHONY: maybe-pdf-release pdf-release
-maybe-pdf-release:
-@if release
-maybe-pdf-release: pdf-release
+.PHONY: maybe-pdf-texinfo pdf-texinfo
+maybe-pdf-texinfo:
+@if texinfo
+maybe-pdf-texinfo: pdf-texinfo
 
-pdf-release: \
-    configure-release 
+pdf-texinfo: \
+    configure-texinfo 
        @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
+       @[ -f ./texinfo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 release" ; \
-       (cd $(HOST_SUBDIR)/release && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -31061,25 +27011,25 @@ pdf-release: \
                  pdf) \
          || exit 1
 
-@endif release
+@endif texinfo
 
-.PHONY: maybe-html-release html-release
-maybe-html-release:
-@if release
-maybe-html-release: html-release
+.PHONY: maybe-html-texinfo html-texinfo
+maybe-html-texinfo:
+@if texinfo
+maybe-html-texinfo: html-texinfo
 
-html-release: \
-    configure-release 
+html-texinfo: \
+    configure-texinfo 
        @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
+       @[ -f ./texinfo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 release" ; \
-       (cd $(HOST_SUBDIR)/release && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -31087,25 +27037,25 @@ html-release: \
                  html) \
          || exit 1
 
-@endif release
+@endif texinfo
 
-.PHONY: maybe-TAGS-release TAGS-release
-maybe-TAGS-release:
-@if release
-maybe-TAGS-release: TAGS-release
+.PHONY: maybe-TAGS-texinfo TAGS-texinfo
+maybe-TAGS-texinfo:
+@if texinfo
+maybe-TAGS-texinfo: TAGS-texinfo
 
-TAGS-release: \
-    configure-release 
+TAGS-texinfo: \
+    configure-texinfo 
        @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
+       @[ -f ./texinfo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 release" ; \
-       (cd $(HOST_SUBDIR)/release && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -31113,26 +27063,26 @@ TAGS-release: \
                  TAGS) \
          || exit 1
 
-@endif release
+@endif texinfo
 
-.PHONY: maybe-install-info-release install-info-release
-maybe-install-info-release:
-@if release
-maybe-install-info-release: install-info-release
+.PHONY: maybe-install-info-texinfo install-info-texinfo
+maybe-install-info-texinfo:
+@if texinfo
+maybe-install-info-texinfo: install-info-texinfo
 
-install-info-release: \
-    configure-release \
-    info-release 
+install-info-texinfo: \
+    configure-texinfo \
+    info-texinfo 
        @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
+       @[ -f ./texinfo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 release" ; \
-       (cd $(HOST_SUBDIR)/release && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -31140,26 +27090,26 @@ install-info-release: \
                  install-info) \
          || exit 1
 
-@endif release
+@endif texinfo
 
-.PHONY: maybe-install-pdf-release install-pdf-release
-maybe-install-pdf-release:
-@if release
-maybe-install-pdf-release: install-pdf-release
+.PHONY: maybe-install-pdf-texinfo install-pdf-texinfo
+maybe-install-pdf-texinfo:
+@if texinfo
+maybe-install-pdf-texinfo: install-pdf-texinfo
 
-install-pdf-release: \
-    configure-release \
-    pdf-release 
+install-pdf-texinfo: \
+    configure-texinfo \
+    pdf-texinfo 
        @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
+       @[ -f ./texinfo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 release" ; \
-       (cd $(HOST_SUBDIR)/release && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -31167,26 +27117,26 @@ install-pdf-release: \
                  install-pdf) \
          || exit 1
 
-@endif release
+@endif texinfo
 
-.PHONY: maybe-install-html-release install-html-release
-maybe-install-html-release:
-@if release
-maybe-install-html-release: install-html-release
+.PHONY: maybe-install-html-texinfo install-html-texinfo
+maybe-install-html-texinfo:
+@if texinfo
+maybe-install-html-texinfo: install-html-texinfo
 
-install-html-release: \
-    configure-release \
-    html-release 
+install-html-texinfo: \
+    configure-texinfo \
+    html-texinfo 
        @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
+       @[ -f ./texinfo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 release" ; \
-       (cd $(HOST_SUBDIR)/release && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -31194,25 +27144,25 @@ install-html-release: \
                  install-html) \
          || exit 1
 
-@endif release
+@endif texinfo
 
-.PHONY: maybe-installcheck-release installcheck-release
-maybe-installcheck-release:
-@if release
-maybe-installcheck-release: installcheck-release
+.PHONY: maybe-installcheck-texinfo installcheck-texinfo
+maybe-installcheck-texinfo:
+@if texinfo
+maybe-installcheck-texinfo: installcheck-texinfo
 
-installcheck-release: \
-    configure-release 
+installcheck-texinfo: \
+    configure-texinfo 
        @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
+       @[ -f ./texinfo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 release" ; \
-       (cd $(HOST_SUBDIR)/release && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -31220,24 +27170,24 @@ installcheck-release: \
                  installcheck) \
          || exit 1
 
-@endif release
+@endif texinfo
 
-.PHONY: maybe-mostlyclean-release mostlyclean-release
-maybe-mostlyclean-release:
-@if release
-maybe-mostlyclean-release: mostlyclean-release
+.PHONY: maybe-mostlyclean-texinfo mostlyclean-texinfo
+maybe-mostlyclean-texinfo:
+@if texinfo
+maybe-mostlyclean-texinfo: mostlyclean-texinfo
 
-mostlyclean-release: 
+mostlyclean-texinfo: 
        @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
+       @[ -f ./texinfo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 release" ; \
-       (cd $(HOST_SUBDIR)/release && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -31245,24 +27195,24 @@ mostlyclean-release:
                  mostlyclean) \
          || exit 1
 
-@endif release
+@endif texinfo
 
-.PHONY: maybe-clean-release clean-release
-maybe-clean-release:
-@if release
-maybe-clean-release: clean-release
+.PHONY: maybe-clean-texinfo clean-texinfo
+maybe-clean-texinfo:
+@if texinfo
+maybe-clean-texinfo: clean-texinfo
 
-clean-release: 
+clean-texinfo: 
        @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
+       @[ -f ./texinfo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 release" ; \
-       (cd $(HOST_SUBDIR)/release && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -31270,24 +27220,24 @@ clean-release:
                  clean) \
          || exit 1
 
-@endif release
+@endif texinfo
 
-.PHONY: maybe-distclean-release distclean-release
-maybe-distclean-release:
-@if release
-maybe-distclean-release: distclean-release
+.PHONY: maybe-distclean-texinfo distclean-texinfo
+maybe-distclean-texinfo:
+@if texinfo
+maybe-distclean-texinfo: distclean-texinfo
 
-distclean-release: 
+distclean-texinfo: 
        @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
+       @[ -f ./texinfo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 release" ; \
-       (cd $(HOST_SUBDIR)/release && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -31295,24 +27245,24 @@ distclean-release:
                  distclean) \
          || exit 1
 
-@endif release
+@endif texinfo
 
-.PHONY: maybe-maintainer-clean-release maintainer-clean-release
-maybe-maintainer-clean-release:
-@if release
-maybe-maintainer-clean-release: maintainer-clean-release
+.PHONY: maybe-maintainer-clean-texinfo maintainer-clean-texinfo
+maybe-maintainer-clean-texinfo:
+@if texinfo
+maybe-maintainer-clean-texinfo: maintainer-clean-texinfo
 
-maintainer-clean-release: 
+maintainer-clean-texinfo: 
        @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
+       @[ -f ./texinfo/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 release" ; \
-       (cd $(HOST_SUBDIR)/release && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -31320,538 +27270,568 @@ maintainer-clean-release:
                  maintainer-clean) \
          || exit 1
 
-@endif release
+@endif texinfo
 
 
 
-.PHONY: configure-recode maybe-configure-recode
-maybe-configure-recode:
+.PHONY: configure-zlib maybe-configure-zlib
+maybe-configure-zlib:
 @if gcc-bootstrap
-configure-recode: stage_current
+configure-zlib: stage_current
 @endif gcc-bootstrap
-@if recode
-maybe-configure-recode: configure-recode
-configure-recode: 
-       @: $(MAKE); $(unstage)
+@if zlib
+maybe-configure-zlib: configure-zlib
+configure-zlib: 
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/recode/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/recode ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/recode; \
-       cd "$(HOST_SUBDIR)/recode" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/zlib; \
+       cd "$(HOST_SUBDIR)/zlib" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/recode/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/recode"; \
-       libsrcdir="$$s/recode"; \
-       $(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 recode
-
-
+@endif zlib
 
 
 
-.PHONY: all-recode maybe-all-recode
-maybe-all-recode:
-@if gcc-bootstrap
-all-recode: stage_current
-@endif gcc-bootstrap
-@if recode
-TARGET-recode=all
-maybe-all-recode: all-recode
-all-recode: configure-recode
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage1-zlib maybe-configure-stage1-zlib
+maybe-configure-stage1-zlib:
+@if zlib-bootstrap
+maybe-configure-stage1-zlib: configure-stage1-zlib
+configure-stage1-zlib:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/recode && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-recode))
-@endif recode
-
-
-
-
-.PHONY: check-recode maybe-check-recode
-maybe-check-recode:
-@if recode
-maybe-check-recode: check-recode
+       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; \
+       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; \
+       module_srcdir=zlib; \
+       $(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_zlib_configure_flags@
+@endif zlib-bootstrap
 
-check-recode:
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage2-zlib maybe-configure-stage2-zlib
+maybe-configure-stage2-zlib:
+@if zlib-bootstrap
+maybe-configure-stage2-zlib: configure-stage2-zlib
+configure-stage2-zlib:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/recode && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif recode
-
-.PHONY: install-recode maybe-install-recode
-maybe-install-recode:
-@if recode
-maybe-install-recode: install-recode
+       $(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)/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; \
+       module_srcdir=zlib; \
+       $(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_zlib_configure_flags@
+@endif zlib-bootstrap
 
-install-recode: installdirs
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage3-zlib maybe-configure-stage3-zlib
+maybe-configure-stage3-zlib:
+@if zlib-bootstrap
+maybe-configure-stage3-zlib: configure-stage3-zlib
+configure-stage3-zlib:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/recode && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif recode
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-recode info-recode
-maybe-info-recode:
-@if recode
-maybe-info-recode: info-recode
-
-info-recode: \
-    configure-recode 
-       @: $(MAKE); $(unstage)
-       @[ -f ./recode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 recode" ; \
-       (cd $(HOST_SUBDIR)/recode && \
-         $(MAKE) $(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 recode
-
-.PHONY: maybe-dvi-recode dvi-recode
-maybe-dvi-recode:
-@if recode
-maybe-dvi-recode: dvi-recode
-
-dvi-recode: \
-    configure-recode 
-       @: $(MAKE); $(unstage)
-       @[ -f ./recode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 recode" ; \
-       (cd $(HOST_SUBDIR)/recode && \
-         $(MAKE) $(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 recode
-
-.PHONY: maybe-pdf-recode pdf-recode
-maybe-pdf-recode:
-@if recode
-maybe-pdf-recode: pdf-recode
-
-pdf-recode: \
-    configure-recode 
-       @: $(MAKE); $(unstage)
-       @[ -f ./recode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 recode" ; \
-       (cd $(HOST_SUBDIR)/recode && \
-         $(MAKE) $(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 recode
-
-.PHONY: maybe-html-recode html-recode
-maybe-html-recode:
-@if recode
-maybe-html-recode: html-recode
+       $(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)/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; \
+       module_srcdir=zlib; \
+       $(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_zlib_configure_flags@
+@endif zlib-bootstrap
 
-html-recode: \
-    configure-recode 
-       @: $(MAKE); $(unstage)
-       @[ -f ./recode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: configure-stage4-zlib maybe-configure-stage4-zlib
+maybe-configure-stage4-zlib:
+@if zlib-bootstrap
+maybe-configure-stage4-zlib: configure-stage4-zlib
+configure-stage4-zlib:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing html in recode" ; \
-       (cd $(HOST_SUBDIR)/recode && \
-         $(MAKE) $(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 recode
-
-.PHONY: maybe-TAGS-recode TAGS-recode
-maybe-TAGS-recode:
-@if recode
-maybe-TAGS-recode: TAGS-recode
+       $(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)/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; \
+       module_srcdir=zlib; \
+       $(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_zlib_configure_flags@
+@endif zlib-bootstrap
 
-TAGS-recode: \
-    configure-recode 
-       @: $(MAKE); $(unstage)
-       @[ -f ./recode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib
+maybe-configure-stageprofile-zlib:
+@if zlib-bootstrap
+maybe-configure-stageprofile-zlib: configure-stageprofile-zlib
+configure-stageprofile-zlib:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing TAGS in recode" ; \
-       (cd $(HOST_SUBDIR)/recode && \
-         $(MAKE) $(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 recode
-
-.PHONY: maybe-install-info-recode install-info-recode
-maybe-install-info-recode:
-@if recode
-maybe-install-info-recode: install-info-recode
+       $(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)/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; \
+       module_srcdir=zlib; \
+       $(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_zlib_configure_flags@
+@endif zlib-bootstrap
 
-install-info-recode: \
-    configure-recode \
-    info-recode 
-       @: $(MAKE); $(unstage)
-       @[ -f ./recode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib
+maybe-configure-stagefeedback-zlib:
+@if zlib-bootstrap
+maybe-configure-stagefeedback-zlib: configure-stagefeedback-zlib
+configure-stagefeedback-zlib:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing install-info in recode" ; \
-       (cd $(HOST_SUBDIR)/recode && \
-         $(MAKE) $(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 recode
+       $(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)/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; \
+       module_srcdir=zlib; \
+       $(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_zlib_configure_flags@
+@endif zlib-bootstrap
 
-.PHONY: maybe-install-pdf-recode install-pdf-recode
-maybe-install-pdf-recode:
-@if recode
-maybe-install-pdf-recode: install-pdf-recode
 
-install-pdf-recode: \
-    configure-recode \
-    pdf-recode 
-       @: $(MAKE); $(unstage)
-       @[ -f ./recode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 recode" ; \
-       (cd $(HOST_SUBDIR)/recode && \
-         $(MAKE) $(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 recode
 
-.PHONY: maybe-install-html-recode install-html-recode
-maybe-install-html-recode:
-@if recode
-maybe-install-html-recode: install-html-recode
 
-install-html-recode: \
-    configure-recode \
-    html-recode 
-       @: $(MAKE); $(unstage)
-       @[ -f ./recode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-zlib maybe-all-zlib
+maybe-all-zlib:
+@if gcc-bootstrap
+all-zlib: stage_current
+@endif gcc-bootstrap
+@if zlib
+TARGET-zlib=all
+maybe-all-zlib: all-zlib
+all-zlib: configure-zlib
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 recode" ; \
-       (cd $(HOST_SUBDIR)/recode && \
-         $(MAKE) $(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
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/zlib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-zlib))
+@endif zlib
 
-@endif recode
 
-.PHONY: maybe-installcheck-recode installcheck-recode
-maybe-installcheck-recode:
-@if recode
-maybe-installcheck-recode: installcheck-recode
 
-installcheck-recode: \
-    configure-recode 
-       @: $(MAKE); $(unstage)
-       @[ -f ./recode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stage1-zlib maybe-all-stage1-zlib
+.PHONY: clean-stage1-zlib maybe-clean-stage1-zlib
+maybe-all-stage1-zlib:
+maybe-clean-stage1-zlib:
+@if zlib-bootstrap
+maybe-all-stage1-zlib: all-stage1-zlib
+all-stage1: all-stage1-zlib
+TARGET-stage1-zlib = $(TARGET-zlib)
+all-stage1-zlib: configure-stage1-zlib
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing installcheck in recode" ; \
-       (cd $(HOST_SUBDIR)/recode && \
-         $(MAKE) $(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
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/zlib && \
+        \
+       $(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-zlib)
 
-@endif recode
+maybe-clean-stage1-zlib: clean-stage1-zlib
+clean-stage1: clean-stage1-zlib
+clean-stage1-zlib:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-zlib/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif zlib-bootstrap
 
-.PHONY: maybe-mostlyclean-recode mostlyclean-recode
-maybe-mostlyclean-recode:
-@if recode
-maybe-mostlyclean-recode: mostlyclean-recode
 
-mostlyclean-recode: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./recode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stage2-zlib maybe-all-stage2-zlib
+.PHONY: clean-stage2-zlib maybe-clean-stage2-zlib
+maybe-all-stage2-zlib:
+maybe-clean-stage2-zlib:
+@if zlib-bootstrap
+maybe-all-stage2-zlib: all-stage2-zlib
+all-stage2: all-stage2-zlib
+TARGET-stage2-zlib = $(TARGET-zlib)
+all-stage2-zlib: configure-stage2-zlib
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing mostlyclean in recode" ; \
-       (cd $(HOST_SUBDIR)/recode && \
-         $(MAKE) $(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
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/zlib && \
+        \
+       $(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-zlib)
 
-@endif recode
+maybe-clean-stage2-zlib: clean-stage2-zlib
+clean-stage2: clean-stage2-zlib
+clean-stage2-zlib:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-zlib/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif zlib-bootstrap
 
-.PHONY: maybe-clean-recode clean-recode
-maybe-clean-recode:
-@if recode
-maybe-clean-recode: clean-recode
 
-clean-recode: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./recode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stage3-zlib maybe-all-stage3-zlib
+.PHONY: clean-stage3-zlib maybe-clean-stage3-zlib
+maybe-all-stage3-zlib:
+maybe-clean-stage3-zlib:
+@if zlib-bootstrap
+maybe-all-stage3-zlib: all-stage3-zlib
+all-stage3: all-stage3-zlib
+TARGET-stage3-zlib = $(TARGET-zlib)
+all-stage3-zlib: configure-stage3-zlib
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing clean in recode" ; \
-       (cd $(HOST_SUBDIR)/recode && \
-         $(MAKE) $(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
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/zlib && \
+        \
+       $(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-zlib)
 
-@endif recode
+maybe-clean-stage3-zlib: clean-stage3-zlib
+clean-stage3: clean-stage3-zlib
+clean-stage3-zlib:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-zlib/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif zlib-bootstrap
 
-.PHONY: maybe-distclean-recode distclean-recode
-maybe-distclean-recode:
-@if recode
-maybe-distclean-recode: distclean-recode
 
-distclean-recode: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./recode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stage4-zlib maybe-all-stage4-zlib
+.PHONY: clean-stage4-zlib maybe-clean-stage4-zlib
+maybe-all-stage4-zlib:
+maybe-clean-stage4-zlib:
+@if zlib-bootstrap
+maybe-all-stage4-zlib: all-stage4-zlib
+all-stage4: all-stage4-zlib
+TARGET-stage4-zlib = $(TARGET-zlib)
+all-stage4-zlib: configure-stage4-zlib
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing distclean in recode" ; \
-       (cd $(HOST_SUBDIR)/recode && \
-         $(MAKE) $(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
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/zlib && \
+        \
+       $(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-zlib)
 
-@endif recode
+maybe-clean-stage4-zlib: clean-stage4-zlib
+clean-stage4: clean-stage4-zlib
+clean-stage4-zlib:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-zlib/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif zlib-bootstrap
 
-.PHONY: maybe-maintainer-clean-recode maintainer-clean-recode
-maybe-maintainer-clean-recode:
-@if recode
-maybe-maintainer-clean-recode: maintainer-clean-recode
 
-maintainer-clean-recode: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./recode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stageprofile-zlib maybe-all-stageprofile-zlib
+.PHONY: clean-stageprofile-zlib maybe-clean-stageprofile-zlib
+maybe-all-stageprofile-zlib:
+maybe-clean-stageprofile-zlib:
+@if zlib-bootstrap
+maybe-all-stageprofile-zlib: all-stageprofile-zlib
+all-stageprofile: all-stageprofile-zlib
+TARGET-stageprofile-zlib = $(TARGET-zlib)
+all-stageprofile-zlib: configure-stageprofile-zlib
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
        $(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 recode" ; \
-       (cd $(HOST_SUBDIR)/recode && \
-         $(MAKE) $(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 recode
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/zlib && \
+        \
+       $(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-zlib)
 
+maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
+clean-stageprofile: clean-stageprofile-zlib
+clean-stageprofile-zlib:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-zlib/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif zlib-bootstrap
 
 
-.PHONY: configure-sed maybe-configure-sed
-maybe-configure-sed:
-@if gcc-bootstrap
-configure-sed: stage_current
-@endif gcc-bootstrap
-@if sed
-maybe-configure-sed: configure-sed
-configure-sed: 
-       @: $(MAKE); $(unstage)
+.PHONY: all-stagefeedback-zlib maybe-all-stagefeedback-zlib
+.PHONY: clean-stagefeedback-zlib maybe-clean-stagefeedback-zlib
+maybe-all-stagefeedback-zlib:
+maybe-clean-stagefeedback-zlib:
+@if zlib-bootstrap
+maybe-all-stagefeedback-zlib: all-stagefeedback-zlib
+all-stagefeedback: all-stagefeedback-zlib
+TARGET-stagefeedback-zlib = $(TARGET-zlib)
+all-stagefeedback-zlib: configure-stagefeedback-zlib
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/sed/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sed ; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/sed; \
-       cd "$(HOST_SUBDIR)/sed" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/sed/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/sed"; \
-       libsrcdir="$$s/sed"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif sed
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/zlib && \
+        \
+       $(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-zlib)
 
+maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
+clean-stagefeedback: clean-stagefeedback-zlib
+clean-stagefeedback-zlib:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-zlib/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/zlib && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif zlib-bootstrap
 
 
 
 
-.PHONY: all-sed maybe-all-sed
-maybe-all-sed:
-@if gcc-bootstrap
-all-sed: stage_current
-@endif gcc-bootstrap
-@if sed
-TARGET-sed=all
-maybe-all-sed: all-sed
-all-sed: configure-sed
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/sed && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-sed))
-@endif sed
 
+.PHONY: check-zlib maybe-check-zlib
+maybe-check-zlib:
+@if zlib
+maybe-check-zlib: check-zlib
 
+check-zlib:
 
+@endif zlib
 
-.PHONY: check-sed maybe-check-sed
-maybe-check-sed:
-@if sed
-maybe-check-sed: check-sed
+.PHONY: install-zlib maybe-install-zlib
+maybe-install-zlib:
+@if zlib
+maybe-install-zlib: install-zlib
 
-check-sed:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/sed && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+install-zlib:
 
-@endif sed
+@endif zlib
 
-.PHONY: install-sed maybe-install-sed
-maybe-install-sed:
-@if sed
-maybe-install-sed: install-sed
+.PHONY: install-strip-zlib maybe-install-strip-zlib
+maybe-install-strip-zlib:
+@if zlib
+maybe-install-strip-zlib: install-strip-zlib
 
-install-sed: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/sed && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+install-strip-zlib:
 
-@endif sed
+@endif zlib
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-sed info-sed
-maybe-info-sed:
-@if sed
-maybe-info-sed: info-sed
+.PHONY: maybe-info-zlib info-zlib
+maybe-info-zlib:
+@if zlib
+maybe-info-zlib: info-zlib
 
-info-sed: \
-    configure-sed 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
+info-zlib: \
+    configure-zlib 
+       @[ -f ./zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sed" ; \
-       (cd $(HOST_SUBDIR)/sed && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -31859,25 +27839,24 @@ info-sed: \
                  info) \
          || exit 1
 
-@endif sed
+@endif zlib
 
-.PHONY: maybe-dvi-sed dvi-sed
-maybe-dvi-sed:
-@if sed
-maybe-dvi-sed: dvi-sed
+.PHONY: maybe-dvi-zlib dvi-zlib
+maybe-dvi-zlib:
+@if zlib
+maybe-dvi-zlib: dvi-zlib
 
-dvi-sed: \
-    configure-sed 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
+dvi-zlib: \
+    configure-zlib 
+       @[ -f ./zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sed" ; \
-       (cd $(HOST_SUBDIR)/sed && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -31885,25 +27864,24 @@ dvi-sed: \
                  dvi) \
          || exit 1
 
-@endif sed
+@endif zlib
 
-.PHONY: maybe-pdf-sed pdf-sed
-maybe-pdf-sed:
-@if sed
-maybe-pdf-sed: pdf-sed
+.PHONY: maybe-pdf-zlib pdf-zlib
+maybe-pdf-zlib:
+@if zlib
+maybe-pdf-zlib: pdf-zlib
 
-pdf-sed: \
-    configure-sed 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
+pdf-zlib: \
+    configure-zlib 
+       @[ -f ./zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sed" ; \
-       (cd $(HOST_SUBDIR)/sed && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -31911,25 +27889,24 @@ pdf-sed: \
                  pdf) \
          || exit 1
 
-@endif sed
+@endif zlib
 
-.PHONY: maybe-html-sed html-sed
-maybe-html-sed:
-@if sed
-maybe-html-sed: html-sed
+.PHONY: maybe-html-zlib html-zlib
+maybe-html-zlib:
+@if zlib
+maybe-html-zlib: html-zlib
 
-html-sed: \
-    configure-sed 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
+html-zlib: \
+    configure-zlib 
+       @[ -f ./zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sed" ; \
-       (cd $(HOST_SUBDIR)/sed && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -31937,25 +27914,24 @@ html-sed: \
                  html) \
          || exit 1
 
-@endif sed
+@endif zlib
 
-.PHONY: maybe-TAGS-sed TAGS-sed
-maybe-TAGS-sed:
-@if sed
-maybe-TAGS-sed: TAGS-sed
+.PHONY: maybe-TAGS-zlib TAGS-zlib
+maybe-TAGS-zlib:
+@if zlib
+maybe-TAGS-zlib: TAGS-zlib
 
-TAGS-sed: \
-    configure-sed 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
+TAGS-zlib: \
+    configure-zlib 
+       @[ -f ./zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sed" ; \
-       (cd $(HOST_SUBDIR)/sed && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -31963,26 +27939,25 @@ TAGS-sed: \
                  TAGS) \
          || exit 1
 
-@endif sed
+@endif zlib
 
-.PHONY: maybe-install-info-sed install-info-sed
-maybe-install-info-sed:
-@if sed
-maybe-install-info-sed: install-info-sed
+.PHONY: maybe-install-info-zlib install-info-zlib
+maybe-install-info-zlib:
+@if zlib
+maybe-install-info-zlib: install-info-zlib
 
-install-info-sed: \
-    configure-sed \
-    info-sed 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
+install-info-zlib: \
+    configure-zlib \
+    info-zlib 
+       @[ -f ./zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sed" ; \
-       (cd $(HOST_SUBDIR)/sed && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -31990,26 +27965,25 @@ install-info-sed: \
                  install-info) \
          || exit 1
 
-@endif sed
+@endif zlib
 
-.PHONY: maybe-install-pdf-sed install-pdf-sed
-maybe-install-pdf-sed:
-@if sed
-maybe-install-pdf-sed: install-pdf-sed
+.PHONY: maybe-install-pdf-zlib install-pdf-zlib
+maybe-install-pdf-zlib:
+@if zlib
+maybe-install-pdf-zlib: install-pdf-zlib
 
-install-pdf-sed: \
-    configure-sed \
-    pdf-sed 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
+install-pdf-zlib: \
+    configure-zlib \
+    pdf-zlib 
+       @[ -f ./zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sed" ; \
-       (cd $(HOST_SUBDIR)/sed && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -32017,26 +27991,25 @@ install-pdf-sed: \
                  install-pdf) \
          || exit 1
 
-@endif sed
+@endif zlib
 
-.PHONY: maybe-install-html-sed install-html-sed
-maybe-install-html-sed:
-@if sed
-maybe-install-html-sed: install-html-sed
+.PHONY: maybe-install-html-zlib install-html-zlib
+maybe-install-html-zlib:
+@if zlib
+maybe-install-html-zlib: install-html-zlib
 
-install-html-sed: \
-    configure-sed \
-    html-sed 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
+install-html-zlib: \
+    configure-zlib \
+    html-zlib 
+       @[ -f ./zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sed" ; \
-       (cd $(HOST_SUBDIR)/sed && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -32044,25 +28017,24 @@ install-html-sed: \
                  install-html) \
          || exit 1
 
-@endif sed
+@endif zlib
 
-.PHONY: maybe-installcheck-sed installcheck-sed
-maybe-installcheck-sed:
-@if sed
-maybe-installcheck-sed: installcheck-sed
+.PHONY: maybe-installcheck-zlib installcheck-zlib
+maybe-installcheck-zlib:
+@if zlib
+maybe-installcheck-zlib: installcheck-zlib
 
-installcheck-sed: \
-    configure-sed 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
+installcheck-zlib: \
+    configure-zlib 
+       @[ -f ./zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sed" ; \
-       (cd $(HOST_SUBDIR)/sed && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -32070,24 +28042,23 @@ installcheck-sed: \
                  installcheck) \
          || exit 1
 
-@endif sed
+@endif zlib
 
-.PHONY: maybe-mostlyclean-sed mostlyclean-sed
-maybe-mostlyclean-sed:
-@if sed
-maybe-mostlyclean-sed: mostlyclean-sed
+.PHONY: maybe-mostlyclean-zlib mostlyclean-zlib
+maybe-mostlyclean-zlib:
+@if zlib
+maybe-mostlyclean-zlib: mostlyclean-zlib
 
-mostlyclean-sed: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
+mostlyclean-zlib: 
+       @[ -f ./zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sed" ; \
-       (cd $(HOST_SUBDIR)/sed && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -32095,24 +28066,23 @@ mostlyclean-sed:
                  mostlyclean) \
          || exit 1
 
-@endif sed
+@endif zlib
 
-.PHONY: maybe-clean-sed clean-sed
-maybe-clean-sed:
-@if sed
-maybe-clean-sed: clean-sed
+.PHONY: maybe-clean-zlib clean-zlib
+maybe-clean-zlib:
+@if zlib
+maybe-clean-zlib: clean-zlib
 
-clean-sed: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
+clean-zlib: 
+       @[ -f ./zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sed" ; \
-       (cd $(HOST_SUBDIR)/sed && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -32120,24 +28090,23 @@ clean-sed:
                  clean) \
          || exit 1
 
-@endif sed
+@endif zlib
 
-.PHONY: maybe-distclean-sed distclean-sed
-maybe-distclean-sed:
-@if sed
-maybe-distclean-sed: distclean-sed
+.PHONY: maybe-distclean-zlib distclean-zlib
+maybe-distclean-zlib:
+@if zlib
+maybe-distclean-zlib: distclean-zlib
 
-distclean-sed: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
+distclean-zlib: 
+       @[ -f ./zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sed" ; \
-       (cd $(HOST_SUBDIR)/sed && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -32145,24 +28114,23 @@ distclean-sed:
                  distclean) \
          || exit 1
 
-@endif sed
+@endif zlib
 
-.PHONY: maybe-maintainer-clean-sed maintainer-clean-sed
-maybe-maintainer-clean-sed:
-@if sed
-maybe-maintainer-clean-sed: maintainer-clean-sed
+.PHONY: maybe-maintainer-clean-zlib maintainer-clean-zlib
+maybe-maintainer-clean-zlib:
+@if zlib
+maybe-maintainer-clean-zlib: maintainer-clean-zlib
 
-maintainer-clean-sed: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
+maintainer-clean-zlib: 
+       @[ -f ./zlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sed" ; \
-       (cd $(HOST_SUBDIR)/sed && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -32170,113 +28138,129 @@ maintainer-clean-sed:
                  maintainer-clean) \
          || exit 1
 
-@endif sed
+@endif zlib
 
 
 
-.PHONY: configure-send-pr maybe-configure-send-pr
-maybe-configure-send-pr:
+.PHONY: configure-gnulib maybe-configure-gnulib
+maybe-configure-gnulib:
 @if gcc-bootstrap
-configure-send-pr: stage_current
+configure-gnulib: stage_current
 @endif gcc-bootstrap
-@if send-pr
-maybe-configure-send-pr: configure-send-pr
-configure-send-pr: 
+@if gnulib
+maybe-configure-gnulib: configure-gnulib
+configure-gnulib: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/send-pr/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/send-pr ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/send-pr; \
-       cd "$(HOST_SUBDIR)/send-pr" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/gnulib/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnulib; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/gnulib; \
+       cd "$(HOST_SUBDIR)/gnulib" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/send-pr/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gnulib/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/send-pr"; \
-       libsrcdir="$$s/send-pr"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gnulib; \
+       $(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 send-pr
+@endif gnulib
 
 
 
 
 
-.PHONY: all-send-pr maybe-all-send-pr
-maybe-all-send-pr:
+.PHONY: all-gnulib maybe-all-gnulib
+maybe-all-gnulib:
 @if gcc-bootstrap
-all-send-pr: stage_current
+all-gnulib: stage_current
 @endif gcc-bootstrap
-@if send-pr
-TARGET-send-pr=all
-maybe-all-send-pr: all-send-pr
-all-send-pr: configure-send-pr
+@if gnulib
+TARGET-gnulib=all
+maybe-all-gnulib: all-gnulib
+all-gnulib: configure-gnulib
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/send-pr && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-send-pr))
-@endif send-pr
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gnulib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-gnulib))
+@endif gnulib
 
 
 
 
-.PHONY: check-send-pr maybe-check-send-pr
-maybe-check-send-pr:
-@if send-pr
-maybe-check-send-pr: check-send-pr
+.PHONY: check-gnulib maybe-check-gnulib
+maybe-check-gnulib:
+@if gnulib
+maybe-check-gnulib: check-gnulib
 
-check-send-pr:
+check-gnulib:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/send-pr && \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gnulib && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif send-pr
+@endif gnulib
 
-.PHONY: install-send-pr maybe-install-send-pr
-maybe-install-send-pr:
-@if send-pr
-maybe-install-send-pr: install-send-pr
+.PHONY: install-gnulib maybe-install-gnulib
+maybe-install-gnulib:
+@if gnulib
+maybe-install-gnulib: install-gnulib
 
-install-send-pr: installdirs
+install-gnulib: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/send-pr && \
+       (cd $(HOST_SUBDIR)/gnulib && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif send-pr
+@endif gnulib
+
+.PHONY: install-strip-gnulib maybe-install-strip-gnulib
+maybe-install-strip-gnulib:
+@if gnulib
+maybe-install-strip-gnulib: install-strip-gnulib
+
+install-strip-gnulib: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gnulib && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif gnulib
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-send-pr info-send-pr
-maybe-info-send-pr:
-@if send-pr
-maybe-info-send-pr: info-send-pr
+.PHONY: maybe-info-gnulib info-gnulib
+maybe-info-gnulib:
+@if gnulib
+maybe-info-gnulib: info-gnulib
 
-info-send-pr: \
-    configure-send-pr 
+info-gnulib: \
+    configure-gnulib 
        @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+       @[ -f ./gnulib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 send-pr" ; \
-       (cd $(HOST_SUBDIR)/send-pr && \
+       echo "Doing info in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32284,25 +28268,25 @@ info-send-pr: \
                  info) \
          || exit 1
 
-@endif send-pr
+@endif gnulib
 
-.PHONY: maybe-dvi-send-pr dvi-send-pr
-maybe-dvi-send-pr:
-@if send-pr
-maybe-dvi-send-pr: dvi-send-pr
+.PHONY: maybe-dvi-gnulib dvi-gnulib
+maybe-dvi-gnulib:
+@if gnulib
+maybe-dvi-gnulib: dvi-gnulib
 
-dvi-send-pr: \
-    configure-send-pr 
+dvi-gnulib: \
+    configure-gnulib 
        @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+       @[ -f ./gnulib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 send-pr" ; \
-       (cd $(HOST_SUBDIR)/send-pr && \
+       echo "Doing dvi in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32310,25 +28294,25 @@ dvi-send-pr: \
                  dvi) \
          || exit 1
 
-@endif send-pr
+@endif gnulib
 
-.PHONY: maybe-pdf-send-pr pdf-send-pr
-maybe-pdf-send-pr:
-@if send-pr
-maybe-pdf-send-pr: pdf-send-pr
+.PHONY: maybe-pdf-gnulib pdf-gnulib
+maybe-pdf-gnulib:
+@if gnulib
+maybe-pdf-gnulib: pdf-gnulib
 
-pdf-send-pr: \
-    configure-send-pr 
+pdf-gnulib: \
+    configure-gnulib 
        @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+       @[ -f ./gnulib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 send-pr" ; \
-       (cd $(HOST_SUBDIR)/send-pr && \
+       echo "Doing pdf in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32336,25 +28320,25 @@ pdf-send-pr: \
                  pdf) \
          || exit 1
 
-@endif send-pr
+@endif gnulib
 
-.PHONY: maybe-html-send-pr html-send-pr
-maybe-html-send-pr:
-@if send-pr
-maybe-html-send-pr: html-send-pr
+.PHONY: maybe-html-gnulib html-gnulib
+maybe-html-gnulib:
+@if gnulib
+maybe-html-gnulib: html-gnulib
 
-html-send-pr: \
-    configure-send-pr 
+html-gnulib: \
+    configure-gnulib 
        @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+       @[ -f ./gnulib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 send-pr" ; \
-       (cd $(HOST_SUBDIR)/send-pr && \
+       echo "Doing html in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32362,25 +28346,25 @@ html-send-pr: \
                  html) \
          || exit 1
 
-@endif send-pr
+@endif gnulib
 
-.PHONY: maybe-TAGS-send-pr TAGS-send-pr
-maybe-TAGS-send-pr:
-@if send-pr
-maybe-TAGS-send-pr: TAGS-send-pr
+.PHONY: maybe-TAGS-gnulib TAGS-gnulib
+maybe-TAGS-gnulib:
+@if gnulib
+maybe-TAGS-gnulib: TAGS-gnulib
 
-TAGS-send-pr: \
-    configure-send-pr 
+TAGS-gnulib: \
+    configure-gnulib 
        @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+       @[ -f ./gnulib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 send-pr" ; \
-       (cd $(HOST_SUBDIR)/send-pr && \
+       echo "Doing TAGS in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32388,26 +28372,26 @@ TAGS-send-pr: \
                  TAGS) \
          || exit 1
 
-@endif send-pr
+@endif gnulib
 
-.PHONY: maybe-install-info-send-pr install-info-send-pr
-maybe-install-info-send-pr:
-@if send-pr
-maybe-install-info-send-pr: install-info-send-pr
+.PHONY: maybe-install-info-gnulib install-info-gnulib
+maybe-install-info-gnulib:
+@if gnulib
+maybe-install-info-gnulib: install-info-gnulib
 
-install-info-send-pr: \
-    configure-send-pr \
-    info-send-pr 
+install-info-gnulib: \
+    configure-gnulib \
+    info-gnulib 
        @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+       @[ -f ./gnulib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 send-pr" ; \
-       (cd $(HOST_SUBDIR)/send-pr && \
+       echo "Doing install-info in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32415,26 +28399,26 @@ install-info-send-pr: \
                  install-info) \
          || exit 1
 
-@endif send-pr
+@endif gnulib
 
-.PHONY: maybe-install-pdf-send-pr install-pdf-send-pr
-maybe-install-pdf-send-pr:
-@if send-pr
-maybe-install-pdf-send-pr: install-pdf-send-pr
+.PHONY: maybe-install-pdf-gnulib install-pdf-gnulib
+maybe-install-pdf-gnulib:
+@if gnulib
+maybe-install-pdf-gnulib: install-pdf-gnulib
 
-install-pdf-send-pr: \
-    configure-send-pr \
-    pdf-send-pr 
+install-pdf-gnulib: \
+    configure-gnulib \
+    pdf-gnulib 
        @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+       @[ -f ./gnulib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 send-pr" ; \
-       (cd $(HOST_SUBDIR)/send-pr && \
+       echo "Doing install-pdf in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32442,26 +28426,26 @@ install-pdf-send-pr: \
                  install-pdf) \
          || exit 1
 
-@endif send-pr
+@endif gnulib
 
-.PHONY: maybe-install-html-send-pr install-html-send-pr
-maybe-install-html-send-pr:
-@if send-pr
-maybe-install-html-send-pr: install-html-send-pr
+.PHONY: maybe-install-html-gnulib install-html-gnulib
+maybe-install-html-gnulib:
+@if gnulib
+maybe-install-html-gnulib: install-html-gnulib
 
-install-html-send-pr: \
-    configure-send-pr \
-    html-send-pr 
+install-html-gnulib: \
+    configure-gnulib \
+    html-gnulib 
        @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+       @[ -f ./gnulib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 send-pr" ; \
-       (cd $(HOST_SUBDIR)/send-pr && \
+       echo "Doing install-html in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32469,25 +28453,25 @@ install-html-send-pr: \
                  install-html) \
          || exit 1
 
-@endif send-pr
+@endif gnulib
 
-.PHONY: maybe-installcheck-send-pr installcheck-send-pr
-maybe-installcheck-send-pr:
-@if send-pr
-maybe-installcheck-send-pr: installcheck-send-pr
+.PHONY: maybe-installcheck-gnulib installcheck-gnulib
+maybe-installcheck-gnulib:
+@if gnulib
+maybe-installcheck-gnulib: installcheck-gnulib
 
-installcheck-send-pr: \
-    configure-send-pr 
+installcheck-gnulib: \
+    configure-gnulib 
        @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+       @[ -f ./gnulib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 send-pr" ; \
-       (cd $(HOST_SUBDIR)/send-pr && \
+       echo "Doing installcheck in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32495,24 +28479,24 @@ installcheck-send-pr: \
                  installcheck) \
          || exit 1
 
-@endif send-pr
+@endif gnulib
 
-.PHONY: maybe-mostlyclean-send-pr mostlyclean-send-pr
-maybe-mostlyclean-send-pr:
-@if send-pr
-maybe-mostlyclean-send-pr: mostlyclean-send-pr
+.PHONY: maybe-mostlyclean-gnulib mostlyclean-gnulib
+maybe-mostlyclean-gnulib:
+@if gnulib
+maybe-mostlyclean-gnulib: mostlyclean-gnulib
 
-mostlyclean-send-pr: 
+mostlyclean-gnulib: 
        @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+       @[ -f ./gnulib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 send-pr" ; \
-       (cd $(HOST_SUBDIR)/send-pr && \
+       echo "Doing mostlyclean in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32520,24 +28504,24 @@ mostlyclean-send-pr:
                  mostlyclean) \
          || exit 1
 
-@endif send-pr
+@endif gnulib
 
-.PHONY: maybe-clean-send-pr clean-send-pr
-maybe-clean-send-pr:
-@if send-pr
-maybe-clean-send-pr: clean-send-pr
+.PHONY: maybe-clean-gnulib clean-gnulib
+maybe-clean-gnulib:
+@if gnulib
+maybe-clean-gnulib: clean-gnulib
 
-clean-send-pr: 
+clean-gnulib: 
        @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+       @[ -f ./gnulib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 send-pr" ; \
-       (cd $(HOST_SUBDIR)/send-pr && \
+       echo "Doing clean in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32545,24 +28529,24 @@ clean-send-pr:
                  clean) \
          || exit 1
 
-@endif send-pr
+@endif gnulib
 
-.PHONY: maybe-distclean-send-pr distclean-send-pr
-maybe-distclean-send-pr:
-@if send-pr
-maybe-distclean-send-pr: distclean-send-pr
+.PHONY: maybe-distclean-gnulib distclean-gnulib
+maybe-distclean-gnulib:
+@if gnulib
+maybe-distclean-gnulib: distclean-gnulib
 
-distclean-send-pr: 
+distclean-gnulib: 
        @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+       @[ -f ./gnulib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 send-pr" ; \
-       (cd $(HOST_SUBDIR)/send-pr && \
+       echo "Doing distclean in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32570,24 +28554,24 @@ distclean-send-pr:
                  distclean) \
          || exit 1
 
-@endif send-pr
+@endif gnulib
 
-.PHONY: maybe-maintainer-clean-send-pr maintainer-clean-send-pr
-maybe-maintainer-clean-send-pr:
-@if send-pr
-maybe-maintainer-clean-send-pr: maintainer-clean-send-pr
+.PHONY: maybe-maintainer-clean-gnulib maintainer-clean-gnulib
+maybe-maintainer-clean-gnulib:
+@if gnulib
+maybe-maintainer-clean-gnulib: maintainer-clean-gnulib
 
-maintainer-clean-send-pr: 
+maintainer-clean-gnulib: 
        @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
+       @[ -f ./gnulib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 send-pr" ; \
-       (cd $(HOST_SUBDIR)/send-pr && \
+       echo "Doing maintainer-clean in gnulib"; \
+       (cd $(HOST_SUBDIR)/gnulib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32595,113 +28579,129 @@ maintainer-clean-send-pr:
                  maintainer-clean) \
          || exit 1
 
-@endif send-pr
+@endif gnulib
 
 
 
-.PHONY: configure-shellutils maybe-configure-shellutils
-maybe-configure-shellutils:
+.PHONY: configure-gdbsupport maybe-configure-gdbsupport
+maybe-configure-gdbsupport:
 @if gcc-bootstrap
-configure-shellutils: stage_current
+configure-gdbsupport: stage_current
 @endif gcc-bootstrap
-@if shellutils
-maybe-configure-shellutils: configure-shellutils
-configure-shellutils: 
+@if gdbsupport
+maybe-configure-gdbsupport: configure-gdbsupport
+configure-gdbsupport: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/shellutils/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/shellutils ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/shellutils; \
-       cd "$(HOST_SUBDIR)/shellutils" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/gdbsupport/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdbsupport; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/gdbsupport; \
+       cd "$(HOST_SUBDIR)/gdbsupport" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/shellutils/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gdbsupport/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/shellutils"; \
-       libsrcdir="$$s/shellutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gdbsupport; \
+       $(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 shellutils
+@endif gdbsupport
 
 
 
 
 
-.PHONY: all-shellutils maybe-all-shellutils
-maybe-all-shellutils:
+.PHONY: all-gdbsupport maybe-all-gdbsupport
+maybe-all-gdbsupport:
 @if gcc-bootstrap
-all-shellutils: stage_current
+all-gdbsupport: stage_current
 @endif gcc-bootstrap
-@if shellutils
-TARGET-shellutils=all
-maybe-all-shellutils: all-shellutils
-all-shellutils: configure-shellutils
+@if gdbsupport
+TARGET-gdbsupport=all
+maybe-all-gdbsupport: all-gdbsupport
+all-gdbsupport: configure-gdbsupport
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/shellutils && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-shellutils))
-@endif shellutils
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-gdbsupport))
+@endif gdbsupport
 
 
 
 
-.PHONY: check-shellutils maybe-check-shellutils
-maybe-check-shellutils:
-@if shellutils
-maybe-check-shellutils: check-shellutils
+.PHONY: check-gdbsupport maybe-check-gdbsupport
+maybe-check-gdbsupport:
+@if gdbsupport
+maybe-check-gdbsupport: check-gdbsupport
 
-check-shellutils:
+check-gdbsupport:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/shellutils && \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif shellutils
+@endif gdbsupport
 
-.PHONY: install-shellutils maybe-install-shellutils
-maybe-install-shellutils:
-@if shellutils
-maybe-install-shellutils: install-shellutils
+.PHONY: install-gdbsupport maybe-install-gdbsupport
+maybe-install-gdbsupport:
+@if gdbsupport
+maybe-install-gdbsupport: install-gdbsupport
 
-install-shellutils: installdirs
+install-gdbsupport: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/shellutils && \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif shellutils
+@endif gdbsupport
+
+.PHONY: install-strip-gdbsupport maybe-install-strip-gdbsupport
+maybe-install-strip-gdbsupport:
+@if gdbsupport
+maybe-install-strip-gdbsupport: install-strip-gdbsupport
+
+install-strip-gdbsupport: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif gdbsupport
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-shellutils info-shellutils
-maybe-info-shellutils:
-@if shellutils
-maybe-info-shellutils: info-shellutils
+.PHONY: maybe-info-gdbsupport info-gdbsupport
+maybe-info-gdbsupport:
+@if gdbsupport
+maybe-info-gdbsupport: info-gdbsupport
 
-info-shellutils: \
-    configure-shellutils 
+info-gdbsupport: \
+    configure-gdbsupport 
        @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 shellutils" ; \
-       (cd $(HOST_SUBDIR)/shellutils && \
+       echo "Doing info in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32709,25 +28709,25 @@ info-shellutils: \
                  info) \
          || exit 1
 
-@endif shellutils
+@endif gdbsupport
 
-.PHONY: maybe-dvi-shellutils dvi-shellutils
-maybe-dvi-shellutils:
-@if shellutils
-maybe-dvi-shellutils: dvi-shellutils
+.PHONY: maybe-dvi-gdbsupport dvi-gdbsupport
+maybe-dvi-gdbsupport:
+@if gdbsupport
+maybe-dvi-gdbsupport: dvi-gdbsupport
 
-dvi-shellutils: \
-    configure-shellutils 
+dvi-gdbsupport: \
+    configure-gdbsupport 
        @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 shellutils" ; \
-       (cd $(HOST_SUBDIR)/shellutils && \
+       echo "Doing dvi in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32735,25 +28735,25 @@ dvi-shellutils: \
                  dvi) \
          || exit 1
 
-@endif shellutils
+@endif gdbsupport
 
-.PHONY: maybe-pdf-shellutils pdf-shellutils
-maybe-pdf-shellutils:
-@if shellutils
-maybe-pdf-shellutils: pdf-shellutils
+.PHONY: maybe-pdf-gdbsupport pdf-gdbsupport
+maybe-pdf-gdbsupport:
+@if gdbsupport
+maybe-pdf-gdbsupport: pdf-gdbsupport
 
-pdf-shellutils: \
-    configure-shellutils 
+pdf-gdbsupport: \
+    configure-gdbsupport 
        @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 shellutils" ; \
-       (cd $(HOST_SUBDIR)/shellutils && \
+       echo "Doing pdf in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32761,25 +28761,25 @@ pdf-shellutils: \
                  pdf) \
          || exit 1
 
-@endif shellutils
+@endif gdbsupport
 
-.PHONY: maybe-html-shellutils html-shellutils
-maybe-html-shellutils:
-@if shellutils
-maybe-html-shellutils: html-shellutils
+.PHONY: maybe-html-gdbsupport html-gdbsupport
+maybe-html-gdbsupport:
+@if gdbsupport
+maybe-html-gdbsupport: html-gdbsupport
 
-html-shellutils: \
-    configure-shellutils 
+html-gdbsupport: \
+    configure-gdbsupport 
        @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 shellutils" ; \
-       (cd $(HOST_SUBDIR)/shellutils && \
+       echo "Doing html in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32787,25 +28787,25 @@ html-shellutils: \
                  html) \
          || exit 1
 
-@endif shellutils
+@endif gdbsupport
 
-.PHONY: maybe-TAGS-shellutils TAGS-shellutils
-maybe-TAGS-shellutils:
-@if shellutils
-maybe-TAGS-shellutils: TAGS-shellutils
+.PHONY: maybe-TAGS-gdbsupport TAGS-gdbsupport
+maybe-TAGS-gdbsupport:
+@if gdbsupport
+maybe-TAGS-gdbsupport: TAGS-gdbsupport
 
-TAGS-shellutils: \
-    configure-shellutils 
+TAGS-gdbsupport: \
+    configure-gdbsupport 
        @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 shellutils" ; \
-       (cd $(HOST_SUBDIR)/shellutils && \
+       echo "Doing TAGS in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32813,26 +28813,26 @@ TAGS-shellutils: \
                  TAGS) \
          || exit 1
 
-@endif shellutils
+@endif gdbsupport
 
-.PHONY: maybe-install-info-shellutils install-info-shellutils
-maybe-install-info-shellutils:
-@if shellutils
-maybe-install-info-shellutils: install-info-shellutils
+.PHONY: maybe-install-info-gdbsupport install-info-gdbsupport
+maybe-install-info-gdbsupport:
+@if gdbsupport
+maybe-install-info-gdbsupport: install-info-gdbsupport
 
-install-info-shellutils: \
-    configure-shellutils \
-    info-shellutils 
+install-info-gdbsupport: \
+    configure-gdbsupport \
+    info-gdbsupport 
        @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 shellutils" ; \
-       (cd $(HOST_SUBDIR)/shellutils && \
+       echo "Doing install-info in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32840,26 +28840,26 @@ install-info-shellutils: \
                  install-info) \
          || exit 1
 
-@endif shellutils
+@endif gdbsupport
 
-.PHONY: maybe-install-pdf-shellutils install-pdf-shellutils
-maybe-install-pdf-shellutils:
-@if shellutils
-maybe-install-pdf-shellutils: install-pdf-shellutils
+.PHONY: maybe-install-pdf-gdbsupport install-pdf-gdbsupport
+maybe-install-pdf-gdbsupport:
+@if gdbsupport
+maybe-install-pdf-gdbsupport: install-pdf-gdbsupport
 
-install-pdf-shellutils: \
-    configure-shellutils \
-    pdf-shellutils 
+install-pdf-gdbsupport: \
+    configure-gdbsupport \
+    pdf-gdbsupport 
        @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 shellutils" ; \
-       (cd $(HOST_SUBDIR)/shellutils && \
+       echo "Doing install-pdf in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32867,26 +28867,26 @@ install-pdf-shellutils: \
                  install-pdf) \
          || exit 1
 
-@endif shellutils
+@endif gdbsupport
 
-.PHONY: maybe-install-html-shellutils install-html-shellutils
-maybe-install-html-shellutils:
-@if shellutils
-maybe-install-html-shellutils: install-html-shellutils
+.PHONY: maybe-install-html-gdbsupport install-html-gdbsupport
+maybe-install-html-gdbsupport:
+@if gdbsupport
+maybe-install-html-gdbsupport: install-html-gdbsupport
 
-install-html-shellutils: \
-    configure-shellutils \
-    html-shellutils 
+install-html-gdbsupport: \
+    configure-gdbsupport \
+    html-gdbsupport 
        @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 shellutils" ; \
-       (cd $(HOST_SUBDIR)/shellutils && \
+       echo "Doing install-html in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32894,25 +28894,25 @@ install-html-shellutils: \
                  install-html) \
          || exit 1
 
-@endif shellutils
+@endif gdbsupport
 
-.PHONY: maybe-installcheck-shellutils installcheck-shellutils
-maybe-installcheck-shellutils:
-@if shellutils
-maybe-installcheck-shellutils: installcheck-shellutils
+.PHONY: maybe-installcheck-gdbsupport installcheck-gdbsupport
+maybe-installcheck-gdbsupport:
+@if gdbsupport
+maybe-installcheck-gdbsupport: installcheck-gdbsupport
 
-installcheck-shellutils: \
-    configure-shellutils 
+installcheck-gdbsupport: \
+    configure-gdbsupport 
        @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 shellutils" ; \
-       (cd $(HOST_SUBDIR)/shellutils && \
+       echo "Doing installcheck in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32920,24 +28920,24 @@ installcheck-shellutils: \
                  installcheck) \
          || exit 1
 
-@endif shellutils
+@endif gdbsupport
 
-.PHONY: maybe-mostlyclean-shellutils mostlyclean-shellutils
-maybe-mostlyclean-shellutils:
-@if shellutils
-maybe-mostlyclean-shellutils: mostlyclean-shellutils
+.PHONY: maybe-mostlyclean-gdbsupport mostlyclean-gdbsupport
+maybe-mostlyclean-gdbsupport:
+@if gdbsupport
+maybe-mostlyclean-gdbsupport: mostlyclean-gdbsupport
 
-mostlyclean-shellutils: 
+mostlyclean-gdbsupport: 
        @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 shellutils" ; \
-       (cd $(HOST_SUBDIR)/shellutils && \
+       echo "Doing mostlyclean in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32945,24 +28945,24 @@ mostlyclean-shellutils:
                  mostlyclean) \
          || exit 1
 
-@endif shellutils
+@endif gdbsupport
 
-.PHONY: maybe-clean-shellutils clean-shellutils
-maybe-clean-shellutils:
-@if shellutils
-maybe-clean-shellutils: clean-shellutils
+.PHONY: maybe-clean-gdbsupport clean-gdbsupport
+maybe-clean-gdbsupport:
+@if gdbsupport
+maybe-clean-gdbsupport: clean-gdbsupport
 
-clean-shellutils: 
+clean-gdbsupport: 
        @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 shellutils" ; \
-       (cd $(HOST_SUBDIR)/shellutils && \
+       echo "Doing clean in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32970,24 +28970,24 @@ clean-shellutils:
                  clean) \
          || exit 1
 
-@endif shellutils
+@endif gdbsupport
 
-.PHONY: maybe-distclean-shellutils distclean-shellutils
-maybe-distclean-shellutils:
-@if shellutils
-maybe-distclean-shellutils: distclean-shellutils
+.PHONY: maybe-distclean-gdbsupport distclean-gdbsupport
+maybe-distclean-gdbsupport:
+@if gdbsupport
+maybe-distclean-gdbsupport: distclean-gdbsupport
 
-distclean-shellutils: 
+distclean-gdbsupport: 
        @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 shellutils" ; \
-       (cd $(HOST_SUBDIR)/shellutils && \
+       echo "Doing distclean in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -32995,24 +28995,24 @@ distclean-shellutils:
                  distclean) \
          || exit 1
 
-@endif shellutils
+@endif gdbsupport
 
-.PHONY: maybe-maintainer-clean-shellutils maintainer-clean-shellutils
-maybe-maintainer-clean-shellutils:
-@if shellutils
-maybe-maintainer-clean-shellutils: maintainer-clean-shellutils
+.PHONY: maybe-maintainer-clean-gdbsupport maintainer-clean-gdbsupport
+maybe-maintainer-clean-gdbsupport:
+@if gdbsupport
+maybe-maintainer-clean-gdbsupport: maintainer-clean-gdbsupport
 
-maintainer-clean-shellutils: 
+maintainer-clean-gdbsupport: 
        @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
+       @[ -f ./gdbsupport/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 shellutils" ; \
-       (cd $(HOST_SUBDIR)/shellutils && \
+       echo "Doing maintainer-clean in gdbsupport"; \
+       (cd $(HOST_SUBDIR)/gdbsupport && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33020,113 +29020,129 @@ maintainer-clean-shellutils:
                  maintainer-clean) \
          || exit 1
 
-@endif shellutils
+@endif gdbsupport
 
 
 
-.PHONY: configure-sid maybe-configure-sid
-maybe-configure-sid:
+.PHONY: configure-gdbserver maybe-configure-gdbserver
+maybe-configure-gdbserver:
 @if gcc-bootstrap
-configure-sid: stage_current
+configure-gdbserver: stage_current
 @endif gcc-bootstrap
-@if sid
-maybe-configure-sid: configure-sid
-configure-sid: 
+@if gdbserver
+maybe-configure-gdbserver: configure-gdbserver
+configure-gdbserver: 
        @: $(MAKE); $(unstage)
        @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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/sid; \
-       cd "$(HOST_SUBDIR)/sid" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/gdbserver/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdbserver; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/gdbserver; \
+       cd "$(HOST_SUBDIR)/gdbserver" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/sid/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gdbserver/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/sid"; \
-       libsrcdir="$$s/sid"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gdbserver; \
+       $(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
+@endif gdbserver
 
 
 
 
 
-.PHONY: all-sid maybe-all-sid
-maybe-all-sid:
+.PHONY: all-gdbserver maybe-all-gdbserver
+maybe-all-gdbserver:
 @if gcc-bootstrap
-all-sid: stage_current
+all-gdbserver: stage_current
 @endif gcc-bootstrap
-@if sid
-TARGET-sid=all
-maybe-all-sid: all-sid
-all-sid: configure-sid
+@if gdbserver
+TARGET-gdbserver=all
+maybe-all-gdbserver: all-gdbserver
+all-gdbserver: configure-gdbserver
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/sid && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-sid))
-@endif sid
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gdbserver && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-gdbserver))
+@endif gdbserver
 
 
 
 
-.PHONY: check-sid maybe-check-sid
-maybe-check-sid:
-@if sid
-maybe-check-sid: check-sid
+.PHONY: check-gdbserver maybe-check-gdbserver
+maybe-check-gdbserver:
+@if gdbserver
+maybe-check-gdbserver: check-gdbserver
 
-check-sid:
+check-gdbserver:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/sid && \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif sid
+@endif gdbserver
 
-.PHONY: install-sid maybe-install-sid
-maybe-install-sid:
-@if sid
-maybe-install-sid: install-sid
+.PHONY: install-gdbserver maybe-install-gdbserver
+maybe-install-gdbserver:
+@if gdbserver
+maybe-install-gdbserver: install-gdbserver
 
-install-sid: installdirs
+install-gdbserver: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/sid && \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif sid
+@endif gdbserver
+
+.PHONY: install-strip-gdbserver maybe-install-strip-gdbserver
+maybe-install-strip-gdbserver:
+@if gdbserver
+maybe-install-strip-gdbserver: install-strip-gdbserver
+
+install-strip-gdbserver: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gdbserver && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif gdbserver
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-sid info-sid
-maybe-info-sid:
-@if sid
-maybe-info-sid: info-sid
+.PHONY: maybe-info-gdbserver info-gdbserver
+maybe-info-gdbserver:
+@if gdbserver
+maybe-info-gdbserver: info-gdbserver
 
-info-sid: \
-    configure-sid 
+info-gdbserver: \
+    configure-gdbserver 
        @: $(MAKE); $(unstage)
-       @[ -f ./sid/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
+       echo "Doing info in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33134,25 +29150,25 @@ info-sid: \
                  info) \
          || exit 1
 
-@endif sid
+@endif gdbserver
 
-.PHONY: maybe-dvi-sid dvi-sid
-maybe-dvi-sid:
-@if sid
-maybe-dvi-sid: dvi-sid
+.PHONY: maybe-dvi-gdbserver dvi-gdbserver
+maybe-dvi-gdbserver:
+@if gdbserver
+maybe-dvi-gdbserver: dvi-gdbserver
 
-dvi-sid: \
-    configure-sid 
+dvi-gdbserver: \
+    configure-gdbserver 
        @: $(MAKE); $(unstage)
-       @[ -f ./sid/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
+       echo "Doing dvi in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33160,25 +29176,25 @@ dvi-sid: \
                  dvi) \
          || exit 1
 
-@endif sid
+@endif gdbserver
 
-.PHONY: maybe-pdf-sid pdf-sid
-maybe-pdf-sid:
-@if sid
-maybe-pdf-sid: pdf-sid
+.PHONY: maybe-pdf-gdbserver pdf-gdbserver
+maybe-pdf-gdbserver:
+@if gdbserver
+maybe-pdf-gdbserver: pdf-gdbserver
 
-pdf-sid: \
-    configure-sid 
+pdf-gdbserver: \
+    configure-gdbserver 
        @: $(MAKE); $(unstage)
-       @[ -f ./sid/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
+       echo "Doing pdf in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33186,25 +29202,25 @@ pdf-sid: \
                  pdf) \
          || exit 1
 
-@endif sid
+@endif gdbserver
 
-.PHONY: maybe-html-sid html-sid
-maybe-html-sid:
-@if sid
-maybe-html-sid: html-sid
+.PHONY: maybe-html-gdbserver html-gdbserver
+maybe-html-gdbserver:
+@if gdbserver
+maybe-html-gdbserver: html-gdbserver
 
-html-sid: \
-    configure-sid 
+html-gdbserver: \
+    configure-gdbserver 
        @: $(MAKE); $(unstage)
-       @[ -f ./sid/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
+       echo "Doing html in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33212,25 +29228,25 @@ html-sid: \
                  html) \
          || exit 1
 
-@endif sid
+@endif gdbserver
 
-.PHONY: maybe-TAGS-sid TAGS-sid
-maybe-TAGS-sid:
-@if sid
-maybe-TAGS-sid: TAGS-sid
+.PHONY: maybe-TAGS-gdbserver TAGS-gdbserver
+maybe-TAGS-gdbserver:
+@if gdbserver
+maybe-TAGS-gdbserver: TAGS-gdbserver
 
-TAGS-sid: \
-    configure-sid 
+TAGS-gdbserver: \
+    configure-gdbserver 
        @: $(MAKE); $(unstage)
-       @[ -f ./sid/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
+       echo "Doing TAGS in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33238,26 +29254,26 @@ TAGS-sid: \
                  TAGS) \
          || exit 1
 
-@endif sid
+@endif gdbserver
 
-.PHONY: maybe-install-info-sid install-info-sid
-maybe-install-info-sid:
-@if sid
-maybe-install-info-sid: install-info-sid
+.PHONY: maybe-install-info-gdbserver install-info-gdbserver
+maybe-install-info-gdbserver:
+@if gdbserver
+maybe-install-info-gdbserver: install-info-gdbserver
 
-install-info-sid: \
-    configure-sid \
-    info-sid 
+install-info-gdbserver: \
+    configure-gdbserver \
+    info-gdbserver 
        @: $(MAKE); $(unstage)
-       @[ -f ./sid/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
+       echo "Doing install-info in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33265,26 +29281,26 @@ install-info-sid: \
                  install-info) \
          || exit 1
 
-@endif sid
+@endif gdbserver
 
-.PHONY: maybe-install-pdf-sid install-pdf-sid
-maybe-install-pdf-sid:
-@if sid
-maybe-install-pdf-sid: install-pdf-sid
+.PHONY: maybe-install-pdf-gdbserver install-pdf-gdbserver
+maybe-install-pdf-gdbserver:
+@if gdbserver
+maybe-install-pdf-gdbserver: install-pdf-gdbserver
 
-install-pdf-sid: \
-    configure-sid \
-    pdf-sid 
+install-pdf-gdbserver: \
+    configure-gdbserver \
+    pdf-gdbserver 
        @: $(MAKE); $(unstage)
-       @[ -f ./sid/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
+       echo "Doing install-pdf in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33292,26 +29308,26 @@ install-pdf-sid: \
                  install-pdf) \
          || exit 1
 
-@endif sid
+@endif gdbserver
 
-.PHONY: maybe-install-html-sid install-html-sid
-maybe-install-html-sid:
-@if sid
-maybe-install-html-sid: install-html-sid
+.PHONY: maybe-install-html-gdbserver install-html-gdbserver
+maybe-install-html-gdbserver:
+@if gdbserver
+maybe-install-html-gdbserver: install-html-gdbserver
 
-install-html-sid: \
-    configure-sid \
-    html-sid 
+install-html-gdbserver: \
+    configure-gdbserver \
+    html-gdbserver 
        @: $(MAKE); $(unstage)
-       @[ -f ./sid/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
+       echo "Doing install-html in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33319,25 +29335,25 @@ install-html-sid: \
                  install-html) \
          || exit 1
 
-@endif sid
+@endif gdbserver
 
-.PHONY: maybe-installcheck-sid installcheck-sid
-maybe-installcheck-sid:
-@if sid
-maybe-installcheck-sid: installcheck-sid
+.PHONY: maybe-installcheck-gdbserver installcheck-gdbserver
+maybe-installcheck-gdbserver:
+@if gdbserver
+maybe-installcheck-gdbserver: installcheck-gdbserver
 
-installcheck-sid: \
-    configure-sid 
+installcheck-gdbserver: \
+    configure-gdbserver 
        @: $(MAKE); $(unstage)
-       @[ -f ./sid/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
+       echo "Doing installcheck in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33345,24 +29361,24 @@ installcheck-sid: \
                  installcheck) \
          || exit 1
 
-@endif sid
+@endif gdbserver
 
-.PHONY: maybe-mostlyclean-sid mostlyclean-sid
-maybe-mostlyclean-sid:
-@if sid
-maybe-mostlyclean-sid: mostlyclean-sid
+.PHONY: maybe-mostlyclean-gdbserver mostlyclean-gdbserver
+maybe-mostlyclean-gdbserver:
+@if gdbserver
+maybe-mostlyclean-gdbserver: mostlyclean-gdbserver
 
-mostlyclean-sid: 
+mostlyclean-gdbserver: 
        @: $(MAKE); $(unstage)
-       @[ -f ./sid/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
+       echo "Doing mostlyclean in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33370,24 +29386,24 @@ mostlyclean-sid:
                  mostlyclean) \
          || exit 1
 
-@endif sid
+@endif gdbserver
 
-.PHONY: maybe-clean-sid clean-sid
-maybe-clean-sid:
-@if sid
-maybe-clean-sid: clean-sid
+.PHONY: maybe-clean-gdbserver clean-gdbserver
+maybe-clean-gdbserver:
+@if gdbserver
+maybe-clean-gdbserver: clean-gdbserver
 
-clean-sid: 
+clean-gdbserver: 
        @: $(MAKE); $(unstage)
-       @[ -f ./sid/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
+       echo "Doing clean in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33395,24 +29411,24 @@ clean-sid:
                  clean) \
          || exit 1
 
-@endif sid
+@endif gdbserver
 
-.PHONY: maybe-distclean-sid distclean-sid
-maybe-distclean-sid:
-@if sid
-maybe-distclean-sid: distclean-sid
+.PHONY: maybe-distclean-gdbserver distclean-gdbserver
+maybe-distclean-gdbserver:
+@if gdbserver
+maybe-distclean-gdbserver: distclean-gdbserver
 
-distclean-sid: 
+distclean-gdbserver: 
        @: $(MAKE); $(unstage)
-       @[ -f ./sid/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
+       echo "Doing distclean in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33420,24 +29436,24 @@ distclean-sid:
                  distclean) \
          || exit 1
 
-@endif sid
+@endif gdbserver
 
-.PHONY: maybe-maintainer-clean-sid maintainer-clean-sid
-maybe-maintainer-clean-sid:
-@if sid
-maybe-maintainer-clean-sid: maintainer-clean-sid
+.PHONY: maybe-maintainer-clean-gdbserver maintainer-clean-gdbserver
+maybe-maintainer-clean-gdbserver:
+@if gdbserver
+maybe-maintainer-clean-gdbserver: maintainer-clean-gdbserver
 
-maintainer-clean-sid: 
+maintainer-clean-gdbserver: 
        @: $(MAKE); $(unstage)
-       @[ -f ./sid/Makefile ] || exit 0; \
+       @[ -f ./gdbserver/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
+       echo "Doing maintainer-clean in gdbserver"; \
+       (cd $(HOST_SUBDIR)/gdbserver && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -33445,113 +29461,129 @@ maintainer-clean-sid:
                  maintainer-clean) \
          || exit 1
 
-@endif sid
+@endif gdbserver
 
 
 
-.PHONY: configure-sim maybe-configure-sim
-maybe-configure-sim:
+.PHONY: configure-gdb maybe-configure-gdb
+maybe-configure-gdb:
 @if gcc-bootstrap
-configure-sim: stage_current
+configure-gdb: stage_current
 @endif gcc-bootstrap
-@if sim
-maybe-configure-sim: configure-sim
-configure-sim: 
+@if gdb
+maybe-configure-gdb: configure-gdb
+configure-gdb: 
        @: $(MAKE); $(unstage)
        @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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/sim; \
-       cd "$(HOST_SUBDIR)/sim" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/gdb/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdb; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/gdb; \
+       cd "$(HOST_SUBDIR)/gdb" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/sim/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gdb/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/sim"; \
-       libsrcdir="$$s/sim"; \
-       $(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 sim
+@endif gdb
 
 
 
 
 
-.PHONY: all-sim maybe-all-sim
-maybe-all-sim:
+.PHONY: all-gdb maybe-all-gdb
+maybe-all-gdb:
 @if gcc-bootstrap
-all-sim: stage_current
+all-gdb: stage_current
 @endif gcc-bootstrap
-@if sim
-TARGET-sim=all
-maybe-all-sim: all-sim
-all-sim: configure-sim
+@if gdb
+TARGET-gdb=all
+maybe-all-gdb: all-gdb
+all-gdb: configure-gdb
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/sim && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-sim))
-@endif sim
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gdb && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-gdb))
+@endif gdb
 
 
 
 
-.PHONY: check-sim maybe-check-sim
-maybe-check-sim:
-@if sim
-maybe-check-sim: check-sim
+.PHONY: check-gdb maybe-check-gdb
+maybe-check-gdb:
+@if gdb
+maybe-check-gdb: check-gdb
 
-check-sim:
+check-gdb:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/sim && \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif sim
+@endif gdb
 
-.PHONY: install-sim maybe-install-sim
-maybe-install-sim:
-@if sim
-maybe-install-sim: install-sim
+.PHONY: install-gdb maybe-install-gdb
+maybe-install-gdb:
+@if gdb
+maybe-install-gdb: install-gdb
 
-install-sim: installdirs
+install-gdb: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/sim && \
+       (cd $(HOST_SUBDIR)/gdb && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif sim
+@endif gdb
+
+.PHONY: install-strip-gdb maybe-install-strip-gdb
+maybe-install-strip-gdb:
+@if gdb
+maybe-install-strip-gdb: install-strip-gdb
+
+install-strip-gdb: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gdb && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif gdb
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-sim info-sim
-maybe-info-sim:
-@if sim
-maybe-info-sim: info-sim
+.PHONY: maybe-info-gdb info-gdb
+maybe-info-gdb:
+@if gdb
+maybe-info-gdb: info-gdb
 
-info-sim: \
-    configure-sim 
+info-gdb: \
+    configure-gdb 
        @: $(MAKE); $(unstage)
-       @[ -f ./sim/Makefile ] || exit 0; \
+       @[ -f ./gdb/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -33559,25 +29591,25 @@ info-sim: \
                  info) \
          || exit 1
 
-@endif sim
+@endif gdb
 
-.PHONY: maybe-dvi-sim dvi-sim
-maybe-dvi-sim:
-@if sim
-maybe-dvi-sim: dvi-sim
+.PHONY: maybe-dvi-gdb dvi-gdb
+maybe-dvi-gdb:
+@if gdb
+maybe-dvi-gdb: dvi-gdb
 
-dvi-sim: \
-    configure-sim 
+dvi-gdb: \
+    configure-gdb 
        @: $(MAKE); $(unstage)
-       @[ -f ./sim/Makefile ] || exit 0; \
+       @[ -f ./gdb/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -33585,25 +29617,25 @@ dvi-sim: \
                  dvi) \
          || exit 1
 
-@endif sim
+@endif gdb
 
-.PHONY: maybe-pdf-sim pdf-sim
-maybe-pdf-sim:
-@if sim
-maybe-pdf-sim: pdf-sim
+.PHONY: maybe-pdf-gdb pdf-gdb
+maybe-pdf-gdb:
+@if gdb
+maybe-pdf-gdb: pdf-gdb
 
-pdf-sim: \
-    configure-sim 
+pdf-gdb: \
+    configure-gdb 
        @: $(MAKE); $(unstage)
-       @[ -f ./sim/Makefile ] || exit 0; \
+       @[ -f ./gdb/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -33611,25 +29643,25 @@ pdf-sim: \
                  pdf) \
          || exit 1
 
-@endif sim
+@endif gdb
 
-.PHONY: maybe-html-sim html-sim
-maybe-html-sim:
-@if sim
-maybe-html-sim: html-sim
+.PHONY: maybe-html-gdb html-gdb
+maybe-html-gdb:
+@if gdb
+maybe-html-gdb: html-gdb
 
-html-sim: \
-    configure-sim 
+html-gdb: \
+    configure-gdb 
        @: $(MAKE); $(unstage)
-       @[ -f ./sim/Makefile ] || exit 0; \
+       @[ -f ./gdb/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -33637,25 +29669,25 @@ html-sim: \
                  html) \
          || exit 1
 
-@endif sim
+@endif gdb
 
-.PHONY: maybe-TAGS-sim TAGS-sim
-maybe-TAGS-sim:
-@if sim
-maybe-TAGS-sim: TAGS-sim
+.PHONY: maybe-TAGS-gdb TAGS-gdb
+maybe-TAGS-gdb:
+@if gdb
+maybe-TAGS-gdb: TAGS-gdb
 
-TAGS-sim: \
-    configure-sim 
+TAGS-gdb: \
+    configure-gdb 
        @: $(MAKE); $(unstage)
-       @[ -f ./sim/Makefile ] || exit 0; \
+       @[ -f ./gdb/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -33663,26 +29695,26 @@ TAGS-sim: \
                  TAGS) \
          || exit 1
 
-@endif sim
+@endif gdb
 
-.PHONY: maybe-install-info-sim install-info-sim
-maybe-install-info-sim:
-@if sim
-maybe-install-info-sim: install-info-sim
+.PHONY: maybe-install-info-gdb install-info-gdb
+maybe-install-info-gdb:
+@if gdb
+maybe-install-info-gdb: install-info-gdb
 
-install-info-sim: \
-    configure-sim \
-    info-sim 
+install-info-gdb: \
+    configure-gdb \
+    info-gdb 
        @: $(MAKE); $(unstage)
-       @[ -f ./sim/Makefile ] || exit 0; \
+       @[ -f ./gdb/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -33690,26 +29722,26 @@ install-info-sim: \
                  install-info) \
          || exit 1
 
-@endif sim
+@endif gdb
 
-.PHONY: maybe-install-pdf-sim install-pdf-sim
-maybe-install-pdf-sim:
-@if sim
-maybe-install-pdf-sim: install-pdf-sim
+.PHONY: maybe-install-pdf-gdb install-pdf-gdb
+maybe-install-pdf-gdb:
+@if gdb
+maybe-install-pdf-gdb: install-pdf-gdb
 
-install-pdf-sim: \
-    configure-sim \
-    pdf-sim 
+install-pdf-gdb: \
+    configure-gdb \
+    pdf-gdb 
        @: $(MAKE); $(unstage)
-       @[ -f ./sim/Makefile ] || exit 0; \
+       @[ -f ./gdb/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -33717,26 +29749,26 @@ install-pdf-sim: \
                  install-pdf) \
          || exit 1
 
-@endif sim
+@endif gdb
 
-.PHONY: maybe-install-html-sim install-html-sim
-maybe-install-html-sim:
-@if sim
-maybe-install-html-sim: install-html-sim
+.PHONY: maybe-install-html-gdb install-html-gdb
+maybe-install-html-gdb:
+@if gdb
+maybe-install-html-gdb: install-html-gdb
 
-install-html-sim: \
-    configure-sim \
-    html-sim 
+install-html-gdb: \
+    configure-gdb \
+    html-gdb 
        @: $(MAKE); $(unstage)
-       @[ -f ./sim/Makefile ] || exit 0; \
+       @[ -f ./gdb/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -33744,25 +29776,25 @@ install-html-sim: \
                  install-html) \
          || exit 1
 
-@endif sim
+@endif gdb
 
-.PHONY: maybe-installcheck-sim installcheck-sim
-maybe-installcheck-sim:
-@if sim
-maybe-installcheck-sim: installcheck-sim
+.PHONY: maybe-installcheck-gdb installcheck-gdb
+maybe-installcheck-gdb:
+@if gdb
+maybe-installcheck-gdb: installcheck-gdb
 
-installcheck-sim: \
-    configure-sim 
+installcheck-gdb: \
+    configure-gdb 
        @: $(MAKE); $(unstage)
-       @[ -f ./sim/Makefile ] || exit 0; \
+       @[ -f ./gdb/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -33770,24 +29802,24 @@ installcheck-sim: \
                  installcheck) \
          || exit 1
 
-@endif sim
+@endif gdb
 
-.PHONY: maybe-mostlyclean-sim mostlyclean-sim
-maybe-mostlyclean-sim:
-@if sim
-maybe-mostlyclean-sim: mostlyclean-sim
+.PHONY: maybe-mostlyclean-gdb mostlyclean-gdb
+maybe-mostlyclean-gdb:
+@if gdb
+maybe-mostlyclean-gdb: mostlyclean-gdb
 
-mostlyclean-sim: 
+mostlyclean-gdb: 
        @: $(MAKE); $(unstage)
-       @[ -f ./sim/Makefile ] || exit 0; \
+       @[ -f ./gdb/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -33795,24 +29827,24 @@ mostlyclean-sim:
                  mostlyclean) \
          || exit 1
 
-@endif sim
+@endif gdb
 
-.PHONY: maybe-clean-sim clean-sim
-maybe-clean-sim:
-@if sim
-maybe-clean-sim: clean-sim
+.PHONY: maybe-clean-gdb clean-gdb
+maybe-clean-gdb:
+@if gdb
+maybe-clean-gdb: clean-gdb
 
-clean-sim: 
+clean-gdb: 
        @: $(MAKE); $(unstage)
-       @[ -f ./sim/Makefile ] || exit 0; \
+       @[ -f ./gdb/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -33820,24 +29852,24 @@ clean-sim:
                  clean) \
          || exit 1
 
-@endif sim
+@endif gdb
 
-.PHONY: maybe-distclean-sim distclean-sim
-maybe-distclean-sim:
-@if sim
-maybe-distclean-sim: distclean-sim
+.PHONY: maybe-distclean-gdb distclean-gdb
+maybe-distclean-gdb:
+@if gdb
+maybe-distclean-gdb: distclean-gdb
 
-distclean-sim: 
+distclean-gdb: 
        @: $(MAKE); $(unstage)
-       @[ -f ./sim/Makefile ] || exit 0; \
+       @[ -f ./gdb/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -33845,24 +29877,24 @@ distclean-sim:
                  distclean) \
          || exit 1
 
-@endif sim
+@endif gdb
 
-.PHONY: maybe-maintainer-clean-sim maintainer-clean-sim
-maybe-maintainer-clean-sim:
-@if sim
-maybe-maintainer-clean-sim: maintainer-clean-sim
+.PHONY: maybe-maintainer-clean-gdb maintainer-clean-gdb
+maybe-maintainer-clean-gdb:
+@if gdb
+maybe-maintainer-clean-gdb: maintainer-clean-gdb
 
-maintainer-clean-sim: 
+maintainer-clean-gdb: 
        @: $(MAKE); $(unstage)
-       @[ -f ./sim/Makefile ] || exit 0; \
+       @[ -f ./gdb/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -33870,113 +29902,129 @@ maintainer-clean-sim:
                  maintainer-clean) \
          || exit 1
 
-@endif sim
+@endif gdb
 
 
 
-.PHONY: configure-tar maybe-configure-tar
-maybe-configure-tar:
+.PHONY: configure-expect maybe-configure-expect
+maybe-configure-expect:
 @if gcc-bootstrap
-configure-tar: stage_current
+configure-expect: stage_current
 @endif gcc-bootstrap
-@if tar
-maybe-configure-tar: configure-tar
-configure-tar: 
+@if expect
+maybe-configure-expect: configure-expect
+configure-expect: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/tar/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tar ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/tar; \
-       cd "$(HOST_SUBDIR)/tar" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/expect/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/expect; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/expect; \
+       cd "$(HOST_SUBDIR)/expect" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/tar/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/expect/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/tar"; \
-       libsrcdir="$$s/tar"; \
-       $(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 tar
+@endif expect
 
 
 
 
 
-.PHONY: all-tar maybe-all-tar
-maybe-all-tar:
+.PHONY: all-expect maybe-all-expect
+maybe-all-expect:
 @if gcc-bootstrap
-all-tar: stage_current
+all-expect: stage_current
 @endif gcc-bootstrap
-@if tar
-TARGET-tar=all
-maybe-all-tar: all-tar
-all-tar: configure-tar
+@if expect
+TARGET-expect=all
+maybe-all-expect: all-expect
+all-expect: configure-expect
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/tar && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-tar))
-@endif tar
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/expect && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-expect))
+@endif expect
 
 
 
 
-.PHONY: check-tar maybe-check-tar
-maybe-check-tar:
-@if tar
-maybe-check-tar: check-tar
+.PHONY: check-expect maybe-check-expect
+maybe-check-expect:
+@if expect
+maybe-check-expect: check-expect
 
-check-tar:
+check-expect:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/tar && \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif tar
+@endif expect
 
-.PHONY: install-tar maybe-install-tar
-maybe-install-tar:
-@if tar
-maybe-install-tar: install-tar
+.PHONY: install-expect maybe-install-expect
+maybe-install-expect:
+@if expect
+maybe-install-expect: install-expect
 
-install-tar: installdirs
+install-expect: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/tar && \
+       (cd $(HOST_SUBDIR)/expect && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif tar
+@endif expect
+
+.PHONY: install-strip-expect maybe-install-strip-expect
+maybe-install-strip-expect:
+@if expect
+maybe-install-strip-expect: install-strip-expect
+
+install-strip-expect: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/expect && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif expect
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-tar info-tar
-maybe-info-tar:
-@if tar
-maybe-info-tar: info-tar
+.PHONY: maybe-info-expect info-expect
+maybe-info-expect:
+@if expect
+maybe-info-expect: info-expect
 
-info-tar: \
-    configure-tar 
+info-expect: \
+    configure-expect 
        @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
+       @[ -f ./expect/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 tar" ; \
-       (cd $(HOST_SUBDIR)/tar && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -33984,25 +30032,25 @@ info-tar: \
                  info) \
          || exit 1
 
-@endif tar
+@endif expect
 
-.PHONY: maybe-dvi-tar dvi-tar
-maybe-dvi-tar:
-@if tar
-maybe-dvi-tar: dvi-tar
+.PHONY: maybe-dvi-expect dvi-expect
+maybe-dvi-expect:
+@if expect
+maybe-dvi-expect: dvi-expect
 
-dvi-tar: \
-    configure-tar 
+dvi-expect: \
+    configure-expect 
        @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
+       @[ -f ./expect/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 tar" ; \
-       (cd $(HOST_SUBDIR)/tar && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34010,25 +30058,25 @@ dvi-tar: \
                  dvi) \
          || exit 1
 
-@endif tar
+@endif expect
 
-.PHONY: maybe-pdf-tar pdf-tar
-maybe-pdf-tar:
-@if tar
-maybe-pdf-tar: pdf-tar
+.PHONY: maybe-pdf-expect pdf-expect
+maybe-pdf-expect:
+@if expect
+maybe-pdf-expect: pdf-expect
 
-pdf-tar: \
-    configure-tar 
+pdf-expect: \
+    configure-expect 
        @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
+       @[ -f ./expect/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 tar" ; \
-       (cd $(HOST_SUBDIR)/tar && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34036,25 +30084,25 @@ pdf-tar: \
                  pdf) \
          || exit 1
 
-@endif tar
+@endif expect
 
-.PHONY: maybe-html-tar html-tar
-maybe-html-tar:
-@if tar
-maybe-html-tar: html-tar
+.PHONY: maybe-html-expect html-expect
+maybe-html-expect:
+@if expect
+maybe-html-expect: html-expect
 
-html-tar: \
-    configure-tar 
+html-expect: \
+    configure-expect 
        @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
+       @[ -f ./expect/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 tar" ; \
-       (cd $(HOST_SUBDIR)/tar && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34062,25 +30110,25 @@ html-tar: \
                  html) \
          || exit 1
 
-@endif tar
+@endif expect
 
-.PHONY: maybe-TAGS-tar TAGS-tar
-maybe-TAGS-tar:
-@if tar
-maybe-TAGS-tar: TAGS-tar
+.PHONY: maybe-TAGS-expect TAGS-expect
+maybe-TAGS-expect:
+@if expect
+maybe-TAGS-expect: TAGS-expect
 
-TAGS-tar: \
-    configure-tar 
+TAGS-expect: \
+    configure-expect 
        @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
+       @[ -f ./expect/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 tar" ; \
-       (cd $(HOST_SUBDIR)/tar && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34088,26 +30136,26 @@ TAGS-tar: \
                  TAGS) \
          || exit 1
 
-@endif tar
+@endif expect
 
-.PHONY: maybe-install-info-tar install-info-tar
-maybe-install-info-tar:
-@if tar
-maybe-install-info-tar: install-info-tar
+.PHONY: maybe-install-info-expect install-info-expect
+maybe-install-info-expect:
+@if expect
+maybe-install-info-expect: install-info-expect
 
-install-info-tar: \
-    configure-tar \
-    info-tar 
+install-info-expect: \
+    configure-expect \
+    info-expect 
        @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
+       @[ -f ./expect/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 tar" ; \
-       (cd $(HOST_SUBDIR)/tar && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34115,26 +30163,26 @@ install-info-tar: \
                  install-info) \
          || exit 1
 
-@endif tar
+@endif expect
 
-.PHONY: maybe-install-pdf-tar install-pdf-tar
-maybe-install-pdf-tar:
-@if tar
-maybe-install-pdf-tar: install-pdf-tar
+.PHONY: maybe-install-pdf-expect install-pdf-expect
+maybe-install-pdf-expect:
+@if expect
+maybe-install-pdf-expect: install-pdf-expect
 
-install-pdf-tar: \
-    configure-tar \
-    pdf-tar 
+install-pdf-expect: \
+    configure-expect \
+    pdf-expect 
        @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
+       @[ -f ./expect/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 tar" ; \
-       (cd $(HOST_SUBDIR)/tar && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34142,26 +30190,26 @@ install-pdf-tar: \
                  install-pdf) \
          || exit 1
 
-@endif tar
+@endif expect
 
-.PHONY: maybe-install-html-tar install-html-tar
-maybe-install-html-tar:
-@if tar
-maybe-install-html-tar: install-html-tar
+.PHONY: maybe-install-html-expect install-html-expect
+maybe-install-html-expect:
+@if expect
+maybe-install-html-expect: install-html-expect
 
-install-html-tar: \
-    configure-tar \
-    html-tar 
+install-html-expect: \
+    configure-expect \
+    html-expect 
        @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
+       @[ -f ./expect/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 tar" ; \
-       (cd $(HOST_SUBDIR)/tar && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34169,25 +30217,25 @@ install-html-tar: \
                  install-html) \
          || exit 1
 
-@endif tar
+@endif expect
 
-.PHONY: maybe-installcheck-tar installcheck-tar
-maybe-installcheck-tar:
-@if tar
-maybe-installcheck-tar: installcheck-tar
+.PHONY: maybe-installcheck-expect installcheck-expect
+maybe-installcheck-expect:
+@if expect
+maybe-installcheck-expect: installcheck-expect
 
-installcheck-tar: \
-    configure-tar 
+installcheck-expect: \
+    configure-expect 
        @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
+       @[ -f ./expect/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 tar" ; \
-       (cd $(HOST_SUBDIR)/tar && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34195,24 +30243,24 @@ installcheck-tar: \
                  installcheck) \
          || exit 1
 
-@endif tar
+@endif expect
 
-.PHONY: maybe-mostlyclean-tar mostlyclean-tar
-maybe-mostlyclean-tar:
-@if tar
-maybe-mostlyclean-tar: mostlyclean-tar
+.PHONY: maybe-mostlyclean-expect mostlyclean-expect
+maybe-mostlyclean-expect:
+@if expect
+maybe-mostlyclean-expect: mostlyclean-expect
 
-mostlyclean-tar: 
+mostlyclean-expect: 
        @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
+       @[ -f ./expect/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 tar" ; \
-       (cd $(HOST_SUBDIR)/tar && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34220,24 +30268,24 @@ mostlyclean-tar:
                  mostlyclean) \
          || exit 1
 
-@endif tar
+@endif expect
 
-.PHONY: maybe-clean-tar clean-tar
-maybe-clean-tar:
-@if tar
-maybe-clean-tar: clean-tar
+.PHONY: maybe-clean-expect clean-expect
+maybe-clean-expect:
+@if expect
+maybe-clean-expect: clean-expect
 
-clean-tar: 
+clean-expect: 
        @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
+       @[ -f ./expect/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 tar" ; \
-       (cd $(HOST_SUBDIR)/tar && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34245,24 +30293,24 @@ clean-tar:
                  clean) \
          || exit 1
 
-@endif tar
+@endif expect
 
-.PHONY: maybe-distclean-tar distclean-tar
-maybe-distclean-tar:
-@if tar
-maybe-distclean-tar: distclean-tar
+.PHONY: maybe-distclean-expect distclean-expect
+maybe-distclean-expect:
+@if expect
+maybe-distclean-expect: distclean-expect
 
-distclean-tar: 
+distclean-expect: 
        @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
+       @[ -f ./expect/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 tar" ; \
-       (cd $(HOST_SUBDIR)/tar && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34270,24 +30318,24 @@ distclean-tar:
                  distclean) \
          || exit 1
 
-@endif tar
+@endif expect
 
-.PHONY: maybe-maintainer-clean-tar maintainer-clean-tar
-maybe-maintainer-clean-tar:
-@if tar
-maybe-maintainer-clean-tar: maintainer-clean-tar
+.PHONY: maybe-maintainer-clean-expect maintainer-clean-expect
+maybe-maintainer-clean-expect:
+@if expect
+maybe-maintainer-clean-expect: maintainer-clean-expect
 
-maintainer-clean-tar: 
+maintainer-clean-expect: 
        @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
+       @[ -f ./expect/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 tar" ; \
-       (cd $(HOST_SUBDIR)/tar && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34295,107 +30343,129 @@ maintainer-clean-tar:
                  maintainer-clean) \
          || exit 1
 
-@endif tar
+@endif expect
 
 
 
-.PHONY: configure-texinfo maybe-configure-texinfo
-maybe-configure-texinfo:
+.PHONY: configure-guile maybe-configure-guile
+maybe-configure-guile:
 @if gcc-bootstrap
-configure-texinfo: stage_current
+configure-guile: stage_current
 @endif gcc-bootstrap
-@if texinfo
-maybe-configure-texinfo: configure-texinfo
-configure-texinfo: 
+@if guile
+maybe-configure-guile: configure-guile
+configure-guile: 
        @: $(MAKE); $(unstage)
        @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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/texinfo; \
-       cd "$(HOST_SUBDIR)/texinfo" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/guile/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/guile; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/guile; \
+       cd "$(HOST_SUBDIR)/guile" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/texinfo/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/guile/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/texinfo"; \
-       libsrcdir="$$s/texinfo"; \
-       $(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 texinfo
+@endif guile
 
 
 
 
 
-.PHONY: all-texinfo maybe-all-texinfo
-maybe-all-texinfo:
+.PHONY: all-guile maybe-all-guile
+maybe-all-guile:
 @if gcc-bootstrap
-all-texinfo: stage_current
+all-guile: stage_current
 @endif gcc-bootstrap
-@if texinfo
-TARGET-texinfo=all
-maybe-all-texinfo: all-texinfo
-all-texinfo: configure-texinfo
+@if guile
+TARGET-guile=all
+maybe-all-guile: all-guile
+all-guile: configure-guile
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/texinfo && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-texinfo))
-@endif texinfo
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/guile && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-guile))
+@endif guile
 
 
 
 
-.PHONY: check-texinfo maybe-check-texinfo
-maybe-check-texinfo:
-@if texinfo
-maybe-check-texinfo: check-texinfo
+.PHONY: check-guile maybe-check-guile
+maybe-check-guile:
+@if guile
+maybe-check-guile: check-guile
 
-check-texinfo:
+check-guile:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/texinfo && \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif texinfo
+@endif guile
 
-.PHONY: install-texinfo maybe-install-texinfo
-maybe-install-texinfo:
-@if texinfo
-maybe-install-texinfo: install-texinfo
+.PHONY: install-guile maybe-install-guile
+maybe-install-guile:
+@if guile
+maybe-install-guile: install-guile
 
-install-texinfo:
+install-guile: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/guile && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif texinfo
+@endif guile
+
+.PHONY: install-strip-guile maybe-install-strip-guile
+maybe-install-strip-guile:
+@if guile
+maybe-install-strip-guile: install-strip-guile
+
+install-strip-guile: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/guile && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif guile
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-texinfo info-texinfo
-maybe-info-texinfo:
-@if texinfo
-maybe-info-texinfo: info-texinfo
+.PHONY: maybe-info-guile info-guile
+maybe-info-guile:
+@if guile
+maybe-info-guile: info-guile
 
-info-texinfo: \
-    configure-texinfo 
+info-guile: \
+    configure-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+       @[ -f ./guile/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34403,25 +30473,25 @@ info-texinfo: \
                  info) \
          || exit 1
 
-@endif texinfo
+@endif guile
 
-.PHONY: maybe-dvi-texinfo dvi-texinfo
-maybe-dvi-texinfo:
-@if texinfo
-maybe-dvi-texinfo: dvi-texinfo
+.PHONY: maybe-dvi-guile dvi-guile
+maybe-dvi-guile:
+@if guile
+maybe-dvi-guile: dvi-guile
 
-dvi-texinfo: \
-    configure-texinfo 
+dvi-guile: \
+    configure-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+       @[ -f ./guile/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34429,25 +30499,25 @@ dvi-texinfo: \
                  dvi) \
          || exit 1
 
-@endif texinfo
+@endif guile
 
-.PHONY: maybe-pdf-texinfo pdf-texinfo
-maybe-pdf-texinfo:
-@if texinfo
-maybe-pdf-texinfo: pdf-texinfo
+.PHONY: maybe-pdf-guile pdf-guile
+maybe-pdf-guile:
+@if guile
+maybe-pdf-guile: pdf-guile
 
-pdf-texinfo: \
-    configure-texinfo 
+pdf-guile: \
+    configure-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+       @[ -f ./guile/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34455,25 +30525,25 @@ pdf-texinfo: \
                  pdf) \
          || exit 1
 
-@endif texinfo
+@endif guile
 
-.PHONY: maybe-html-texinfo html-texinfo
-maybe-html-texinfo:
-@if texinfo
-maybe-html-texinfo: html-texinfo
+.PHONY: maybe-html-guile html-guile
+maybe-html-guile:
+@if guile
+maybe-html-guile: html-guile
 
-html-texinfo: \
-    configure-texinfo 
+html-guile: \
+    configure-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+       @[ -f ./guile/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34481,25 +30551,25 @@ html-texinfo: \
                  html) \
          || exit 1
 
-@endif texinfo
+@endif guile
 
-.PHONY: maybe-TAGS-texinfo TAGS-texinfo
-maybe-TAGS-texinfo:
-@if texinfo
-maybe-TAGS-texinfo: TAGS-texinfo
+.PHONY: maybe-TAGS-guile TAGS-guile
+maybe-TAGS-guile:
+@if guile
+maybe-TAGS-guile: TAGS-guile
 
-TAGS-texinfo: \
-    configure-texinfo 
+TAGS-guile: \
+    configure-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+       @[ -f ./guile/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34507,26 +30577,26 @@ TAGS-texinfo: \
                  TAGS) \
          || exit 1
 
-@endif texinfo
+@endif guile
 
-.PHONY: maybe-install-info-texinfo install-info-texinfo
-maybe-install-info-texinfo:
-@if texinfo
-maybe-install-info-texinfo: install-info-texinfo
+.PHONY: maybe-install-info-guile install-info-guile
+maybe-install-info-guile:
+@if guile
+maybe-install-info-guile: install-info-guile
 
-install-info-texinfo: \
-    configure-texinfo \
-    info-texinfo 
+install-info-guile: \
+    configure-guile \
+    info-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+       @[ -f ./guile/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34534,26 +30604,26 @@ install-info-texinfo: \
                  install-info) \
          || exit 1
 
-@endif texinfo
+@endif guile
 
-.PHONY: maybe-install-pdf-texinfo install-pdf-texinfo
-maybe-install-pdf-texinfo:
-@if texinfo
-maybe-install-pdf-texinfo: install-pdf-texinfo
+.PHONY: maybe-install-pdf-guile install-pdf-guile
+maybe-install-pdf-guile:
+@if guile
+maybe-install-pdf-guile: install-pdf-guile
 
-install-pdf-texinfo: \
-    configure-texinfo \
-    pdf-texinfo 
+install-pdf-guile: \
+    configure-guile \
+    pdf-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+       @[ -f ./guile/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34561,26 +30631,26 @@ install-pdf-texinfo: \
                  install-pdf) \
          || exit 1
 
-@endif texinfo
+@endif guile
 
-.PHONY: maybe-install-html-texinfo install-html-texinfo
-maybe-install-html-texinfo:
-@if texinfo
-maybe-install-html-texinfo: install-html-texinfo
+.PHONY: maybe-install-html-guile install-html-guile
+maybe-install-html-guile:
+@if guile
+maybe-install-html-guile: install-html-guile
 
-install-html-texinfo: \
-    configure-texinfo \
-    html-texinfo 
+install-html-guile: \
+    configure-guile \
+    html-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+       @[ -f ./guile/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34588,25 +30658,25 @@ install-html-texinfo: \
                  install-html) \
          || exit 1
 
-@endif texinfo
+@endif guile
 
-.PHONY: maybe-installcheck-texinfo installcheck-texinfo
-maybe-installcheck-texinfo:
-@if texinfo
-maybe-installcheck-texinfo: installcheck-texinfo
+.PHONY: maybe-installcheck-guile installcheck-guile
+maybe-installcheck-guile:
+@if guile
+maybe-installcheck-guile: installcheck-guile
 
-installcheck-texinfo: \
-    configure-texinfo 
+installcheck-guile: \
+    configure-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+       @[ -f ./guile/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34614,24 +30684,24 @@ installcheck-texinfo: \
                  installcheck) \
          || exit 1
 
-@endif texinfo
+@endif guile
 
-.PHONY: maybe-mostlyclean-texinfo mostlyclean-texinfo
-maybe-mostlyclean-texinfo:
-@if texinfo
-maybe-mostlyclean-texinfo: mostlyclean-texinfo
+.PHONY: maybe-mostlyclean-guile mostlyclean-guile
+maybe-mostlyclean-guile:
+@if guile
+maybe-mostlyclean-guile: mostlyclean-guile
 
-mostlyclean-texinfo: 
+mostlyclean-guile: 
        @: $(MAKE); $(unstage)
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+       @[ -f ./guile/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34639,24 +30709,24 @@ mostlyclean-texinfo:
                  mostlyclean) \
          || exit 1
 
-@endif texinfo
+@endif guile
 
-.PHONY: maybe-clean-texinfo clean-texinfo
-maybe-clean-texinfo:
-@if texinfo
-maybe-clean-texinfo: clean-texinfo
+.PHONY: maybe-clean-guile clean-guile
+maybe-clean-guile:
+@if guile
+maybe-clean-guile: clean-guile
 
-clean-texinfo: 
+clean-guile: 
        @: $(MAKE); $(unstage)
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+       @[ -f ./guile/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34664,24 +30734,24 @@ clean-texinfo:
                  clean) \
          || exit 1
 
-@endif texinfo
+@endif guile
 
-.PHONY: maybe-distclean-texinfo distclean-texinfo
-maybe-distclean-texinfo:
-@if texinfo
-maybe-distclean-texinfo: distclean-texinfo
+.PHONY: maybe-distclean-guile distclean-guile
+maybe-distclean-guile:
+@if guile
+maybe-distclean-guile: distclean-guile
 
-distclean-texinfo: 
+distclean-guile: 
        @: $(MAKE); $(unstage)
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+       @[ -f ./guile/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34689,24 +30759,24 @@ distclean-texinfo:
                  distclean) \
          || exit 1
 
-@endif texinfo
+@endif guile
 
-.PHONY: maybe-maintainer-clean-texinfo maintainer-clean-texinfo
-maybe-maintainer-clean-texinfo:
-@if texinfo
-maybe-maintainer-clean-texinfo: maintainer-clean-texinfo
+.PHONY: maybe-maintainer-clean-guile maintainer-clean-guile
+maybe-maintainer-clean-guile:
+@if guile
+maybe-maintainer-clean-guile: maintainer-clean-guile
 
-maintainer-clean-texinfo: 
+maintainer-clean-guile: 
        @: $(MAKE); $(unstage)
-       @[ -f ./texinfo/Makefile ] || exit 0; \
+       @[ -f ./guile/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34714,113 +30784,129 @@ maintainer-clean-texinfo:
                  maintainer-clean) \
          || exit 1
 
-@endif texinfo
+@endif guile
 
 
 
-.PHONY: configure-textutils maybe-configure-textutils
-maybe-configure-textutils:
+.PHONY: configure-tk maybe-configure-tk
+maybe-configure-tk:
 @if gcc-bootstrap
-configure-textutils: stage_current
+configure-tk: stage_current
 @endif gcc-bootstrap
-@if textutils
-maybe-configure-textutils: configure-textutils
-configure-textutils: 
+@if tk
+maybe-configure-tk: configure-tk
+configure-tk: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/textutils/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/textutils ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/textutils; \
-       cd "$(HOST_SUBDIR)/textutils" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/tk/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tk; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/tk; \
+       cd "$(HOST_SUBDIR)/tk" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/textutils/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/tk/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/textutils"; \
-       libsrcdir="$$s/textutils"; \
-       $(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 textutils
+@endif tk
 
 
 
 
 
-.PHONY: all-textutils maybe-all-textutils
-maybe-all-textutils:
+.PHONY: all-tk maybe-all-tk
+maybe-all-tk:
 @if gcc-bootstrap
-all-textutils: stage_current
+all-tk: stage_current
 @endif gcc-bootstrap
-@if textutils
-TARGET-textutils=all
-maybe-all-textutils: all-textutils
-all-textutils: configure-textutils
+@if tk
+TARGET-tk=all
+maybe-all-tk: all-tk
+all-tk: configure-tk
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/textutils && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-textutils))
-@endif textutils
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/tk && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-tk))
+@endif tk
 
 
 
 
-.PHONY: check-textutils maybe-check-textutils
-maybe-check-textutils:
-@if textutils
-maybe-check-textutils: check-textutils
+.PHONY: check-tk maybe-check-tk
+maybe-check-tk:
+@if tk
+maybe-check-tk: check-tk
 
-check-textutils:
+check-tk:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/textutils && \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif textutils
+@endif tk
 
-.PHONY: install-textutils maybe-install-textutils
-maybe-install-textutils:
-@if textutils
-maybe-install-textutils: install-textutils
+.PHONY: install-tk maybe-install-tk
+maybe-install-tk:
+@if tk
+maybe-install-tk: install-tk
 
-install-textutils: installdirs
+install-tk: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/textutils && \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif textutils
+@endif tk
+
+.PHONY: install-strip-tk maybe-install-strip-tk
+maybe-install-strip-tk:
+@if tk
+maybe-install-strip-tk: install-strip-tk
+
+install-strip-tk: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/tk && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif tk
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-textutils info-textutils
-maybe-info-textutils:
-@if textutils
-maybe-info-textutils: info-textutils
+.PHONY: maybe-info-tk info-tk
+maybe-info-tk:
+@if tk
+maybe-info-tk: info-tk
 
-info-textutils: \
-    configure-textutils 
+info-tk: \
+    configure-tk 
        @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
+       @[ -f ./tk/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 textutils" ; \
-       (cd $(HOST_SUBDIR)/textutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34828,25 +30914,25 @@ info-textutils: \
                  info) \
          || exit 1
 
-@endif textutils
+@endif tk
 
-.PHONY: maybe-dvi-textutils dvi-textutils
-maybe-dvi-textutils:
-@if textutils
-maybe-dvi-textutils: dvi-textutils
+.PHONY: maybe-dvi-tk dvi-tk
+maybe-dvi-tk:
+@if tk
+maybe-dvi-tk: dvi-tk
 
-dvi-textutils: \
-    configure-textutils 
+dvi-tk: \
+    configure-tk 
        @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
+       @[ -f ./tk/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 textutils" ; \
-       (cd $(HOST_SUBDIR)/textutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34854,25 +30940,25 @@ dvi-textutils: \
                  dvi) \
          || exit 1
 
-@endif textutils
+@endif tk
 
-.PHONY: maybe-pdf-textutils pdf-textutils
-maybe-pdf-textutils:
-@if textutils
-maybe-pdf-textutils: pdf-textutils
+.PHONY: maybe-pdf-tk pdf-tk
+maybe-pdf-tk:
+@if tk
+maybe-pdf-tk: pdf-tk
 
-pdf-textutils: \
-    configure-textutils 
+pdf-tk: \
+    configure-tk 
        @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
+       @[ -f ./tk/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 textutils" ; \
-       (cd $(HOST_SUBDIR)/textutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34880,25 +30966,25 @@ pdf-textutils: \
                  pdf) \
          || exit 1
 
-@endif textutils
+@endif tk
 
-.PHONY: maybe-html-textutils html-textutils
-maybe-html-textutils:
-@if textutils
-maybe-html-textutils: html-textutils
+.PHONY: maybe-html-tk html-tk
+maybe-html-tk:
+@if tk
+maybe-html-tk: html-tk
 
-html-textutils: \
-    configure-textutils 
+html-tk: \
+    configure-tk 
        @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
+       @[ -f ./tk/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 textutils" ; \
-       (cd $(HOST_SUBDIR)/textutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34906,25 +30992,25 @@ html-textutils: \
                  html) \
          || exit 1
 
-@endif textutils
+@endif tk
 
-.PHONY: maybe-TAGS-textutils TAGS-textutils
-maybe-TAGS-textutils:
-@if textutils
-maybe-TAGS-textutils: TAGS-textutils
+.PHONY: maybe-TAGS-tk TAGS-tk
+maybe-TAGS-tk:
+@if tk
+maybe-TAGS-tk: TAGS-tk
 
-TAGS-textutils: \
-    configure-textutils 
+TAGS-tk: \
+    configure-tk 
        @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
+       @[ -f ./tk/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 textutils" ; \
-       (cd $(HOST_SUBDIR)/textutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34932,26 +31018,26 @@ TAGS-textutils: \
                  TAGS) \
          || exit 1
 
-@endif textutils
+@endif tk
 
-.PHONY: maybe-install-info-textutils install-info-textutils
-maybe-install-info-textutils:
-@if textutils
-maybe-install-info-textutils: install-info-textutils
+.PHONY: maybe-install-info-tk install-info-tk
+maybe-install-info-tk:
+@if tk
+maybe-install-info-tk: install-info-tk
 
-install-info-textutils: \
-    configure-textutils \
-    info-textutils 
+install-info-tk: \
+    configure-tk \
+    info-tk 
        @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
+       @[ -f ./tk/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 textutils" ; \
-       (cd $(HOST_SUBDIR)/textutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34959,26 +31045,26 @@ install-info-textutils: \
                  install-info) \
          || exit 1
 
-@endif textutils
+@endif tk
 
-.PHONY: maybe-install-pdf-textutils install-pdf-textutils
-maybe-install-pdf-textutils:
-@if textutils
-maybe-install-pdf-textutils: install-pdf-textutils
+.PHONY: maybe-install-pdf-tk install-pdf-tk
+maybe-install-pdf-tk:
+@if tk
+maybe-install-pdf-tk: install-pdf-tk
 
-install-pdf-textutils: \
-    configure-textutils \
-    pdf-textutils 
+install-pdf-tk: \
+    configure-tk \
+    pdf-tk 
        @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
+       @[ -f ./tk/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 textutils" ; \
-       (cd $(HOST_SUBDIR)/textutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -34986,26 +31072,26 @@ install-pdf-textutils: \
                  install-pdf) \
          || exit 1
 
-@endif textutils
+@endif tk
 
-.PHONY: maybe-install-html-textutils install-html-textutils
-maybe-install-html-textutils:
-@if textutils
-maybe-install-html-textutils: install-html-textutils
+.PHONY: maybe-install-html-tk install-html-tk
+maybe-install-html-tk:
+@if tk
+maybe-install-html-tk: install-html-tk
 
-install-html-textutils: \
-    configure-textutils \
-    html-textutils 
+install-html-tk: \
+    configure-tk \
+    html-tk 
        @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
+       @[ -f ./tk/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 textutils" ; \
-       (cd $(HOST_SUBDIR)/textutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35013,25 +31099,25 @@ install-html-textutils: \
                  install-html) \
          || exit 1
 
-@endif textutils
+@endif tk
 
-.PHONY: maybe-installcheck-textutils installcheck-textutils
-maybe-installcheck-textutils:
-@if textutils
-maybe-installcheck-textutils: installcheck-textutils
+.PHONY: maybe-installcheck-tk installcheck-tk
+maybe-installcheck-tk:
+@if tk
+maybe-installcheck-tk: installcheck-tk
 
-installcheck-textutils: \
-    configure-textutils 
+installcheck-tk: \
+    configure-tk 
        @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
+       @[ -f ./tk/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 textutils" ; \
-       (cd $(HOST_SUBDIR)/textutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35039,24 +31125,24 @@ installcheck-textutils: \
                  installcheck) \
          || exit 1
 
-@endif textutils
+@endif tk
 
-.PHONY: maybe-mostlyclean-textutils mostlyclean-textutils
-maybe-mostlyclean-textutils:
-@if textutils
-maybe-mostlyclean-textutils: mostlyclean-textutils
+.PHONY: maybe-mostlyclean-tk mostlyclean-tk
+maybe-mostlyclean-tk:
+@if tk
+maybe-mostlyclean-tk: mostlyclean-tk
 
-mostlyclean-textutils: 
+mostlyclean-tk: 
        @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
+       @[ -f ./tk/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 textutils" ; \
-       (cd $(HOST_SUBDIR)/textutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35064,24 +31150,24 @@ mostlyclean-textutils:
                  mostlyclean) \
          || exit 1
 
-@endif textutils
+@endif tk
 
-.PHONY: maybe-clean-textutils clean-textutils
-maybe-clean-textutils:
-@if textutils
-maybe-clean-textutils: clean-textutils
+.PHONY: maybe-clean-tk clean-tk
+maybe-clean-tk:
+@if tk
+maybe-clean-tk: clean-tk
 
-clean-textutils: 
+clean-tk: 
        @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
+       @[ -f ./tk/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 textutils" ; \
-       (cd $(HOST_SUBDIR)/textutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35089,24 +31175,24 @@ clean-textutils:
                  clean) \
          || exit 1
 
-@endif textutils
+@endif tk
 
-.PHONY: maybe-distclean-textutils distclean-textutils
-maybe-distclean-textutils:
-@if textutils
-maybe-distclean-textutils: distclean-textutils
+.PHONY: maybe-distclean-tk distclean-tk
+maybe-distclean-tk:
+@if tk
+maybe-distclean-tk: distclean-tk
 
-distclean-textutils: 
+distclean-tk: 
        @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
+       @[ -f ./tk/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 textutils" ; \
-       (cd $(HOST_SUBDIR)/textutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35114,24 +31200,24 @@ distclean-textutils:
                  distclean) \
          || exit 1
 
-@endif textutils
+@endif tk
 
-.PHONY: maybe-maintainer-clean-textutils maintainer-clean-textutils
-maybe-maintainer-clean-textutils:
-@if textutils
-maybe-maintainer-clean-textutils: maintainer-clean-textutils
+.PHONY: maybe-maintainer-clean-tk maintainer-clean-tk
+maybe-maintainer-clean-tk:
+@if tk
+maybe-maintainer-clean-tk: maintainer-clean-tk
 
-maintainer-clean-textutils: 
+maintainer-clean-tk: 
        @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
+       @[ -f ./tk/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 textutils" ; \
-       (cd $(HOST_SUBDIR)/textutils && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35139,113 +31225,123 @@ maintainer-clean-textutils:
                  maintainer-clean) \
          || exit 1
 
-@endif textutils
+@endif tk
 
 
 
-.PHONY: configure-time maybe-configure-time
-maybe-configure-time:
+.PHONY: configure-libtermcap maybe-configure-libtermcap
+maybe-configure-libtermcap:
 @if gcc-bootstrap
-configure-time: stage_current
+configure-libtermcap: stage_current
 @endif gcc-bootstrap
-@if time
-maybe-configure-time: configure-time
-configure-time: 
+@if libtermcap
+maybe-configure-libtermcap: configure-libtermcap
+configure-libtermcap: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/time/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/time ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/time; \
-       cd "$(HOST_SUBDIR)/time" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/libtermcap/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtermcap; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/libtermcap; \
+       cd "$(HOST_SUBDIR)/libtermcap" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/time/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libtermcap/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/time"; \
-       libsrcdir="$$s/time"; \
-       $(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 time
+@endif libtermcap
 
 
 
 
 
-.PHONY: all-time maybe-all-time
-maybe-all-time:
+.PHONY: all-libtermcap maybe-all-libtermcap
+maybe-all-libtermcap:
 @if gcc-bootstrap
-all-time: stage_current
+all-libtermcap: stage_current
 @endif gcc-bootstrap
-@if time
-TARGET-time=all
-maybe-all-time: all-time
-all-time: configure-time
+@if libtermcap
+TARGET-libtermcap=all
+maybe-all-libtermcap: all-libtermcap
+all-libtermcap: configure-libtermcap
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/time && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-time))
-@endif time
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libtermcap && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-libtermcap))
+@endif libtermcap
 
 
 
 
-.PHONY: check-time maybe-check-time
-maybe-check-time:
-@if time
-maybe-check-time: check-time
+.PHONY: check-libtermcap maybe-check-libtermcap
+maybe-check-libtermcap:
+@if libtermcap
+maybe-check-libtermcap: check-libtermcap
+
+check-libtermcap:
+
+@endif libtermcap
+
+.PHONY: install-libtermcap maybe-install-libtermcap
+maybe-install-libtermcap:
+@if libtermcap
+maybe-install-libtermcap: install-libtermcap
 
-check-time:
+install-libtermcap: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/time && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       (cd $(HOST_SUBDIR)/libtermcap && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif time
+@endif libtermcap
 
-.PHONY: install-time maybe-install-time
-maybe-install-time:
-@if time
-maybe-install-time: install-time
+.PHONY: install-strip-libtermcap maybe-install-strip-libtermcap
+maybe-install-strip-libtermcap:
+@if libtermcap
+maybe-install-strip-libtermcap: install-strip-libtermcap
 
-install-time: installdirs
+install-strip-libtermcap: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/time && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+       (cd $(HOST_SUBDIR)/libtermcap && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif time
+@endif libtermcap
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-time info-time
-maybe-info-time:
-@if time
-maybe-info-time: info-time
+.PHONY: maybe-info-libtermcap info-libtermcap
+maybe-info-libtermcap:
+@if libtermcap
+maybe-info-libtermcap: info-libtermcap
 
-info-time: \
-    configure-time 
+info-libtermcap: \
+    configure-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f ./time/Makefile ] || exit 0; \
+       @[ -f ./libtermcap/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 time" ; \
-       (cd $(HOST_SUBDIR)/time && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35253,25 +31349,25 @@ info-time: \
                  info) \
          || exit 1
 
-@endif time
+@endif libtermcap
 
-.PHONY: maybe-dvi-time dvi-time
-maybe-dvi-time:
-@if time
-maybe-dvi-time: dvi-time
+.PHONY: maybe-dvi-libtermcap dvi-libtermcap
+maybe-dvi-libtermcap:
+@if libtermcap
+maybe-dvi-libtermcap: dvi-libtermcap
 
-dvi-time: \
-    configure-time 
+dvi-libtermcap: \
+    configure-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f ./time/Makefile ] || exit 0; \
+       @[ -f ./libtermcap/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 time" ; \
-       (cd $(HOST_SUBDIR)/time && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35279,25 +31375,25 @@ dvi-time: \
                  dvi) \
          || exit 1
 
-@endif time
+@endif libtermcap
 
-.PHONY: maybe-pdf-time pdf-time
-maybe-pdf-time:
-@if time
-maybe-pdf-time: pdf-time
+.PHONY: maybe-pdf-libtermcap pdf-libtermcap
+maybe-pdf-libtermcap:
+@if libtermcap
+maybe-pdf-libtermcap: pdf-libtermcap
 
-pdf-time: \
-    configure-time 
+pdf-libtermcap: \
+    configure-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f ./time/Makefile ] || exit 0; \
+       @[ -f ./libtermcap/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 time" ; \
-       (cd $(HOST_SUBDIR)/time && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35305,25 +31401,25 @@ pdf-time: \
                  pdf) \
          || exit 1
 
-@endif time
+@endif libtermcap
 
-.PHONY: maybe-html-time html-time
-maybe-html-time:
-@if time
-maybe-html-time: html-time
+.PHONY: maybe-html-libtermcap html-libtermcap
+maybe-html-libtermcap:
+@if libtermcap
+maybe-html-libtermcap: html-libtermcap
 
-html-time: \
-    configure-time 
+html-libtermcap: \
+    configure-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f ./time/Makefile ] || exit 0; \
+       @[ -f ./libtermcap/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 time" ; \
-       (cd $(HOST_SUBDIR)/time && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35331,25 +31427,25 @@ html-time: \
                  html) \
          || exit 1
 
-@endif time
+@endif libtermcap
 
-.PHONY: maybe-TAGS-time TAGS-time
-maybe-TAGS-time:
-@if time
-maybe-TAGS-time: TAGS-time
+.PHONY: maybe-TAGS-libtermcap TAGS-libtermcap
+maybe-TAGS-libtermcap:
+@if libtermcap
+maybe-TAGS-libtermcap: TAGS-libtermcap
 
-TAGS-time: \
-    configure-time 
+TAGS-libtermcap: \
+    configure-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f ./time/Makefile ] || exit 0; \
+       @[ -f ./libtermcap/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 time" ; \
-       (cd $(HOST_SUBDIR)/time && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35357,26 +31453,26 @@ TAGS-time: \
                  TAGS) \
          || exit 1
 
-@endif time
+@endif libtermcap
 
-.PHONY: maybe-install-info-time install-info-time
-maybe-install-info-time:
-@if time
-maybe-install-info-time: install-info-time
+.PHONY: maybe-install-info-libtermcap install-info-libtermcap
+maybe-install-info-libtermcap:
+@if libtermcap
+maybe-install-info-libtermcap: install-info-libtermcap
 
-install-info-time: \
-    configure-time \
-    info-time 
+install-info-libtermcap: \
+    configure-libtermcap \
+    info-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f ./time/Makefile ] || exit 0; \
+       @[ -f ./libtermcap/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 time" ; \
-       (cd $(HOST_SUBDIR)/time && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35384,26 +31480,26 @@ install-info-time: \
                  install-info) \
          || exit 1
 
-@endif time
+@endif libtermcap
 
-.PHONY: maybe-install-pdf-time install-pdf-time
-maybe-install-pdf-time:
-@if time
-maybe-install-pdf-time: install-pdf-time
+.PHONY: maybe-install-pdf-libtermcap install-pdf-libtermcap
+maybe-install-pdf-libtermcap:
+@if libtermcap
+maybe-install-pdf-libtermcap: install-pdf-libtermcap
 
-install-pdf-time: \
-    configure-time \
-    pdf-time 
+install-pdf-libtermcap: \
+    configure-libtermcap \
+    pdf-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f ./time/Makefile ] || exit 0; \
+       @[ -f ./libtermcap/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 time" ; \
-       (cd $(HOST_SUBDIR)/time && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35411,26 +31507,26 @@ install-pdf-time: \
                  install-pdf) \
          || exit 1
 
-@endif time
+@endif libtermcap
 
-.PHONY: maybe-install-html-time install-html-time
-maybe-install-html-time:
-@if time
-maybe-install-html-time: install-html-time
+.PHONY: maybe-install-html-libtermcap install-html-libtermcap
+maybe-install-html-libtermcap:
+@if libtermcap
+maybe-install-html-libtermcap: install-html-libtermcap
 
-install-html-time: \
-    configure-time \
-    html-time 
+install-html-libtermcap: \
+    configure-libtermcap \
+    html-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f ./time/Makefile ] || exit 0; \
+       @[ -f ./libtermcap/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 time" ; \
-       (cd $(HOST_SUBDIR)/time && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35438,25 +31534,25 @@ install-html-time: \
                  install-html) \
          || exit 1
 
-@endif time
+@endif libtermcap
 
-.PHONY: maybe-installcheck-time installcheck-time
-maybe-installcheck-time:
-@if time
-maybe-installcheck-time: installcheck-time
+.PHONY: maybe-installcheck-libtermcap installcheck-libtermcap
+maybe-installcheck-libtermcap:
+@if libtermcap
+maybe-installcheck-libtermcap: installcheck-libtermcap
 
-installcheck-time: \
-    configure-time 
+installcheck-libtermcap: \
+    configure-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f ./time/Makefile ] || exit 0; \
+       @[ -f ./libtermcap/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 time" ; \
-       (cd $(HOST_SUBDIR)/time && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35464,213 +31560,163 @@ installcheck-time: \
                  installcheck) \
          || exit 1
 
-@endif time
+@endif libtermcap
 
-.PHONY: maybe-mostlyclean-time mostlyclean-time
-maybe-mostlyclean-time:
-@if time
-maybe-mostlyclean-time: mostlyclean-time
+.PHONY: maybe-mostlyclean-libtermcap mostlyclean-libtermcap
+maybe-mostlyclean-libtermcap:
+@if libtermcap
+maybe-mostlyclean-libtermcap: mostlyclean-libtermcap
 
-mostlyclean-time: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./time/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 time" ; \
-       (cd $(HOST_SUBDIR)/time && \
-         $(MAKE) $(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-libtermcap:
 
-@endif time
+@endif libtermcap
 
-.PHONY: maybe-clean-time clean-time
-maybe-clean-time:
-@if time
-maybe-clean-time: clean-time
+.PHONY: maybe-clean-libtermcap clean-libtermcap
+maybe-clean-libtermcap:
+@if libtermcap
+maybe-clean-libtermcap: clean-libtermcap
 
-clean-time: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./time/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 time" ; \
-       (cd $(HOST_SUBDIR)/time && \
-         $(MAKE) $(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-libtermcap:
 
-@endif time
+@endif libtermcap
 
-.PHONY: maybe-distclean-time distclean-time
-maybe-distclean-time:
-@if time
-maybe-distclean-time: distclean-time
+.PHONY: maybe-distclean-libtermcap distclean-libtermcap
+maybe-distclean-libtermcap:
+@if libtermcap
+maybe-distclean-libtermcap: distclean-libtermcap
 
-distclean-time: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./time/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 time" ; \
-       (cd $(HOST_SUBDIR)/time && \
-         $(MAKE) $(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-libtermcap:
 
-@endif time
+@endif libtermcap
 
-.PHONY: maybe-maintainer-clean-time maintainer-clean-time
-maybe-maintainer-clean-time:
-@if time
-maybe-maintainer-clean-time: maintainer-clean-time
+.PHONY: maybe-maintainer-clean-libtermcap maintainer-clean-libtermcap
+maybe-maintainer-clean-libtermcap:
+@if libtermcap
+maybe-maintainer-clean-libtermcap: maintainer-clean-libtermcap
 
-maintainer-clean-time: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./time/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 time" ; \
-       (cd $(HOST_SUBDIR)/time && \
-         $(MAKE) $(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-libtermcap:
 
-@endif time
+@endif libtermcap
 
 
 
-.PHONY: configure-uudecode maybe-configure-uudecode
-maybe-configure-uudecode:
+.PHONY: configure-utils maybe-configure-utils
+maybe-configure-utils:
 @if gcc-bootstrap
-configure-uudecode: stage_current
+configure-utils: stage_current
 @endif gcc-bootstrap
-@if uudecode
-maybe-configure-uudecode: configure-uudecode
-configure-uudecode: 
+@if utils
+maybe-configure-utils: configure-utils
+configure-utils: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/uudecode/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/uudecode ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/uudecode; \
-       cd "$(HOST_SUBDIR)/uudecode" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/utils/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/utils; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/utils; \
+       cd "$(HOST_SUBDIR)/utils" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/uudecode/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/utils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/uudecode"; \
-       libsrcdir="$$s/uudecode"; \
-       $(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 uudecode
+@endif utils
 
 
 
 
 
-.PHONY: all-uudecode maybe-all-uudecode
-maybe-all-uudecode:
+.PHONY: all-utils maybe-all-utils
+maybe-all-utils:
 @if gcc-bootstrap
-all-uudecode: stage_current
+all-utils: stage_current
 @endif gcc-bootstrap
-@if uudecode
-TARGET-uudecode=all
-maybe-all-uudecode: all-uudecode
-all-uudecode: configure-uudecode
+@if utils
+TARGET-utils=all
+maybe-all-utils: all-utils
+all-utils: configure-utils
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/uudecode && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-uudecode))
-@endif uudecode
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/utils && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-utils))
+@endif utils
+
 
 
 
+.PHONY: check-utils maybe-check-utils
+maybe-check-utils:
+@if utils
+maybe-check-utils: check-utils
+
+check-utils:
+
+@endif utils
 
-.PHONY: check-uudecode maybe-check-uudecode
-maybe-check-uudecode:
-@if uudecode
-maybe-check-uudecode: check-uudecode
+.PHONY: install-utils maybe-install-utils
+maybe-install-utils:
+@if utils
+maybe-install-utils: install-utils
 
-check-uudecode:
+install-utils: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/uudecode && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       (cd $(HOST_SUBDIR)/utils && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif uudecode
+@endif utils
 
-.PHONY: install-uudecode maybe-install-uudecode
-maybe-install-uudecode:
-@if uudecode
-maybe-install-uudecode: install-uudecode
+.PHONY: install-strip-utils maybe-install-strip-utils
+maybe-install-strip-utils:
+@if utils
+maybe-install-strip-utils: install-strip-utils
 
-install-uudecode: installdirs
+install-strip-utils: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/uudecode && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+       (cd $(HOST_SUBDIR)/utils && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif uudecode
+@endif utils
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-uudecode info-uudecode
-maybe-info-uudecode:
-@if uudecode
-maybe-info-uudecode: info-uudecode
+.PHONY: maybe-info-utils info-utils
+maybe-info-utils:
+@if utils
+maybe-info-utils: info-utils
 
-info-uudecode: \
-    configure-uudecode 
+info-utils: \
+    configure-utils 
        @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+       @[ -f ./utils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 uudecode" ; \
-       (cd $(HOST_SUBDIR)/uudecode && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35678,25 +31724,25 @@ info-uudecode: \
                  info) \
          || exit 1
 
-@endif uudecode
+@endif utils
 
-.PHONY: maybe-dvi-uudecode dvi-uudecode
-maybe-dvi-uudecode:
-@if uudecode
-maybe-dvi-uudecode: dvi-uudecode
+.PHONY: maybe-dvi-utils dvi-utils
+maybe-dvi-utils:
+@if utils
+maybe-dvi-utils: dvi-utils
 
-dvi-uudecode: \
-    configure-uudecode 
+dvi-utils: \
+    configure-utils 
        @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+       @[ -f ./utils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 uudecode" ; \
-       (cd $(HOST_SUBDIR)/uudecode && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35704,25 +31750,25 @@ dvi-uudecode: \
                  dvi) \
          || exit 1
 
-@endif uudecode
+@endif utils
 
-.PHONY: maybe-pdf-uudecode pdf-uudecode
-maybe-pdf-uudecode:
-@if uudecode
-maybe-pdf-uudecode: pdf-uudecode
+.PHONY: maybe-pdf-utils pdf-utils
+maybe-pdf-utils:
+@if utils
+maybe-pdf-utils: pdf-utils
 
-pdf-uudecode: \
-    configure-uudecode 
+pdf-utils: \
+    configure-utils 
        @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+       @[ -f ./utils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 uudecode" ; \
-       (cd $(HOST_SUBDIR)/uudecode && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35730,25 +31776,25 @@ pdf-uudecode: \
                  pdf) \
          || exit 1
 
-@endif uudecode
+@endif utils
 
-.PHONY: maybe-html-uudecode html-uudecode
-maybe-html-uudecode:
-@if uudecode
-maybe-html-uudecode: html-uudecode
+.PHONY: maybe-html-utils html-utils
+maybe-html-utils:
+@if utils
+maybe-html-utils: html-utils
 
-html-uudecode: \
-    configure-uudecode 
+html-utils: \
+    configure-utils 
        @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+       @[ -f ./utils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 uudecode" ; \
-       (cd $(HOST_SUBDIR)/uudecode && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35756,25 +31802,25 @@ html-uudecode: \
                  html) \
          || exit 1
 
-@endif uudecode
+@endif utils
 
-.PHONY: maybe-TAGS-uudecode TAGS-uudecode
-maybe-TAGS-uudecode:
-@if uudecode
-maybe-TAGS-uudecode: TAGS-uudecode
+.PHONY: maybe-TAGS-utils TAGS-utils
+maybe-TAGS-utils:
+@if utils
+maybe-TAGS-utils: TAGS-utils
 
-TAGS-uudecode: \
-    configure-uudecode 
+TAGS-utils: \
+    configure-utils 
        @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+       @[ -f ./utils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 uudecode" ; \
-       (cd $(HOST_SUBDIR)/uudecode && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35782,26 +31828,26 @@ TAGS-uudecode: \
                  TAGS) \
          || exit 1
 
-@endif uudecode
+@endif utils
 
-.PHONY: maybe-install-info-uudecode install-info-uudecode
-maybe-install-info-uudecode:
-@if uudecode
-maybe-install-info-uudecode: install-info-uudecode
+.PHONY: maybe-install-info-utils install-info-utils
+maybe-install-info-utils:
+@if utils
+maybe-install-info-utils: install-info-utils
 
-install-info-uudecode: \
-    configure-uudecode \
-    info-uudecode 
+install-info-utils: \
+    configure-utils \
+    info-utils 
        @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+       @[ -f ./utils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 uudecode" ; \
-       (cd $(HOST_SUBDIR)/uudecode && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35809,26 +31855,26 @@ install-info-uudecode: \
                  install-info) \
          || exit 1
 
-@endif uudecode
+@endif utils
 
-.PHONY: maybe-install-pdf-uudecode install-pdf-uudecode
-maybe-install-pdf-uudecode:
-@if uudecode
-maybe-install-pdf-uudecode: install-pdf-uudecode
+.PHONY: maybe-install-pdf-utils install-pdf-utils
+maybe-install-pdf-utils:
+@if utils
+maybe-install-pdf-utils: install-pdf-utils
 
-install-pdf-uudecode: \
-    configure-uudecode \
-    pdf-uudecode 
+install-pdf-utils: \
+    configure-utils \
+    pdf-utils 
        @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+       @[ -f ./utils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 uudecode" ; \
-       (cd $(HOST_SUBDIR)/uudecode && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35836,26 +31882,26 @@ install-pdf-uudecode: \
                  install-pdf) \
          || exit 1
 
-@endif uudecode
+@endif utils
 
-.PHONY: maybe-install-html-uudecode install-html-uudecode
-maybe-install-html-uudecode:
-@if uudecode
-maybe-install-html-uudecode: install-html-uudecode
+.PHONY: maybe-install-html-utils install-html-utils
+maybe-install-html-utils:
+@if utils
+maybe-install-html-utils: install-html-utils
 
-install-html-uudecode: \
-    configure-uudecode \
-    html-uudecode 
+install-html-utils: \
+    configure-utils \
+    html-utils 
        @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+       @[ -f ./utils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 uudecode" ; \
-       (cd $(HOST_SUBDIR)/uudecode && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35863,25 +31909,25 @@ install-html-uudecode: \
                  install-html) \
          || exit 1
 
-@endif uudecode
+@endif utils
 
-.PHONY: maybe-installcheck-uudecode installcheck-uudecode
-maybe-installcheck-uudecode:
-@if uudecode
-maybe-installcheck-uudecode: installcheck-uudecode
+.PHONY: maybe-installcheck-utils installcheck-utils
+maybe-installcheck-utils:
+@if utils
+maybe-installcheck-utils: installcheck-utils
 
-installcheck-uudecode: \
-    configure-uudecode 
+installcheck-utils: \
+    configure-utils 
        @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+       @[ -f ./utils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 uudecode" ; \
-       (cd $(HOST_SUBDIR)/uudecode && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35889,24 +31935,24 @@ installcheck-uudecode: \
                  installcheck) \
          || exit 1
 
-@endif uudecode
+@endif utils
 
-.PHONY: maybe-mostlyclean-uudecode mostlyclean-uudecode
-maybe-mostlyclean-uudecode:
-@if uudecode
-maybe-mostlyclean-uudecode: mostlyclean-uudecode
+.PHONY: maybe-mostlyclean-utils mostlyclean-utils
+maybe-mostlyclean-utils:
+@if utils
+maybe-mostlyclean-utils: mostlyclean-utils
 
-mostlyclean-uudecode: 
+mostlyclean-utils: 
        @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+       @[ -f ./utils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 uudecode" ; \
-       (cd $(HOST_SUBDIR)/uudecode && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35914,24 +31960,24 @@ mostlyclean-uudecode:
                  mostlyclean) \
          || exit 1
 
-@endif uudecode
+@endif utils
 
-.PHONY: maybe-clean-uudecode clean-uudecode
-maybe-clean-uudecode:
-@if uudecode
-maybe-clean-uudecode: clean-uudecode
+.PHONY: maybe-clean-utils clean-utils
+maybe-clean-utils:
+@if utils
+maybe-clean-utils: clean-utils
 
-clean-uudecode: 
+clean-utils: 
        @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+       @[ -f ./utils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 uudecode" ; \
-       (cd $(HOST_SUBDIR)/uudecode && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35939,24 +31985,24 @@ clean-uudecode:
                  clean) \
          || exit 1
 
-@endif uudecode
+@endif utils
 
-.PHONY: maybe-distclean-uudecode distclean-uudecode
-maybe-distclean-uudecode:
-@if uudecode
-maybe-distclean-uudecode: distclean-uudecode
+.PHONY: maybe-distclean-utils distclean-utils
+maybe-distclean-utils:
+@if utils
+maybe-distclean-utils: distclean-utils
 
-distclean-uudecode: 
+distclean-utils: 
        @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+       @[ -f ./utils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 uudecode" ; \
-       (cd $(HOST_SUBDIR)/uudecode && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35964,24 +32010,24 @@ distclean-uudecode:
                  distclean) \
          || exit 1
 
-@endif uudecode
+@endif utils
 
-.PHONY: maybe-maintainer-clean-uudecode maintainer-clean-uudecode
-maybe-maintainer-clean-uudecode:
-@if uudecode
-maybe-maintainer-clean-uudecode: maintainer-clean-uudecode
+.PHONY: maybe-maintainer-clean-utils maintainer-clean-utils
+maybe-maintainer-clean-utils:
+@if utils
+maybe-maintainer-clean-utils: maintainer-clean-utils
 
-maintainer-clean-uudecode: 
+maintainer-clean-utils: 
        @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
+       @[ -f ./utils/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 uudecode" ; \
-       (cd $(HOST_SUBDIR)/uudecode && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -35989,113 +32035,129 @@ maintainer-clean-uudecode:
                  maintainer-clean) \
          || exit 1
 
-@endif uudecode
+@endif utils
 
 
 
-.PHONY: configure-wdiff maybe-configure-wdiff
-maybe-configure-wdiff:
+.PHONY: configure-gnattools maybe-configure-gnattools
+maybe-configure-gnattools:
 @if gcc-bootstrap
-configure-wdiff: stage_current
+configure-gnattools: stage_current
 @endif gcc-bootstrap
-@if wdiff
-maybe-configure-wdiff: configure-wdiff
-configure-wdiff: 
+@if gnattools
+maybe-configure-gnattools: configure-gnattools
+configure-gnattools: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/wdiff/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/wdiff ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/wdiff; \
-       cd "$(HOST_SUBDIR)/wdiff" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/gnattools; \
+       cd "$(HOST_SUBDIR)/gnattools" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/wdiff/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gnattools/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/wdiff"; \
-       libsrcdir="$$s/wdiff"; \
-       $(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 wdiff
+@endif gnattools
 
 
 
 
 
-.PHONY: all-wdiff maybe-all-wdiff
-maybe-all-wdiff:
+.PHONY: all-gnattools maybe-all-gnattools
+maybe-all-gnattools:
 @if gcc-bootstrap
-all-wdiff: stage_current
+all-gnattools: stage_current
 @endif gcc-bootstrap
-@if wdiff
-TARGET-wdiff=all
-maybe-all-wdiff: all-wdiff
-all-wdiff: configure-wdiff
+@if gnattools
+TARGET-gnattools=all
+maybe-all-gnattools: all-gnattools
+all-gnattools: configure-gnattools
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/wdiff && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-wdiff))
-@endif wdiff
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-gnattools))
+@endif gnattools
 
 
 
 
-.PHONY: check-wdiff maybe-check-wdiff
-maybe-check-wdiff:
-@if wdiff
-maybe-check-wdiff: check-wdiff
+.PHONY: check-gnattools maybe-check-gnattools
+maybe-check-gnattools:
+@if gnattools
+maybe-check-gnattools: check-gnattools
 
-check-wdiff:
+check-gnattools:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/wdiff && \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif wdiff
+@endif gnattools
 
-.PHONY: install-wdiff maybe-install-wdiff
-maybe-install-wdiff:
-@if wdiff
-maybe-install-wdiff: install-wdiff
+.PHONY: install-gnattools maybe-install-gnattools
+maybe-install-gnattools:
+@if gnattools
+maybe-install-gnattools: install-gnattools
 
-install-wdiff: installdirs
+install-gnattools: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/wdiff && \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif wdiff
+@endif gnattools
+
+.PHONY: install-strip-gnattools maybe-install-strip-gnattools
+maybe-install-strip-gnattools:
+@if gnattools
+maybe-install-strip-gnattools: install-strip-gnattools
+
+install-strip-gnattools: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif gnattools
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-wdiff info-wdiff
-maybe-info-wdiff:
-@if wdiff
-maybe-info-wdiff: info-wdiff
+.PHONY: maybe-info-gnattools info-gnattools
+maybe-info-gnattools:
+@if gnattools
+maybe-info-gnattools: info-gnattools
 
-info-wdiff: \
-    configure-wdiff 
+info-gnattools: \
+    configure-gnattools 
        @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+       @[ -f ./gnattools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in wdiff" ; \
-       (cd $(HOST_SUBDIR)/wdiff && \
+       echo "Doing info in gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36103,25 +32165,25 @@ info-wdiff: \
                  info) \
          || exit 1
 
-@endif wdiff
+@endif gnattools
 
-.PHONY: maybe-dvi-wdiff dvi-wdiff
-maybe-dvi-wdiff:
-@if wdiff
-maybe-dvi-wdiff: dvi-wdiff
+.PHONY: maybe-dvi-gnattools dvi-gnattools
+maybe-dvi-gnattools:
+@if gnattools
+maybe-dvi-gnattools: dvi-gnattools
 
-dvi-wdiff: \
-    configure-wdiff 
+dvi-gnattools: \
+    configure-gnattools 
        @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+       @[ -f ./gnattools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in wdiff" ; \
-       (cd $(HOST_SUBDIR)/wdiff && \
+       echo "Doing dvi in gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36129,25 +32191,25 @@ dvi-wdiff: \
                  dvi) \
          || exit 1
 
-@endif wdiff
+@endif gnattools
 
-.PHONY: maybe-pdf-wdiff pdf-wdiff
-maybe-pdf-wdiff:
-@if wdiff
-maybe-pdf-wdiff: pdf-wdiff
+.PHONY: maybe-pdf-gnattools pdf-gnattools
+maybe-pdf-gnattools:
+@if gnattools
+maybe-pdf-gnattools: pdf-gnattools
 
-pdf-wdiff: \
-    configure-wdiff 
+pdf-gnattools: \
+    configure-gnattools 
        @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+       @[ -f ./gnattools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in wdiff" ; \
-       (cd $(HOST_SUBDIR)/wdiff && \
+       echo "Doing pdf in gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36155,25 +32217,25 @@ pdf-wdiff: \
                  pdf) \
          || exit 1
 
-@endif wdiff
+@endif gnattools
 
-.PHONY: maybe-html-wdiff html-wdiff
-maybe-html-wdiff:
-@if wdiff
-maybe-html-wdiff: html-wdiff
+.PHONY: maybe-html-gnattools html-gnattools
+maybe-html-gnattools:
+@if gnattools
+maybe-html-gnattools: html-gnattools
 
-html-wdiff: \
-    configure-wdiff 
+html-gnattools: \
+    configure-gnattools 
        @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+       @[ -f ./gnattools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in wdiff" ; \
-       (cd $(HOST_SUBDIR)/wdiff && \
+       echo "Doing html in gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36181,25 +32243,25 @@ html-wdiff: \
                  html) \
          || exit 1
 
-@endif wdiff
+@endif gnattools
 
-.PHONY: maybe-TAGS-wdiff TAGS-wdiff
-maybe-TAGS-wdiff:
-@if wdiff
-maybe-TAGS-wdiff: TAGS-wdiff
+.PHONY: maybe-TAGS-gnattools TAGS-gnattools
+maybe-TAGS-gnattools:
+@if gnattools
+maybe-TAGS-gnattools: TAGS-gnattools
 
-TAGS-wdiff: \
-    configure-wdiff 
+TAGS-gnattools: \
+    configure-gnattools 
        @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+       @[ -f ./gnattools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in wdiff" ; \
-       (cd $(HOST_SUBDIR)/wdiff && \
+       echo "Doing TAGS in gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36207,26 +32269,26 @@ TAGS-wdiff: \
                  TAGS) \
          || exit 1
 
-@endif wdiff
+@endif gnattools
 
-.PHONY: maybe-install-info-wdiff install-info-wdiff
-maybe-install-info-wdiff:
-@if wdiff
-maybe-install-info-wdiff: install-info-wdiff
+.PHONY: maybe-install-info-gnattools install-info-gnattools
+maybe-install-info-gnattools:
+@if gnattools
+maybe-install-info-gnattools: install-info-gnattools
 
-install-info-wdiff: \
-    configure-wdiff \
-    info-wdiff 
+install-info-gnattools: \
+    configure-gnattools \
+    info-gnattools 
        @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+       @[ -f ./gnattools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in wdiff" ; \
-       (cd $(HOST_SUBDIR)/wdiff && \
+       echo "Doing install-info in gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36234,26 +32296,26 @@ install-info-wdiff: \
                  install-info) \
          || exit 1
 
-@endif wdiff
+@endif gnattools
 
-.PHONY: maybe-install-pdf-wdiff install-pdf-wdiff
-maybe-install-pdf-wdiff:
-@if wdiff
-maybe-install-pdf-wdiff: install-pdf-wdiff
+.PHONY: maybe-install-pdf-gnattools install-pdf-gnattools
+maybe-install-pdf-gnattools:
+@if gnattools
+maybe-install-pdf-gnattools: install-pdf-gnattools
 
-install-pdf-wdiff: \
-    configure-wdiff \
-    pdf-wdiff 
+install-pdf-gnattools: \
+    configure-gnattools \
+    pdf-gnattools 
        @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+       @[ -f ./gnattools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in wdiff" ; \
-       (cd $(HOST_SUBDIR)/wdiff && \
+       echo "Doing install-pdf in gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36261,26 +32323,26 @@ install-pdf-wdiff: \
                  install-pdf) \
          || exit 1
 
-@endif wdiff
+@endif gnattools
 
-.PHONY: maybe-install-html-wdiff install-html-wdiff
-maybe-install-html-wdiff:
-@if wdiff
-maybe-install-html-wdiff: install-html-wdiff
+.PHONY: maybe-install-html-gnattools install-html-gnattools
+maybe-install-html-gnattools:
+@if gnattools
+maybe-install-html-gnattools: install-html-gnattools
 
-install-html-wdiff: \
-    configure-wdiff \
-    html-wdiff 
+install-html-gnattools: \
+    configure-gnattools \
+    html-gnattools 
        @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+       @[ -f ./gnattools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in wdiff" ; \
-       (cd $(HOST_SUBDIR)/wdiff && \
+       echo "Doing install-html in gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36288,25 +32350,25 @@ install-html-wdiff: \
                  install-html) \
          || exit 1
 
-@endif wdiff
+@endif gnattools
 
-.PHONY: maybe-installcheck-wdiff installcheck-wdiff
-maybe-installcheck-wdiff:
-@if wdiff
-maybe-installcheck-wdiff: installcheck-wdiff
+.PHONY: maybe-installcheck-gnattools installcheck-gnattools
+maybe-installcheck-gnattools:
+@if gnattools
+maybe-installcheck-gnattools: installcheck-gnattools
 
-installcheck-wdiff: \
-    configure-wdiff 
+installcheck-gnattools: \
+    configure-gnattools 
        @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+       @[ -f ./gnattools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in wdiff" ; \
-       (cd $(HOST_SUBDIR)/wdiff && \
+       echo "Doing installcheck in gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36314,24 +32376,24 @@ installcheck-wdiff: \
                  installcheck) \
          || exit 1
 
-@endif wdiff
+@endif gnattools
 
-.PHONY: maybe-mostlyclean-wdiff mostlyclean-wdiff
-maybe-mostlyclean-wdiff:
-@if wdiff
-maybe-mostlyclean-wdiff: mostlyclean-wdiff
+.PHONY: maybe-mostlyclean-gnattools mostlyclean-gnattools
+maybe-mostlyclean-gnattools:
+@if gnattools
+maybe-mostlyclean-gnattools: mostlyclean-gnattools
 
-mostlyclean-wdiff: 
+mostlyclean-gnattools: 
        @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+       @[ -f ./gnattools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in wdiff" ; \
-       (cd $(HOST_SUBDIR)/wdiff && \
+       echo "Doing mostlyclean in gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36339,24 +32401,24 @@ mostlyclean-wdiff:
                  mostlyclean) \
          || exit 1
 
-@endif wdiff
+@endif gnattools
 
-.PHONY: maybe-clean-wdiff clean-wdiff
-maybe-clean-wdiff:
-@if wdiff
-maybe-clean-wdiff: clean-wdiff
+.PHONY: maybe-clean-gnattools clean-gnattools
+maybe-clean-gnattools:
+@if gnattools
+maybe-clean-gnattools: clean-gnattools
 
-clean-wdiff: 
+clean-gnattools: 
        @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+       @[ -f ./gnattools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in wdiff" ; \
-       (cd $(HOST_SUBDIR)/wdiff && \
+       echo "Doing clean in gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36364,24 +32426,24 @@ clean-wdiff:
                  clean) \
          || exit 1
 
-@endif wdiff
+@endif gnattools
 
-.PHONY: maybe-distclean-wdiff distclean-wdiff
-maybe-distclean-wdiff:
-@if wdiff
-maybe-distclean-wdiff: distclean-wdiff
+.PHONY: maybe-distclean-gnattools distclean-gnattools
+maybe-distclean-gnattools:
+@if gnattools
+maybe-distclean-gnattools: distclean-gnattools
 
-distclean-wdiff: 
+distclean-gnattools: 
        @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+       @[ -f ./gnattools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in wdiff" ; \
-       (cd $(HOST_SUBDIR)/wdiff && \
+       echo "Doing distclean in gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36389,141 +32451,611 @@ distclean-wdiff:
                  distclean) \
          || exit 1
 
-@endif wdiff
+@endif gnattools
 
-.PHONY: maybe-maintainer-clean-wdiff maintainer-clean-wdiff
-maybe-maintainer-clean-wdiff:
-@if wdiff
-maybe-maintainer-clean-wdiff: maintainer-clean-wdiff
+.PHONY: maybe-maintainer-clean-gnattools maintainer-clean-gnattools
+maybe-maintainer-clean-gnattools:
+@if gnattools
+maybe-maintainer-clean-gnattools: maintainer-clean-gnattools
 
-maintainer-clean-wdiff: 
+maintainer-clean-gnattools: 
        @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
+       @[ -f ./gnattools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing maintainer-clean in wdiff" ; \
-       (cd $(HOST_SUBDIR)/wdiff && \
-         $(MAKE) $(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
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       echo "Doing maintainer-clean in gnattools"; \
+       (cd $(HOST_SUBDIR)/gnattools && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 maintainer-clean) \
+         || exit 1
+
+@endif gnattools
+
+
+
+.PHONY: configure-lto-plugin maybe-configure-lto-plugin
+maybe-configure-lto-plugin:
+@if gcc-bootstrap
+configure-lto-plugin: stage_current
+@endif gcc-bootstrap
+@if lto-plugin
+maybe-configure-lto-plugin: configure-lto-plugin
+configure-lto-plugin: 
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/lto-plugin; \
+       cd "$(HOST_SUBDIR)/lto-plugin" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=lto-plugin; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ \
+         || exit 1
+@endif lto-plugin
+
+
+
+.PHONY: configure-stage1-lto-plugin maybe-configure-stage1-lto-plugin
+maybe-configure-stage1-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-configure-stage1-lto-plugin: configure-stage1-lto-plugin
+configure-stage1-lto-plugin:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/lto-plugin; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \
+       cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=lto-plugin; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS) \
+         --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif lto-plugin-bootstrap
+
+.PHONY: configure-stage2-lto-plugin maybe-configure-stage2-lto-plugin
+maybe-configure-stage2-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-configure-stage2-lto-plugin: configure-stage2-lto-plugin
+configure-stage2-lto-plugin:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/lto-plugin; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \
+       cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=lto-plugin; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE2_CONFIGURE_FLAGS) \
+         --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif lto-plugin-bootstrap
+
+.PHONY: configure-stage3-lto-plugin maybe-configure-stage3-lto-plugin
+maybe-configure-stage3-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-configure-stage3-lto-plugin: configure-stage3-lto-plugin
+configure-stage3-lto-plugin:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/lto-plugin; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \
+       cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=lto-plugin; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE3_CONFIGURE_FLAGS) \
+         --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif lto-plugin-bootstrap
+
+.PHONY: configure-stage4-lto-plugin maybe-configure-stage4-lto-plugin
+maybe-configure-stage4-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-configure-stage4-lto-plugin: configure-stage4-lto-plugin
+configure-stage4-lto-plugin:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/lto-plugin; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \
+       cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=lto-plugin; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE4_CONFIGURE_FLAGS) \
+         --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif lto-plugin-bootstrap
+
+.PHONY: configure-stageprofile-lto-plugin maybe-configure-stageprofile-lto-plugin
+maybe-configure-stageprofile-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-configure-stageprofile-lto-plugin: configure-stageprofile-lto-plugin
+configure-stageprofile-lto-plugin:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage profile in $(HOST_SUBDIR)/lto-plugin; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \
+       cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=lto-plugin; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEprofile_CONFIGURE_FLAGS) \
+         --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif lto-plugin-bootstrap
+
+.PHONY: configure-stagefeedback-lto-plugin maybe-configure-stagefeedback-lto-plugin
+maybe-configure-stagefeedback-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-configure-stagefeedback-lto-plugin: configure-stagefeedback-lto-plugin
+configure-stagefeedback-lto-plugin:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/lto-plugin; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \
+       cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=lto-plugin; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEfeedback_CONFIGURE_FLAGS) \
+         --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
+@endif lto-plugin-bootstrap
+
+
+
+
+
+.PHONY: all-lto-plugin maybe-all-lto-plugin
+maybe-all-lto-plugin:
+@if gcc-bootstrap
+all-lto-plugin: stage_current
+@endif gcc-bootstrap
+@if lto-plugin
+TARGET-lto-plugin=all
+maybe-all-lto-plugin: all-lto-plugin
+all-lto-plugin: configure-lto-plugin
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               $(TARGET-lto-plugin))
+@endif lto-plugin
+
+
+
+.PHONY: all-stage1-lto-plugin maybe-all-stage1-lto-plugin
+.PHONY: clean-stage1-lto-plugin maybe-clean-stage1-lto-plugin
+maybe-all-stage1-lto-plugin:
+maybe-clean-stage1-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-all-stage1-lto-plugin: all-stage1-lto-plugin
+all-stage1: all-stage1-lto-plugin
+TARGET-stage1-lto-plugin = $(TARGET-lto-plugin)
+all-stage1-lto-plugin: configure-stage1-lto-plugin
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE1_CFLAGS)" \
+               CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+               LIBCFLAGS="$(LIBCFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS)  \
+               $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
+               $(TARGET-stage1-lto-plugin)
+
+maybe-clean-stage1-lto-plugin: clean-stage1-lto-plugin
+clean-stage1: clean-stage1-lto-plugin
+clean-stage1-lto-plugin:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-lto-plugin/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+       $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif lto-plugin-bootstrap
+
+
+.PHONY: all-stage2-lto-plugin maybe-all-stage2-lto-plugin
+.PHONY: clean-stage2-lto-plugin maybe-clean-stage2-lto-plugin
+maybe-all-stage2-lto-plugin:
+maybe-clean-stage2-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-all-stage2-lto-plugin: all-stage2-lto-plugin
+all-stage2: all-stage2-lto-plugin
+TARGET-stage2-lto-plugin = $(TARGET-lto-plugin)
+all-stage2-lto-plugin: configure-stage2-lto-plugin
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE2_CFLAGS)" \
+               CXXFLAGS="$(STAGE2_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGE2_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
+               $(TARGET-stage2-lto-plugin)
+
+maybe-clean-stage2-lto-plugin: clean-stage2-lto-plugin
+clean-stage2: clean-stage2-lto-plugin
+clean-stage2-lto-plugin:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-lto-plugin/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif lto-plugin-bootstrap
+
+
+.PHONY: all-stage3-lto-plugin maybe-all-stage3-lto-plugin
+.PHONY: clean-stage3-lto-plugin maybe-clean-stage3-lto-plugin
+maybe-all-stage3-lto-plugin:
+maybe-clean-stage3-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-all-stage3-lto-plugin: all-stage3-lto-plugin
+all-stage3: all-stage3-lto-plugin
+TARGET-stage3-lto-plugin = $(TARGET-lto-plugin)
+all-stage3-lto-plugin: configure-stage3-lto-plugin
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE3_CFLAGS)" \
+               CXXFLAGS="$(STAGE3_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGE3_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
+               $(TARGET-stage3-lto-plugin)
+
+maybe-clean-stage3-lto-plugin: clean-stage3-lto-plugin
+clean-stage3: clean-stage3-lto-plugin
+clean-stage3-lto-plugin:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-lto-plugin/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif lto-plugin-bootstrap
+
+
+.PHONY: all-stage4-lto-plugin maybe-all-stage4-lto-plugin
+.PHONY: clean-stage4-lto-plugin maybe-clean-stage4-lto-plugin
+maybe-all-stage4-lto-plugin:
+maybe-clean-stage4-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-all-stage4-lto-plugin: all-stage4-lto-plugin
+all-stage4: all-stage4-lto-plugin
+TARGET-stage4-lto-plugin = $(TARGET-lto-plugin)
+all-stage4-lto-plugin: configure-stage4-lto-plugin
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE4_CFLAGS)" \
+               CXXFLAGS="$(STAGE4_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGE4_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
+               $(TARGET-stage4-lto-plugin)
+
+maybe-clean-stage4-lto-plugin: clean-stage4-lto-plugin
+clean-stage4: clean-stage4-lto-plugin
+clean-stage4-lto-plugin:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-lto-plugin/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif lto-plugin-bootstrap
+
+
+.PHONY: all-stageprofile-lto-plugin maybe-all-stageprofile-lto-plugin
+.PHONY: clean-stageprofile-lto-plugin maybe-clean-stageprofile-lto-plugin
+maybe-all-stageprofile-lto-plugin:
+maybe-clean-stageprofile-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-all-stageprofile-lto-plugin: all-stageprofile-lto-plugin
+all-stageprofile: all-stageprofile-lto-plugin
+TARGET-stageprofile-lto-plugin = $(TARGET-lto-plugin)
+all-stageprofile-lto-plugin: configure-stageprofile-lto-plugin
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGEprofile_CFLAGS)" \
+               CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
+               $(TARGET-stageprofile-lto-plugin)
+
+maybe-clean-stageprofile-lto-plugin: clean-stageprofile-lto-plugin
+clean-stageprofile: clean-stageprofile-lto-plugin
+clean-stageprofile-lto-plugin:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-lto-plugin/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif lto-plugin-bootstrap
+
+
+.PHONY: all-stagefeedback-lto-plugin maybe-all-stagefeedback-lto-plugin
+.PHONY: clean-stagefeedback-lto-plugin maybe-clean-stagefeedback-lto-plugin
+maybe-all-stagefeedback-lto-plugin:
+maybe-clean-stagefeedback-lto-plugin:
+@if lto-plugin-bootstrap
+maybe-all-stagefeedback-lto-plugin: all-stagefeedback-lto-plugin
+all-stagefeedback: all-stagefeedback-lto-plugin
+TARGET-stagefeedback-lto-plugin = $(TARGET-lto-plugin)
+all-stagefeedback-lto-plugin: configure-stagefeedback-lto-plugin
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
+               $(TARGET-stagefeedback-lto-plugin)
+
+maybe-clean-stagefeedback-lto-plugin: clean-stagefeedback-lto-plugin
+clean-stagefeedback: clean-stagefeedback-lto-plugin
+clean-stagefeedback-lto-plugin:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-lto-plugin/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/lto-plugin && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
+@endif lto-plugin-bootstrap
 
-@endif wdiff
 
 
 
-.PHONY: configure-zip maybe-configure-zip
-maybe-configure-zip:
-@if gcc-bootstrap
-configure-zip: stage_current
-@endif gcc-bootstrap
-@if zip
-maybe-configure-zip: configure-zip
-configure-zip: 
+
+.PHONY: check-lto-plugin maybe-check-lto-plugin
+maybe-check-lto-plugin:
+@if lto-plugin
+maybe-check-lto-plugin: check-lto-plugin
+
+check-lto-plugin:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/zip/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zip ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/zip; \
-       cd "$(HOST_SUBDIR)/zip" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/zip/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/zip"; \
-       libsrcdir="$$s/zip"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif zip
-
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ $(EXTRA_BOOTSTRAP_FLAGS) check)
 
+@endif lto-plugin
 
+.PHONY: install-lto-plugin maybe-install-lto-plugin
+maybe-install-lto-plugin:
+@if lto-plugin
+maybe-install-lto-plugin: install-lto-plugin
 
-
-.PHONY: all-zip maybe-all-zip
-maybe-all-zip:
-@if gcc-bootstrap
-all-zip: stage_current
-@endif gcc-bootstrap
-@if zip
-TARGET-zip=all
-maybe-all-zip: all-zip
-all-zip: configure-zip
+install-lto-plugin: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/zip && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-zip))
-@endif zip
-
-
-
-
-.PHONY: check-zip maybe-check-zip
-maybe-check-zip:
-@if zip
-maybe-check-zip: check-zip
-
-# This module is only tested in a native toolchain.
-check-zip:
-       @: $(MAKE); $(unstage)
-       @if [ '$(host)' = '$(target)' ] ; then \
-         r=`${PWD_COMMAND}`; export r; \
-         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(HOST_EXPORTS) \
-         (cd $(HOST_SUBDIR)/zip && \
-           $(MAKE) $(FLAGS_TO_PASS)  check); \
-       fi
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ install)
 
-@endif zip
+@endif lto-plugin
 
-.PHONY: install-zip maybe-install-zip
-maybe-install-zip:
-@if zip
-maybe-install-zip: install-zip
+.PHONY: install-strip-lto-plugin maybe-install-strip-lto-plugin
+maybe-install-strip-lto-plugin:
+@if lto-plugin
+maybe-install-strip-lto-plugin: install-strip-lto-plugin
 
-install-zip: installdirs
+install-strip-lto-plugin: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/zip && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ install-strip)
 
-@endif zip
+@endif lto-plugin
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-zip info-zip
-maybe-info-zip:
-@if zip
-maybe-info-zip: info-zip
+.PHONY: maybe-info-lto-plugin info-lto-plugin
+maybe-info-lto-plugin:
+@if lto-plugin
+maybe-info-lto-plugin: info-lto-plugin
 
-info-zip: \
-    configure-zip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
+info-lto-plugin: \
+    configure-lto-plugin 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
+       echo "Doing info in lto-plugin"; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36531,25 +33063,24 @@ info-zip: \
                  info) \
          || exit 1
 
-@endif zip
+@endif lto-plugin
 
-.PHONY: maybe-dvi-zip dvi-zip
-maybe-dvi-zip:
-@if zip
-maybe-dvi-zip: dvi-zip
+.PHONY: maybe-dvi-lto-plugin dvi-lto-plugin
+maybe-dvi-lto-plugin:
+@if lto-plugin
+maybe-dvi-lto-plugin: dvi-lto-plugin
 
-dvi-zip: \
-    configure-zip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
+dvi-lto-plugin: \
+    configure-lto-plugin 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
+       echo "Doing dvi in lto-plugin"; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36557,25 +33088,24 @@ dvi-zip: \
                  dvi) \
          || exit 1
 
-@endif zip
+@endif lto-plugin
 
-.PHONY: maybe-pdf-zip pdf-zip
-maybe-pdf-zip:
-@if zip
-maybe-pdf-zip: pdf-zip
+.PHONY: maybe-pdf-lto-plugin pdf-lto-plugin
+maybe-pdf-lto-plugin:
+@if lto-plugin
+maybe-pdf-lto-plugin: pdf-lto-plugin
 
-pdf-zip: \
-    configure-zip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
+pdf-lto-plugin: \
+    configure-lto-plugin 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
+       echo "Doing pdf in lto-plugin"; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36583,25 +33113,24 @@ pdf-zip: \
                  pdf) \
          || exit 1
 
-@endif zip
+@endif lto-plugin
 
-.PHONY: maybe-html-zip html-zip
-maybe-html-zip:
-@if zip
-maybe-html-zip: html-zip
+.PHONY: maybe-html-lto-plugin html-lto-plugin
+maybe-html-lto-plugin:
+@if lto-plugin
+maybe-html-lto-plugin: html-lto-plugin
 
-html-zip: \
-    configure-zip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
+html-lto-plugin: \
+    configure-lto-plugin 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
+       echo "Doing html in lto-plugin"; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36609,25 +33138,24 @@ html-zip: \
                  html) \
          || exit 1
 
-@endif zip
+@endif lto-plugin
 
-.PHONY: maybe-TAGS-zip TAGS-zip
-maybe-TAGS-zip:
-@if zip
-maybe-TAGS-zip: TAGS-zip
+.PHONY: maybe-TAGS-lto-plugin TAGS-lto-plugin
+maybe-TAGS-lto-plugin:
+@if lto-plugin
+maybe-TAGS-lto-plugin: TAGS-lto-plugin
 
-TAGS-zip: \
-    configure-zip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
+TAGS-lto-plugin: \
+    configure-lto-plugin 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
+       echo "Doing TAGS in lto-plugin"; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36635,26 +33163,25 @@ TAGS-zip: \
                  TAGS) \
          || exit 1
 
-@endif zip
+@endif lto-plugin
 
-.PHONY: maybe-install-info-zip install-info-zip
-maybe-install-info-zip:
-@if zip
-maybe-install-info-zip: install-info-zip
+.PHONY: maybe-install-info-lto-plugin install-info-lto-plugin
+maybe-install-info-lto-plugin:
+@if lto-plugin
+maybe-install-info-lto-plugin: install-info-lto-plugin
 
-install-info-zip: \
-    configure-zip \
-    info-zip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
+install-info-lto-plugin: \
+    configure-lto-plugin \
+    info-lto-plugin 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
+       echo "Doing install-info in lto-plugin"; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36662,26 +33189,25 @@ install-info-zip: \
                  install-info) \
          || exit 1
 
-@endif zip
+@endif lto-plugin
 
-.PHONY: maybe-install-pdf-zip install-pdf-zip
-maybe-install-pdf-zip:
-@if zip
-maybe-install-pdf-zip: install-pdf-zip
+.PHONY: maybe-install-pdf-lto-plugin install-pdf-lto-plugin
+maybe-install-pdf-lto-plugin:
+@if lto-plugin
+maybe-install-pdf-lto-plugin: install-pdf-lto-plugin
 
-install-pdf-zip: \
-    configure-zip \
-    pdf-zip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
+install-pdf-lto-plugin: \
+    configure-lto-plugin \
+    pdf-lto-plugin 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
+       echo "Doing install-pdf in lto-plugin"; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36689,26 +33215,25 @@ install-pdf-zip: \
                  install-pdf) \
          || exit 1
 
-@endif zip
+@endif lto-plugin
 
-.PHONY: maybe-install-html-zip install-html-zip
-maybe-install-html-zip:
-@if zip
-maybe-install-html-zip: install-html-zip
+.PHONY: maybe-install-html-lto-plugin install-html-lto-plugin
+maybe-install-html-lto-plugin:
+@if lto-plugin
+maybe-install-html-lto-plugin: install-html-lto-plugin
 
-install-html-zip: \
-    configure-zip \
-    html-zip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
+install-html-lto-plugin: \
+    configure-lto-plugin \
+    html-lto-plugin 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
+       echo "Doing install-html in lto-plugin"; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36716,25 +33241,24 @@ install-html-zip: \
                  install-html) \
          || exit 1
 
-@endif zip
+@endif lto-plugin
 
-.PHONY: maybe-installcheck-zip installcheck-zip
-maybe-installcheck-zip:
-@if zip
-maybe-installcheck-zip: installcheck-zip
+.PHONY: maybe-installcheck-lto-plugin installcheck-lto-plugin
+maybe-installcheck-lto-plugin:
+@if lto-plugin
+maybe-installcheck-lto-plugin: installcheck-lto-plugin
 
-installcheck-zip: \
-    configure-zip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
+installcheck-lto-plugin: \
+    configure-lto-plugin 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
+       echo "Doing installcheck in lto-plugin"; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36742,24 +33266,23 @@ installcheck-zip: \
                  installcheck) \
          || exit 1
 
-@endif zip
+@endif lto-plugin
 
-.PHONY: maybe-mostlyclean-zip mostlyclean-zip
-maybe-mostlyclean-zip:
-@if zip
-maybe-mostlyclean-zip: mostlyclean-zip
+.PHONY: maybe-mostlyclean-lto-plugin mostlyclean-lto-plugin
+maybe-mostlyclean-lto-plugin:
+@if lto-plugin
+maybe-mostlyclean-lto-plugin: mostlyclean-lto-plugin
 
-mostlyclean-zip: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
+mostlyclean-lto-plugin: 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
+       echo "Doing mostlyclean in lto-plugin"; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36767,24 +33290,23 @@ mostlyclean-zip:
                  mostlyclean) \
          || exit 1
 
-@endif zip
+@endif lto-plugin
 
-.PHONY: maybe-clean-zip clean-zip
-maybe-clean-zip:
-@if zip
-maybe-clean-zip: clean-zip
+.PHONY: maybe-clean-lto-plugin clean-lto-plugin
+maybe-clean-lto-plugin:
+@if lto-plugin
+maybe-clean-lto-plugin: clean-lto-plugin
 
-clean-zip: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
+clean-lto-plugin: 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
+       echo "Doing clean in lto-plugin"; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36792,24 +33314,23 @@ clean-zip:
                  clean) \
          || exit 1
 
-@endif zip
+@endif lto-plugin
 
-.PHONY: maybe-distclean-zip distclean-zip
-maybe-distclean-zip:
-@if zip
-maybe-distclean-zip: distclean-zip
+.PHONY: maybe-distclean-lto-plugin distclean-lto-plugin
+maybe-distclean-lto-plugin:
+@if lto-plugin
+maybe-distclean-lto-plugin: distclean-lto-plugin
 
-distclean-zip: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
+distclean-lto-plugin: 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
+       echo "Doing distclean in lto-plugin"; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36817,24 +33338,23 @@ distclean-zip:
                  distclean) \
          || exit 1
 
-@endif zip
+@endif lto-plugin
 
-.PHONY: maybe-maintainer-clean-zip maintainer-clean-zip
-maybe-maintainer-clean-zip:
-@if zip
-maybe-maintainer-clean-zip: maintainer-clean-zip
+.PHONY: maybe-maintainer-clean-lto-plugin maintainer-clean-lto-plugin
+maybe-maintainer-clean-lto-plugin:
+@if lto-plugin
+maybe-maintainer-clean-lto-plugin: maintainer-clean-lto-plugin
 
-maintainer-clean-zip: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
+maintainer-clean-lto-plugin: 
+       @[ -f ./lto-plugin/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
+       echo "Doing maintainer-clean in lto-plugin"; \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -36842,651 +33362,129 @@ maintainer-clean-zip:
                  maintainer-clean) \
          || exit 1
 
-@endif zip
+@endif lto-plugin
 
 
 
-.PHONY: configure-zlib maybe-configure-zlib
-maybe-configure-zlib:
+.PHONY: configure-libcc1 maybe-configure-libcc1
+maybe-configure-libcc1:
 @if gcc-bootstrap
-configure-zlib: stage_current
+configure-libcc1: stage_current
 @endif gcc-bootstrap
-@if zlib
-maybe-configure-zlib: configure-zlib
-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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif zlib
-
-
-
-.PHONY: configure-stage1-zlib maybe-configure-stage1-zlib
-maybe-configure-stage1-zlib:
-@if zlib-bootstrap
-maybe-configure-stage1-zlib: configure-stage1-zlib
-configure-stage1-zlib:
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+@if libcc1
+maybe-configure-libcc1: configure-libcc1
+configure-libcc1: 
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libcc1/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1; \
        $(HOST_EXPORTS)  \
-       CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-          \
-         --disable-intermodule $(STAGE1_CHECKING)        --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif zlib-bootstrap
-
-.PHONY: configure-stage2-zlib maybe-configure-stage2-zlib
-maybe-configure-stage2-zlib:
-@if zlib-bootstrap
-maybe-configure-stage2-zlib: configure-stage2-zlib
-configure-stage2-zlib:
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif zlib-bootstrap
-
-.PHONY: configure-stageb2g0-zlib maybe-configure-stageb2g0-zlib
-maybe-configure-stageb2g0-zlib:
-@if zlib-bootstrap
-maybe-configure-stageb2g0-zlib: configure-stageb2g0-zlib
-configure-stageb2g0-zlib:
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
-       echo Configuring stage b2g0 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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif zlib-bootstrap
-
-.PHONY: configure-stage3-zlib maybe-configure-stage3-zlib
-maybe-configure-stage3-zlib:
-@if zlib-bootstrap
-maybe-configure-stage3-zlib: configure-stage3-zlib
-configure-stage3-zlib:
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif zlib-bootstrap
-
-.PHONY: configure-stageb3g2-zlib maybe-configure-stageb3g2-zlib
-maybe-configure-stageb3g2-zlib:
-@if zlib-bootstrap
-maybe-configure-stageb3g2-zlib: configure-stageb3g2-zlib
-configure-stageb3g2-zlib:
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
-       echo Configuring stage b3g2 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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif zlib-bootstrap
-
-.PHONY: configure-stage4-zlib maybe-configure-stage4-zlib
-maybe-configure-stage4-zlib:
-@if zlib-bootstrap
-maybe-configure-stage4-zlib: configure-stage4-zlib
-configure-stage4-zlib:
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif zlib-bootstrap
-
-.PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib
-maybe-configure-stageprofile-zlib:
-@if zlib-bootstrap
-maybe-configure-stageprofile-zlib: configure-stageprofile-zlib
-configure-stageprofile-zlib:
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
-       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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif zlib-bootstrap
-
-.PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib
-maybe-configure-stagefeedback-zlib:
-@if zlib-bootstrap
-maybe-configure-stagefeedback-zlib: configure-stagefeedback-zlib
-configure-stagefeedback-zlib:
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/zlib ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
-       cd $(HOST_SUBDIR)/zlib || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libcc1; \
+       cd "$(HOST_SUBDIR)/libcc1" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libcc1/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libcc1; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif zlib-bootstrap
+         --target=${target_alias} --enable-shared \
+         || exit 1
+@endif libcc1
 
 
 
 
 
-.PHONY: all-zlib maybe-all-zlib
-maybe-all-zlib:
+.PHONY: all-libcc1 maybe-all-libcc1
+maybe-all-libcc1:
 @if gcc-bootstrap
-all-zlib: stage_current
+all-libcc1: stage_current
 @endif gcc-bootstrap
-@if zlib
-TARGET-zlib=all
-maybe-all-zlib: all-zlib
-all-zlib: configure-zlib
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/zlib && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-zlib))
-@endif zlib
-
-
-
-.PHONY: all-stage1-zlib maybe-all-stage1-zlib
-.PHONY: clean-stage1-zlib maybe-clean-stage1-zlib
-maybe-all-stage1-zlib:
-maybe-clean-stage1-zlib:
-@if zlib-bootstrap
-maybe-all-stage1-zlib: all-stage1-zlib
-all-stage1: all-stage1-zlib
-TARGET-stage1-zlib = $(TARGET-zlib)
-all-stage1-zlib: configure-stage1-zlib
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-               LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
-               $(TARGET-stage1-zlib)
-
-maybe-clean-stage1-zlib: clean-stage1-zlib
-clean-stage1: clean-stage1-zlib
-clean-stage1-zlib:
-       @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage1-zlib/Makefile ] || exit 0; \
-         $(MAKE) stage1-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
-@endif zlib-bootstrap
-
-
-.PHONY: all-stage2-zlib maybe-all-stage2-zlib
-.PHONY: clean-stage2-zlib maybe-clean-stage2-zlib
-maybe-all-stage2-zlib:
-maybe-clean-stage2-zlib:
-@if zlib-bootstrap
-maybe-all-stage2-zlib: all-stage2-zlib
-all-stage2: all-stage2-zlib
-TARGET-stage2-zlib = $(TARGET-zlib)
-all-stage2-zlib: configure-stage2-zlib
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage2-zlib)
-
-maybe-clean-stage2-zlib: clean-stage2-zlib
-clean-stage2: clean-stage2-zlib
-clean-stage2-zlib:
-       @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage2-zlib/Makefile ] || exit 0; \
-         $(MAKE) stage2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif zlib-bootstrap
-
-
-.PHONY: all-stageb2g0-zlib maybe-all-stageb2g0-zlib
-.PHONY: clean-stageb2g0-zlib maybe-clean-stageb2g0-zlib
-maybe-all-stageb2g0-zlib:
-maybe-clean-stageb2g0-zlib:
-@if zlib-bootstrap
-maybe-all-stageb2g0-zlib: all-stageb2g0-zlib
-all-stageb2g0: all-stageb2g0-zlib
-TARGET-stageb2g0-zlib = $(TARGET-zlib)
-all-stageb2g0-zlib: configure-stageb2g0-zlib
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb2g0-zlib)
-
-maybe-clean-stageb2g0-zlib: clean-stageb2g0-zlib
-clean-stageb2g0: clean-stageb2g0-zlib
-clean-stageb2g0-zlib:
-       @if [ $(current_stage) = stageb2g0 ]; then \
-         [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb2g0-zlib/Makefile ] || exit 0; \
-         $(MAKE) stageb2g0-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif zlib-bootstrap
-
-
-.PHONY: all-stage3-zlib maybe-all-stage3-zlib
-.PHONY: clean-stage3-zlib maybe-clean-stage3-zlib
-maybe-all-stage3-zlib:
-maybe-clean-stage3-zlib:
-@if zlib-bootstrap
-maybe-all-stage3-zlib: all-stage3-zlib
-all-stage3: all-stage3-zlib
-TARGET-stage3-zlib = $(TARGET-zlib)
-all-stage3-zlib: configure-stage3-zlib
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+@if libcc1
+TARGET-libcc1=all
+maybe-all-libcc1: all-libcc1
+all-libcc1: configure-libcc1
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage3-zlib)
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-libcc1))
+@endif libcc1
 
-maybe-clean-stage3-zlib: clean-stage3-zlib
-clean-stage3: clean-stage3-zlib
-clean-stage3-zlib:
-       @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage3-zlib/Makefile ] || exit 0; \
-         $(MAKE) stage3-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif zlib-bootstrap
 
 
-.PHONY: all-stageb3g2-zlib maybe-all-stageb3g2-zlib
-.PHONY: clean-stageb3g2-zlib maybe-clean-stageb3g2-zlib
-maybe-all-stageb3g2-zlib:
-maybe-clean-stageb3g2-zlib:
-@if zlib-bootstrap
-maybe-all-stageb3g2-zlib: all-stageb3g2-zlib
-all-stageb3g2: all-stageb3g2-zlib
-TARGET-stageb3g2-zlib = $(TARGET-zlib)
-all-stageb3g2-zlib: configure-stageb3g2-zlib
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageb3g2-zlib)
-
-maybe-clean-stageb3g2-zlib: clean-stageb3g2-zlib
-clean-stageb3g2: clean-stageb3g2-zlib
-clean-stageb3g2-zlib:
-       @if [ $(current_stage) = stageb3g2 ]; then \
-         [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageb3g2-zlib/Makefile ] || exit 0; \
-         $(MAKE) stageb3g2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif zlib-bootstrap
 
+.PHONY: check-libcc1 maybe-check-libcc1
+maybe-check-libcc1:
+@if libcc1
+maybe-check-libcc1: check-libcc1
 
-.PHONY: all-stage4-zlib maybe-all-stage4-zlib
-.PHONY: clean-stage4-zlib maybe-clean-stage4-zlib
-maybe-all-stage4-zlib:
-maybe-clean-stage4-zlib:
-@if zlib-bootstrap
-maybe-all-stage4-zlib: all-stage4-zlib
-all-stage4: all-stage4-zlib
-TARGET-stage4-zlib = $(TARGET-zlib)
-all-stage4-zlib: configure-stage4-zlib
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+check-libcc1:
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-               LIBCFLAGS="$(STAGE4_CFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stage4-zlib)
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
 
-maybe-clean-stage4-zlib: clean-stage4-zlib
-clean-stage4: clean-stage4-zlib
-clean-stage4-zlib:
-       @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage4-zlib/Makefile ] || exit 0; \
-         $(MAKE) stage4-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif zlib-bootstrap
+@endif libcc1
 
+.PHONY: install-libcc1 maybe-install-libcc1
+maybe-install-libcc1:
+@if libcc1
+maybe-install-libcc1: install-libcc1
 
-.PHONY: all-stageprofile-zlib maybe-all-stageprofile-zlib
-.PHONY: clean-stageprofile-zlib maybe-clean-stageprofile-zlib
-maybe-all-stageprofile-zlib:
-maybe-clean-stageprofile-zlib:
-@if zlib-bootstrap
-maybe-all-stageprofile-zlib: all-stageprofile-zlib
-all-stageprofile: all-stageprofile-zlib
-TARGET-stageprofile-zlib = $(TARGET-zlib)
-all-stageprofile-zlib: configure-stageprofile-zlib
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+install-libcc1: installdirs
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stageprofile-zlib)
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
-clean-stageprofile: clean-stageprofile-zlib
-clean-stageprofile-zlib:
-       @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageprofile-zlib/Makefile ] || exit 0; \
-         $(MAKE) stageprofile-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif zlib-bootstrap
+@endif libcc1
 
+.PHONY: install-strip-libcc1 maybe-install-strip-libcc1
+maybe-install-strip-libcc1:
+@if libcc1
+maybe-install-strip-libcc1: install-strip-libcc1
 
-.PHONY: all-stagefeedback-zlib maybe-all-stagefeedback-zlib
-.PHONY: clean-stagefeedback-zlib maybe-clean-stagefeedback-zlib
-maybe-all-stagefeedback-zlib:
-maybe-clean-stagefeedback-zlib:
-@if zlib-bootstrap
-maybe-all-stagefeedback-zlib: all-stagefeedback-zlib
-all-stagefeedback: all-stagefeedback-zlib
-TARGET-stagefeedback-zlib = $(TARGET-zlib)
-all-stagefeedback-zlib: configure-stagefeedback-zlib
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+install-strip-libcc1: installdirs
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS) \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(TARGET-stagefeedback-zlib)
-
-maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
-clean-stagefeedback: clean-stagefeedback-zlib
-clean-stagefeedback-zlib:
-       @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-zlib/Makefile ] || exit 0; \
-         $(MAKE) stagefeedback-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/zlib && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif zlib-bootstrap
-
-
-
-
-
-.PHONY: check-zlib maybe-check-zlib
-maybe-check-zlib:
-@if zlib
-maybe-check-zlib: check-zlib
-
-check-zlib:
-
-@endif zlib
+       (cd $(HOST_SUBDIR)/libcc1 && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-.PHONY: install-zlib maybe-install-zlib
-maybe-install-zlib:
-@if zlib
-maybe-install-zlib: install-zlib
-
-install-zlib:
-
-@endif zlib
+@endif libcc1
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-zlib info-zlib
-maybe-info-zlib:
-@if zlib
-maybe-info-zlib: info-zlib
-
-info-zlib: \
-    configure-zlib 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+.PHONY: maybe-info-libcc1 info-libcc1
+maybe-info-libcc1:
+@if libcc1
+maybe-info-libcc1: info-libcc1
+
+info-libcc1: \
+    configure-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
+       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}" \
@@ -37494,24 +33492,25 @@ info-zlib: \
                  info) \
          || exit 1
 
-@endif zlib
+@endif libcc1
 
-.PHONY: maybe-dvi-zlib dvi-zlib
-maybe-dvi-zlib:
-@if zlib
-maybe-dvi-zlib: dvi-zlib
+.PHONY: maybe-dvi-libcc1 dvi-libcc1
+maybe-dvi-libcc1:
+@if libcc1
+maybe-dvi-libcc1: dvi-libcc1
 
-dvi-zlib: \
-    configure-zlib 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+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 zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
+       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}" \
@@ -37519,24 +33518,25 @@ dvi-zlib: \
                  dvi) \
          || exit 1
 
-@endif zlib
+@endif libcc1
 
-.PHONY: maybe-pdf-zlib pdf-zlib
-maybe-pdf-zlib:
-@if zlib
-maybe-pdf-zlib: pdf-zlib
+.PHONY: maybe-pdf-libcc1 pdf-libcc1
+maybe-pdf-libcc1:
+@if libcc1
+maybe-pdf-libcc1: pdf-libcc1
 
-pdf-zlib: \
-    configure-zlib 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+pdf-libcc1: \
+    configure-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
+       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}" \
@@ -37544,24 +33544,25 @@ pdf-zlib: \
                  pdf) \
          || exit 1
 
-@endif zlib
+@endif libcc1
 
-.PHONY: maybe-html-zlib html-zlib
-maybe-html-zlib:
-@if zlib
-maybe-html-zlib: html-zlib
+.PHONY: maybe-html-libcc1 html-libcc1
+maybe-html-libcc1:
+@if libcc1
+maybe-html-libcc1: html-libcc1
 
-html-zlib: \
-    configure-zlib 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+html-libcc1: \
+    configure-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
+       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}" \
@@ -37569,24 +33570,25 @@ html-zlib: \
                  html) \
          || exit 1
 
-@endif zlib
+@endif libcc1
 
-.PHONY: maybe-TAGS-zlib TAGS-zlib
-maybe-TAGS-zlib:
-@if zlib
-maybe-TAGS-zlib: TAGS-zlib
+.PHONY: maybe-TAGS-libcc1 TAGS-libcc1
+maybe-TAGS-libcc1:
+@if libcc1
+maybe-TAGS-libcc1: TAGS-libcc1
 
-TAGS-zlib: \
-    configure-zlib 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+TAGS-libcc1: \
+    configure-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
+       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}" \
@@ -37594,25 +33596,26 @@ TAGS-zlib: \
                  TAGS) \
          || exit 1
 
-@endif zlib
+@endif libcc1
 
-.PHONY: maybe-install-info-zlib install-info-zlib
-maybe-install-info-zlib:
-@if zlib
-maybe-install-info-zlib: install-info-zlib
+.PHONY: maybe-install-info-libcc1 install-info-libcc1
+maybe-install-info-libcc1:
+@if libcc1
+maybe-install-info-libcc1: install-info-libcc1
 
-install-info-zlib: \
-    configure-zlib \
-    info-zlib 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+install-info-libcc1: \
+    configure-libcc1 \
+    info-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
+       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}" \
@@ -37620,25 +33623,26 @@ install-info-zlib: \
                  install-info) \
          || exit 1
 
-@endif zlib
+@endif libcc1
 
-.PHONY: maybe-install-pdf-zlib install-pdf-zlib
-maybe-install-pdf-zlib:
-@if zlib
-maybe-install-pdf-zlib: install-pdf-zlib
+.PHONY: maybe-install-pdf-libcc1 install-pdf-libcc1
+maybe-install-pdf-libcc1:
+@if libcc1
+maybe-install-pdf-libcc1: install-pdf-libcc1
 
-install-pdf-zlib: \
-    configure-zlib \
-    pdf-zlib 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+install-pdf-libcc1: \
+    configure-libcc1 \
+    pdf-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
+       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}" \
@@ -37646,25 +33650,26 @@ install-pdf-zlib: \
                  install-pdf) \
          || exit 1
 
-@endif zlib
+@endif libcc1
 
-.PHONY: maybe-install-html-zlib install-html-zlib
-maybe-install-html-zlib:
-@if zlib
-maybe-install-html-zlib: install-html-zlib
+.PHONY: maybe-install-html-libcc1 install-html-libcc1
+maybe-install-html-libcc1:
+@if libcc1
+maybe-install-html-libcc1: install-html-libcc1
 
-install-html-zlib: \
-    configure-zlib \
-    html-zlib 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+install-html-libcc1: \
+    configure-libcc1 \
+    html-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
+       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}" \
@@ -37672,24 +33677,25 @@ install-html-zlib: \
                  install-html) \
          || exit 1
 
-@endif zlib
+@endif libcc1
 
-.PHONY: maybe-installcheck-zlib installcheck-zlib
-maybe-installcheck-zlib:
-@if zlib
-maybe-installcheck-zlib: installcheck-zlib
+.PHONY: maybe-installcheck-libcc1 installcheck-libcc1
+maybe-installcheck-libcc1:
+@if libcc1
+maybe-installcheck-libcc1: installcheck-libcc1
 
-installcheck-zlib: \
-    configure-zlib 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+installcheck-libcc1: \
+    configure-libcc1 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
+       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}" \
@@ -37697,23 +33703,24 @@ installcheck-zlib: \
                  installcheck) \
          || exit 1
 
-@endif zlib
+@endif libcc1
 
-.PHONY: maybe-mostlyclean-zlib mostlyclean-zlib
-maybe-mostlyclean-zlib:
-@if zlib
-maybe-mostlyclean-zlib: mostlyclean-zlib
+.PHONY: maybe-mostlyclean-libcc1 mostlyclean-libcc1
+maybe-mostlyclean-libcc1:
+@if libcc1
+maybe-mostlyclean-libcc1: mostlyclean-libcc1
 
-mostlyclean-zlib: 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+mostlyclean-libcc1: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
+       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}" \
@@ -37721,23 +33728,24 @@ mostlyclean-zlib:
                  mostlyclean) \
          || exit 1
 
-@endif zlib
+@endif libcc1
 
-.PHONY: maybe-clean-zlib clean-zlib
-maybe-clean-zlib:
-@if zlib
-maybe-clean-zlib: clean-zlib
+.PHONY: maybe-clean-libcc1 clean-libcc1
+maybe-clean-libcc1:
+@if libcc1
+maybe-clean-libcc1: clean-libcc1
 
-clean-zlib: 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+clean-libcc1: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
+       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}" \
@@ -37745,23 +33753,24 @@ clean-zlib:
                  clean) \
          || exit 1
 
-@endif zlib
+@endif libcc1
 
-.PHONY: maybe-distclean-zlib distclean-zlib
-maybe-distclean-zlib:
-@if zlib
-maybe-distclean-zlib: distclean-zlib
+.PHONY: maybe-distclean-libcc1 distclean-libcc1
+maybe-distclean-libcc1:
+@if libcc1
+maybe-distclean-libcc1: distclean-libcc1
 
-distclean-zlib: 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+distclean-libcc1: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
+       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}" \
@@ -37769,23 +33778,24 @@ distclean-zlib:
                  distclean) \
          || exit 1
 
-@endif zlib
+@endif libcc1
 
-.PHONY: maybe-maintainer-clean-zlib maintainer-clean-zlib
-maybe-maintainer-clean-zlib:
-@if zlib
-maybe-maintainer-clean-zlib: maintainer-clean-zlib
+.PHONY: maybe-maintainer-clean-libcc1 maintainer-clean-libcc1
+maybe-maintainer-clean-libcc1:
+@if libcc1
+maybe-maintainer-clean-libcc1: maintainer-clean-libcc1
 
-maintainer-clean-zlib: 
-       @[ -f ./zlib/Makefile ] || exit 0; \
+maintainer-clean-libcc1: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./libcc1/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
+       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}" \
@@ -37793,113 +33803,129 @@ maintainer-clean-zlib:
                  maintainer-clean) \
          || exit 1
 
-@endif zlib
+@endif libcc1
 
 
 
-.PHONY: configure-gdb maybe-configure-gdb
-maybe-configure-gdb:
+.PHONY: configure-gotools maybe-configure-gotools
+maybe-configure-gotools:
 @if gcc-bootstrap
-configure-gdb: stage_current
+configure-gotools: stage_current
 @endif gcc-bootstrap
-@if gdb
-maybe-configure-gdb: configure-gdb
-configure-gdb: 
+@if gotools
+maybe-configure-gotools: configure-gotools
+configure-gotools: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gdb/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdb ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/gdb; \
-       cd "$(HOST_SUBDIR)/gdb" || 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 $(HOST_SUBDIR)/gdb/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gotools/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gdb"; \
-       libsrcdir="$$s/gdb"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=gotools; \
+       $(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
+@endif gotools
 
 
 
 
 
-.PHONY: all-gdb maybe-all-gdb
-maybe-all-gdb:
+.PHONY: all-gotools maybe-all-gotools
+maybe-all-gotools:
 @if gcc-bootstrap
-all-gdb: stage_current
+all-gotools: stage_current
 @endif gcc-bootstrap
-@if gdb
-TARGET-gdb=all
-maybe-all-gdb: all-gdb
-all-gdb: configure-gdb
+@if gotools
+TARGET-gotools=all
+maybe-all-gotools: all-gotools
+all-gotools: configure-gotools
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gdb && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \
-               $(TARGET-gdb))
-@endif gdb
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-gotools))
+@endif gotools
 
 
 
 
-.PHONY: check-gdb maybe-check-gdb
-maybe-check-gdb:
-@if gdb
-maybe-check-gdb: check-gdb
+.PHONY: check-gotools maybe-check-gotools
+maybe-check-gotools:
+@if gotools
+maybe-check-gotools: check-gotools
 
-check-gdb:
+check-gotools:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif gotools
+
+.PHONY: install-gotools maybe-install-gotools
+maybe-install-gotools:
+@if gotools
+maybe-install-gotools: install-gotools
+
+install-gotools: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gdb && \
-         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif gdb
+@endif gotools
 
-.PHONY: install-gdb maybe-install-gdb
-maybe-install-gdb:
-@if gdb
-maybe-install-gdb: install-gdb
+.PHONY: install-strip-gotools maybe-install-strip-gotools
+maybe-install-strip-gotools:
+@if gotools
+maybe-install-strip-gotools: install-strip-gotools
 
-install-gdb: installdirs
+install-strip-gotools: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gdb && \
-         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/gotools && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif gdb
+@endif gotools
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-gdb info-gdb
-maybe-info-gdb:
-@if gdb
-maybe-info-gdb: info-gdb
+.PHONY: maybe-info-gotools info-gotools
+maybe-info-gotools:
+@if gotools
+maybe-info-gotools: info-gotools
 
-info-gdb: \
-    configure-gdb 
+info-gotools: \
+    configure-gotools 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -37907,25 +33933,25 @@ info-gdb: \
                  info) \
          || exit 1
 
-@endif gdb
+@endif gotools
 
-.PHONY: maybe-dvi-gdb dvi-gdb
-maybe-dvi-gdb:
-@if gdb
-maybe-dvi-gdb: dvi-gdb
+.PHONY: maybe-dvi-gotools dvi-gotools
+maybe-dvi-gotools:
+@if gotools
+maybe-dvi-gotools: dvi-gotools
 
-dvi-gdb: \
-    configure-gdb 
+dvi-gotools: \
+    configure-gotools 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -37933,25 +33959,25 @@ dvi-gdb: \
                  dvi) \
          || exit 1
 
-@endif gdb
+@endif gotools
 
-.PHONY: maybe-pdf-gdb pdf-gdb
-maybe-pdf-gdb:
-@if gdb
-maybe-pdf-gdb: pdf-gdb
+.PHONY: maybe-pdf-gotools pdf-gotools
+maybe-pdf-gotools:
+@if gotools
+maybe-pdf-gotools: pdf-gotools
 
-pdf-gdb: \
-    configure-gdb 
+pdf-gotools: \
+    configure-gotools 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -37959,25 +33985,25 @@ pdf-gdb: \
                  pdf) \
          || exit 1
 
-@endif gdb
+@endif gotools
 
-.PHONY: maybe-html-gdb html-gdb
-maybe-html-gdb:
-@if gdb
-maybe-html-gdb: html-gdb
+.PHONY: maybe-html-gotools html-gotools
+maybe-html-gotools:
+@if gotools
+maybe-html-gotools: html-gotools
 
-html-gdb: \
-    configure-gdb 
+html-gotools: \
+    configure-gotools 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -37985,25 +34011,25 @@ html-gdb: \
                  html) \
          || exit 1
 
-@endif gdb
+@endif gotools
 
-.PHONY: maybe-TAGS-gdb TAGS-gdb
-maybe-TAGS-gdb:
-@if gdb
-maybe-TAGS-gdb: TAGS-gdb
+.PHONY: maybe-TAGS-gotools TAGS-gotools
+maybe-TAGS-gotools:
+@if gotools
+maybe-TAGS-gotools: TAGS-gotools
 
-TAGS-gdb: \
-    configure-gdb 
+TAGS-gotools: \
+    configure-gotools 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -38011,26 +34037,26 @@ TAGS-gdb: \
                  TAGS) \
          || exit 1
 
-@endif gdb
+@endif gotools
 
-.PHONY: maybe-install-info-gdb install-info-gdb
-maybe-install-info-gdb:
-@if gdb
-maybe-install-info-gdb: install-info-gdb
+.PHONY: maybe-install-info-gotools install-info-gotools
+maybe-install-info-gotools:
+@if gotools
+maybe-install-info-gotools: install-info-gotools
 
-install-info-gdb: \
-    configure-gdb \
-    info-gdb 
+install-info-gotools: \
+    configure-gotools \
+    info-gotools 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -38038,26 +34064,26 @@ install-info-gdb: \
                  install-info) \
          || exit 1
 
-@endif gdb
+@endif gotools
 
-.PHONY: maybe-install-pdf-gdb install-pdf-gdb
-maybe-install-pdf-gdb:
-@if gdb
-maybe-install-pdf-gdb: install-pdf-gdb
+.PHONY: maybe-install-pdf-gotools install-pdf-gotools
+maybe-install-pdf-gotools:
+@if gotools
+maybe-install-pdf-gotools: install-pdf-gotools
 
-install-pdf-gdb: \
-    configure-gdb \
-    pdf-gdb 
+install-pdf-gotools: \
+    configure-gotools \
+    pdf-gotools 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -38065,26 +34091,26 @@ install-pdf-gdb: \
                  install-pdf) \
          || exit 1
 
-@endif gdb
+@endif gotools
 
-.PHONY: maybe-install-html-gdb install-html-gdb
-maybe-install-html-gdb:
-@if gdb
-maybe-install-html-gdb: install-html-gdb
+.PHONY: maybe-install-html-gotools install-html-gotools
+maybe-install-html-gotools:
+@if gotools
+maybe-install-html-gotools: install-html-gotools
 
-install-html-gdb: \
-    configure-gdb \
-    html-gdb 
+install-html-gotools: \
+    configure-gotools \
+    html-gotools 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -38092,25 +34118,25 @@ install-html-gdb: \
                  install-html) \
          || exit 1
 
-@endif gdb
+@endif gotools
 
-.PHONY: maybe-installcheck-gdb installcheck-gdb
-maybe-installcheck-gdb:
-@if gdb
-maybe-installcheck-gdb: installcheck-gdb
+.PHONY: maybe-installcheck-gotools installcheck-gotools
+maybe-installcheck-gotools:
+@if gotools
+maybe-installcheck-gotools: installcheck-gotools
 
-installcheck-gdb: \
-    configure-gdb 
+installcheck-gotools: \
+    configure-gotools 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -38118,24 +34144,24 @@ installcheck-gdb: \
                  installcheck) \
          || exit 1
 
-@endif gdb
+@endif gotools
 
-.PHONY: maybe-mostlyclean-gdb mostlyclean-gdb
-maybe-mostlyclean-gdb:
-@if gdb
-maybe-mostlyclean-gdb: mostlyclean-gdb
+.PHONY: maybe-mostlyclean-gotools mostlyclean-gotools
+maybe-mostlyclean-gotools:
+@if gotools
+maybe-mostlyclean-gotools: mostlyclean-gotools
 
-mostlyclean-gdb: 
+mostlyclean-gotools: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -38143,24 +34169,24 @@ mostlyclean-gdb:
                  mostlyclean) \
          || exit 1
 
-@endif gdb
+@endif gotools
 
-.PHONY: maybe-clean-gdb clean-gdb
-maybe-clean-gdb:
-@if gdb
-maybe-clean-gdb: clean-gdb
+.PHONY: maybe-clean-gotools clean-gotools
+maybe-clean-gotools:
+@if gotools
+maybe-clean-gotools: clean-gotools
 
-clean-gdb: 
+clean-gotools: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -38168,24 +34194,24 @@ clean-gdb:
                  clean) \
          || exit 1
 
-@endif gdb
+@endif gotools
 
-.PHONY: maybe-distclean-gdb distclean-gdb
-maybe-distclean-gdb:
-@if gdb
-maybe-distclean-gdb: distclean-gdb
+.PHONY: maybe-distclean-gotools distclean-gotools
+maybe-distclean-gotools:
+@if gotools
+maybe-distclean-gotools: distclean-gotools
 
-distclean-gdb: 
+distclean-gotools: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -38193,24 +34219,24 @@ distclean-gdb:
                  distclean) \
          || exit 1
 
-@endif gdb
+@endif gotools
 
-.PHONY: maybe-maintainer-clean-gdb maintainer-clean-gdb
-maybe-maintainer-clean-gdb:
-@if gdb
-maybe-maintainer-clean-gdb: maintainer-clean-gdb
+.PHONY: maybe-maintainer-clean-gotools maintainer-clean-gotools
+maybe-maintainer-clean-gotools:
+@if gotools
+maybe-maintainer-clean-gotools: maintainer-clean-gotools
 
-maintainer-clean-gdb: 
+maintainer-clean-gotools: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gdb/Makefile ] || exit 0; \
+       @[ -f ./gotools/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
+       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}" \
@@ -38218,113 +34244,574 @@ maintainer-clean-gdb:
                  maintainer-clean) \
          || exit 1
 
-@endif gdb
+@endif gotools
 
 
 
-.PHONY: configure-expect maybe-configure-expect
-maybe-configure-expect:
+.PHONY: configure-libctf maybe-configure-libctf
+maybe-configure-libctf:
 @if gcc-bootstrap
-configure-expect: stage_current
+configure-libctf: stage_current
 @endif gcc-bootstrap
-@if expect
-maybe-configure-expect: configure-expect
-configure-expect: 
-       @: $(MAKE); $(unstage)
+@if libctf
+maybe-configure-libctf: configure-libctf
+configure-libctf: 
        @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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/expect; \
-       cd "$(HOST_SUBDIR)/expect" || exit 1; \
+       test ! -f $(HOST_SUBDIR)/libctf/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf; \
+       $(HOST_EXPORTS)  \
+       echo Configuring in $(HOST_SUBDIR)/libctf; \
+       cd "$(HOST_SUBDIR)/libctf" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/expect/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libctf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/expect"; \
-       libsrcdir="$$s/expect"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libctf; \
+       $(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
+@endif libctf
 
 
 
+.PHONY: configure-stage1-libctf maybe-configure-stage1-libctf
+maybe-configure-stage1-libctf:
+@if libctf-bootstrap
+maybe-configure-stage1-libctf: configure-stage1-libctf
+configure-stage1-libctf:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libctf/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)/libctf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf; \
+       cd $(HOST_SUBDIR)/libctf || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libctf/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libctf; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif libctf-bootstrap
+
+.PHONY: configure-stage2-libctf maybe-configure-stage2-libctf
+maybe-configure-stage2-libctf:
+@if libctf-bootstrap
+maybe-configure-stage2-libctf: configure-stage2-libctf
+configure-stage2-libctf:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libctf/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)/libctf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf; \
+       cd $(HOST_SUBDIR)/libctf || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libctf/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libctf; \
+       $(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 libctf-bootstrap
+
+.PHONY: configure-stage3-libctf maybe-configure-stage3-libctf
+maybe-configure-stage3-libctf:
+@if libctf-bootstrap
+maybe-configure-stage3-libctf: configure-stage3-libctf
+configure-stage3-libctf:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libctf/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)/libctf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf; \
+       cd $(HOST_SUBDIR)/libctf || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libctf/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libctf; \
+       $(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 libctf-bootstrap
+
+.PHONY: configure-stage4-libctf maybe-configure-stage4-libctf
+maybe-configure-stage4-libctf:
+@if libctf-bootstrap
+maybe-configure-stage4-libctf: configure-stage4-libctf
+configure-stage4-libctf:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libctf/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)/libctf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf; \
+       cd $(HOST_SUBDIR)/libctf || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libctf/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libctf; \
+       $(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 libctf-bootstrap
+
+.PHONY: configure-stageprofile-libctf maybe-configure-stageprofile-libctf
+maybe-configure-stageprofile-libctf:
+@if libctf-bootstrap
+maybe-configure-stageprofile-libctf: configure-stageprofile-libctf
+configure-stageprofile-libctf:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libctf/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)/libctf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf; \
+       cd $(HOST_SUBDIR)/libctf || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libctf/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libctf; \
+       $(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 libctf-bootstrap
+
+.PHONY: configure-stagefeedback-libctf maybe-configure-stagefeedback-libctf
+maybe-configure-stagefeedback-libctf:
+@if libctf-bootstrap
+maybe-configure-stagefeedback-libctf: configure-stagefeedback-libctf
+configure-stagefeedback-libctf:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/libctf/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)/libctf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf; \
+       cd $(HOST_SUBDIR)/libctf || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/libctf/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libctf; \
+       $(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 libctf-bootstrap
 
 
-.PHONY: all-expect maybe-all-expect
-maybe-all-expect:
+
+
+
+.PHONY: all-libctf maybe-all-libctf
+maybe-all-libctf:
 @if gcc-bootstrap
-all-expect: stage_current
+all-libctf: stage_current
 @endif gcc-bootstrap
-@if expect
-TARGET-expect=all
-maybe-all-expect: all-expect
-all-expect: configure-expect
-       @: $(MAKE); $(unstage)
+@if libctf
+TARGET-libctf=all
+maybe-all-libctf: all-libctf
+all-libctf: configure-libctf
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libctf && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+               $(TARGET-libctf))
+@endif libctf
+
+
+
+.PHONY: all-stage1-libctf maybe-all-stage1-libctf
+.PHONY: clean-stage1-libctf maybe-clean-stage1-libctf
+maybe-all-stage1-libctf:
+maybe-clean-stage1-libctf:
+@if libctf-bootstrap
+maybe-all-stage1-libctf: all-stage1-libctf
+all-stage1: all-stage1-libctf
+TARGET-stage1-libctf = $(TARGET-libctf)
+all-stage1-libctf: configure-stage1-libctf
+       @[ $(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)/libctf && \
+        \
+       $(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-libctf)
+
+maybe-clean-stage1-libctf: clean-stage1-libctf
+clean-stage1: clean-stage1-libctf
+clean-stage1-libctf:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/libctf/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-libctf/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libctf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+       $(STAGE1_FLAGS_TO_PASS)  clean
+@endif libctf-bootstrap
+
+
+.PHONY: all-stage2-libctf maybe-all-stage2-libctf
+.PHONY: clean-stage2-libctf maybe-clean-stage2-libctf
+maybe-all-stage2-libctf:
+maybe-clean-stage2-libctf:
+@if libctf-bootstrap
+maybe-all-stage2-libctf: all-stage2-libctf
+all-stage2: all-stage2-libctf
+TARGET-stage2-libctf = $(TARGET-libctf)
+all-stage2-libctf: configure-stage2-libctf
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/expect && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \
-               $(TARGET-expect))
-@endif expect
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libctf && \
+        \
+       $(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-libctf)
+
+maybe-clean-stage2-libctf: clean-stage2-libctf
+clean-stage2: clean-stage2-libctf
+clean-stage2-libctf:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/libctf/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-libctf/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libctf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libctf-bootstrap
+
+
+.PHONY: all-stage3-libctf maybe-all-stage3-libctf
+.PHONY: clean-stage3-libctf maybe-clean-stage3-libctf
+maybe-all-stage3-libctf:
+maybe-clean-stage3-libctf:
+@if libctf-bootstrap
+maybe-all-stage3-libctf: all-stage3-libctf
+all-stage3: all-stage3-libctf
+TARGET-stage3-libctf = $(TARGET-libctf)
+all-stage3-libctf: configure-stage3-libctf
+       @[ $(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)/libctf && \
+        \
+       $(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-libctf)
+
+maybe-clean-stage3-libctf: clean-stage3-libctf
+clean-stage3: clean-stage3-libctf
+clean-stage3-libctf:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/libctf/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-libctf/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libctf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libctf-bootstrap
+
+
+.PHONY: all-stage4-libctf maybe-all-stage4-libctf
+.PHONY: clean-stage4-libctf maybe-clean-stage4-libctf
+maybe-all-stage4-libctf:
+maybe-clean-stage4-libctf:
+@if libctf-bootstrap
+maybe-all-stage4-libctf: all-stage4-libctf
+all-stage4: all-stage4-libctf
+TARGET-stage4-libctf = $(TARGET-libctf)
+all-stage4-libctf: configure-stage4-libctf
+       @[ $(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)/libctf && \
+        \
+       $(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-libctf)
+
+maybe-clean-stage4-libctf: clean-stage4-libctf
+clean-stage4: clean-stage4-libctf
+clean-stage4-libctf:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/libctf/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-libctf/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libctf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libctf-bootstrap
+
+
+.PHONY: all-stageprofile-libctf maybe-all-stageprofile-libctf
+.PHONY: clean-stageprofile-libctf maybe-clean-stageprofile-libctf
+maybe-all-stageprofile-libctf:
+maybe-clean-stageprofile-libctf:
+@if libctf-bootstrap
+maybe-all-stageprofile-libctf: all-stageprofile-libctf
+all-stageprofile: all-stageprofile-libctf
+TARGET-stageprofile-libctf = $(TARGET-libctf)
+all-stageprofile-libctf: configure-stageprofile-libctf
+       @[ $(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)/libctf && \
+        \
+       $(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-libctf)
+
+maybe-clean-stageprofile-libctf: clean-stageprofile-libctf
+clean-stageprofile: clean-stageprofile-libctf
+clean-stageprofile-libctf:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/libctf/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-libctf/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libctf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libctf-bootstrap
+
+
+.PHONY: all-stagefeedback-libctf maybe-all-stagefeedback-libctf
+.PHONY: clean-stagefeedback-libctf maybe-clean-stagefeedback-libctf
+maybe-all-stagefeedback-libctf:
+maybe-clean-stagefeedback-libctf:
+@if libctf-bootstrap
+maybe-all-stagefeedback-libctf: all-stagefeedback-libctf
+all-stagefeedback: all-stagefeedback-libctf
+TARGET-stagefeedback-libctf = $(TARGET-libctf)
+all-stagefeedback-libctf: configure-stagefeedback-libctf
+       @[ $(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)/libctf && \
+        \
+       $(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-libctf)
+
+maybe-clean-stagefeedback-libctf: clean-stagefeedback-libctf
+clean-stagefeedback: clean-stagefeedback-libctf
+clean-stagefeedback-libctf:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/libctf/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-libctf/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/libctf && \
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+@endif libctf-bootstrap
 
 
 
 
-.PHONY: check-expect maybe-check-expect
-maybe-check-expect:
-@if expect
-maybe-check-expect: check-expect
 
-check-expect:
+.PHONY: check-libctf maybe-check-libctf
+maybe-check-libctf:
+@if libctf
+maybe-check-libctf: check-libctf
+
+check-libctf:
+
+@endif libctf
+
+.PHONY: install-libctf maybe-install-libctf
+maybe-install-libctf:
+@if libctf
+maybe-install-libctf: install-libctf
+
+install-libctf: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/expect && \
-         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       (cd $(HOST_SUBDIR)/libctf && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif expect
+@endif libctf
 
-.PHONY: install-expect maybe-install-expect
-maybe-install-expect:
-@if expect
-maybe-install-expect: install-expect
+.PHONY: install-strip-libctf maybe-install-strip-libctf
+maybe-install-strip-libctf:
+@if libctf
+maybe-install-strip-libctf: install-strip-libctf
 
-install-expect: installdirs
+install-strip-libctf: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/expect && \
-         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       (cd $(HOST_SUBDIR)/libctf && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif expect
+@endif libctf
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-expect info-expect
-maybe-info-expect:
-@if expect
-maybe-info-expect: info-expect
+.PHONY: maybe-info-libctf info-libctf
+maybe-info-libctf:
+@if libctf
+maybe-info-libctf: info-libctf
 
-info-expect: \
-    configure-expect 
-       @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+info-libctf: \
+    configure-libctf 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing info in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -38332,51 +34819,49 @@ info-expect: \
                  info) \
          || exit 1
 
-@endif expect
+@endif libctf
 
-.PHONY: maybe-dvi-expect dvi-expect
-maybe-dvi-expect:
-@if expect
-maybe-dvi-expect: dvi-expect
+.PHONY: maybe-dvi-libctf dvi-libctf
+maybe-dvi-libctf:
+@if libctf
+maybe-dvi-libctf: dvi-libctf
 
-dvi-expect: \
-    configure-expect 
-       @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+dvi-libctf: \
+    configure-libctf 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing dvi in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(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 expect
-
-.PHONY: maybe-pdf-expect pdf-expect
-maybe-pdf-expect:
-@if expect
-maybe-pdf-expect: pdf-expect
+         || exit 1
 
-pdf-expect: \
-    configure-expect 
-       @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+@endif libctf
+
+.PHONY: maybe-pdf-libctf pdf-libctf
+maybe-pdf-libctf:
+@if libctf
+maybe-pdf-libctf: pdf-libctf
+
+pdf-libctf: \
+    configure-libctf 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing pdf in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -38384,25 +34869,24 @@ pdf-expect: \
                  pdf) \
          || exit 1
 
-@endif expect
+@endif libctf
 
-.PHONY: maybe-html-expect html-expect
-maybe-html-expect:
-@if expect
-maybe-html-expect: html-expect
+.PHONY: maybe-html-libctf html-libctf
+maybe-html-libctf:
+@if libctf
+maybe-html-libctf: html-libctf
 
-html-expect: \
-    configure-expect 
-       @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+html-libctf: \
+    configure-libctf 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing html in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -38410,25 +34894,24 @@ html-expect: \
                  html) \
          || exit 1
 
-@endif expect
+@endif libctf
 
-.PHONY: maybe-TAGS-expect TAGS-expect
-maybe-TAGS-expect:
-@if expect
-maybe-TAGS-expect: TAGS-expect
+.PHONY: maybe-TAGS-libctf TAGS-libctf
+maybe-TAGS-libctf:
+@if libctf
+maybe-TAGS-libctf: TAGS-libctf
 
-TAGS-expect: \
-    configure-expect 
-       @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+TAGS-libctf: \
+    configure-libctf 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing TAGS in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -38436,26 +34919,25 @@ TAGS-expect: \
                  TAGS) \
          || exit 1
 
-@endif expect
+@endif libctf
 
-.PHONY: maybe-install-info-expect install-info-expect
-maybe-install-info-expect:
-@if expect
-maybe-install-info-expect: install-info-expect
+.PHONY: maybe-install-info-libctf install-info-libctf
+maybe-install-info-libctf:
+@if libctf
+maybe-install-info-libctf: install-info-libctf
 
-install-info-expect: \
-    configure-expect \
-    info-expect 
-       @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+install-info-libctf: \
+    configure-libctf \
+    info-libctf 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing install-info in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -38463,26 +34945,25 @@ install-info-expect: \
                  install-info) \
          || exit 1
 
-@endif expect
+@endif libctf
 
-.PHONY: maybe-install-pdf-expect install-pdf-expect
-maybe-install-pdf-expect:
-@if expect
-maybe-install-pdf-expect: install-pdf-expect
+.PHONY: maybe-install-pdf-libctf install-pdf-libctf
+maybe-install-pdf-libctf:
+@if libctf
+maybe-install-pdf-libctf: install-pdf-libctf
 
-install-pdf-expect: \
-    configure-expect \
-    pdf-expect 
-       @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+install-pdf-libctf: \
+    configure-libctf \
+    pdf-libctf 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing install-pdf in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -38490,26 +34971,25 @@ install-pdf-expect: \
                  install-pdf) \
          || exit 1
 
-@endif expect
+@endif libctf
 
-.PHONY: maybe-install-html-expect install-html-expect
-maybe-install-html-expect:
-@if expect
-maybe-install-html-expect: install-html-expect
+.PHONY: maybe-install-html-libctf install-html-libctf
+maybe-install-html-libctf:
+@if libctf
+maybe-install-html-libctf: install-html-libctf
 
-install-html-expect: \
-    configure-expect \
-    html-expect 
-       @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+install-html-libctf: \
+    configure-libctf \
+    html-libctf 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing install-html in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -38517,25 +34997,24 @@ install-html-expect: \
                  install-html) \
          || exit 1
 
-@endif expect
+@endif libctf
 
-.PHONY: maybe-installcheck-expect installcheck-expect
-maybe-installcheck-expect:
-@if expect
-maybe-installcheck-expect: installcheck-expect
+.PHONY: maybe-installcheck-libctf installcheck-libctf
+maybe-installcheck-libctf:
+@if libctf
+maybe-installcheck-libctf: installcheck-libctf
 
-installcheck-expect: \
-    configure-expect 
-       @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+installcheck-libctf: \
+    configure-libctf 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing installcheck in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -38543,24 +35022,23 @@ installcheck-expect: \
                  installcheck) \
          || exit 1
 
-@endif expect
+@endif libctf
 
-.PHONY: maybe-mostlyclean-expect mostlyclean-expect
-maybe-mostlyclean-expect:
-@if expect
-maybe-mostlyclean-expect: mostlyclean-expect
+.PHONY: maybe-mostlyclean-libctf mostlyclean-libctf
+maybe-mostlyclean-libctf:
+@if libctf
+maybe-mostlyclean-libctf: mostlyclean-libctf
 
-mostlyclean-expect: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+mostlyclean-libctf: 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing mostlyclean in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -38568,24 +35046,23 @@ mostlyclean-expect:
                  mostlyclean) \
          || exit 1
 
-@endif expect
+@endif libctf
 
-.PHONY: maybe-clean-expect clean-expect
-maybe-clean-expect:
-@if expect
-maybe-clean-expect: clean-expect
+.PHONY: maybe-clean-libctf clean-libctf
+maybe-clean-libctf:
+@if libctf
+maybe-clean-libctf: clean-libctf
 
-clean-expect: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+clean-libctf: 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing clean in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -38593,24 +35070,23 @@ clean-expect:
                  clean) \
          || exit 1
 
-@endif expect
+@endif libctf
 
-.PHONY: maybe-distclean-expect distclean-expect
-maybe-distclean-expect:
-@if expect
-maybe-distclean-expect: distclean-expect
+.PHONY: maybe-distclean-libctf distclean-libctf
+maybe-distclean-libctf:
+@if libctf
+maybe-distclean-libctf: distclean-libctf
 
-distclean-expect: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+distclean-libctf: 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing distclean in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -38618,24 +35094,23 @@ distclean-expect:
                  distclean) \
          || exit 1
 
-@endif expect
+@endif libctf
 
-.PHONY: maybe-maintainer-clean-expect maintainer-clean-expect
-maybe-maintainer-clean-expect:
-@if expect
-maybe-maintainer-clean-expect: maintainer-clean-expect
+.PHONY: maybe-maintainer-clean-libctf maintainer-clean-libctf
+maybe-maintainer-clean-libctf:
+@if libctf
+maybe-maintainer-clean-libctf: maintainer-clean-libctf
 
-maintainer-clean-expect: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./expect/Makefile ] || exit 0; \
+maintainer-clean-libctf: 
+       @[ -f ./libctf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
+       echo "Doing maintainer-clean in libctf"; \
+       (cd $(HOST_SUBDIR)/libctf && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -38643,2188 +35118,4079 @@ maintainer-clean-expect:
                  maintainer-clean) \
          || exit 1
 
-@endif expect
+@endif libctf
 
 
 
-.PHONY: configure-guile maybe-configure-guile
-maybe-configure-guile:
+# ---------------------------------------
+# Modules which run on the target machine
+# ---------------------------------------
+
+
+
+
+.PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3
+maybe-configure-target-libstdc++-v3:
 @if gcc-bootstrap
-configure-guile: stage_current
+configure-target-libstdc++-v3: stage_current
 @endif gcc-bootstrap
-@if guile
-maybe-configure-guile: configure-guile
-configure-guile: 
-       @: $(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; \
-       test ! -f $(HOST_SUBDIR)/guile/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/guile ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/guile; \
-       cd "$(HOST_SUBDIR)/guile" || exit 1; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(RAW_CXX_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/guile/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/guile"; \
-       libsrcdir="$$s/guile"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+       module_srcdir=libstdc++-v3; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias}  \
          || exit 1
-@endif guile
+@endif target-libstdc++-v3
+
+
+
+.PHONY: configure-stage1-target-libstdc++-v3 maybe-configure-stage1-target-libstdc++-v3
+maybe-configure-stage1-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3
+configure-stage1-target-libstdc++-v3:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 1 in $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libstdc++-v3; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-bootstrap
+
+.PHONY: configure-stage2-target-libstdc++-v3 maybe-configure-stage2-target-libstdc++-v3
+maybe-configure-stage2-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stage2-target-libstdc++-v3: configure-stage2-target-libstdc++-v3
+configure-stage2-target-libstdc++-v3:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 2 in $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libstdc++-v3; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-bootstrap
+
+.PHONY: configure-stage3-target-libstdc++-v3 maybe-configure-stage3-target-libstdc++-v3
+maybe-configure-stage3-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stage3-target-libstdc++-v3: configure-stage3-target-libstdc++-v3
+configure-stage3-target-libstdc++-v3:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 3 in $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libstdc++-v3; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-bootstrap
+
+.PHONY: configure-stage4-target-libstdc++-v3 maybe-configure-stage4-target-libstdc++-v3
+maybe-configure-stage4-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stage4-target-libstdc++-v3: configure-stage4-target-libstdc++-v3
+configure-stage4-target-libstdc++-v3:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 4 in $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libstdc++-v3; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-bootstrap
+
+.PHONY: configure-stageprofile-target-libstdc++-v3 maybe-configure-stageprofile-target-libstdc++-v3
+maybe-configure-stageprofile-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stageprofile-target-libstdc++-v3: configure-stageprofile-target-libstdc++-v3
+configure-stageprofile-target-libstdc++-v3:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage profile in $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libstdc++-v3; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-bootstrap
+
+.PHONY: configure-stagefeedback-target-libstdc++-v3 maybe-configure-stagefeedback-target-libstdc++-v3
+maybe-configure-stagefeedback-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stagefeedback-target-libstdc++-v3: configure-stagefeedback-target-libstdc++-v3
+configure-stagefeedback-target-libstdc++-v3:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libstdc++-v3; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-bootstrap
 
 
 
 
 
-.PHONY: all-guile maybe-all-guile
-maybe-all-guile:
+.PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3
+maybe-all-target-libstdc++-v3:
 @if gcc-bootstrap
-all-guile: stage_current
+all-target-libstdc++-v3: stage_current
 @endif gcc-bootstrap
-@if guile
-TARGET-guile=all
-maybe-all-guile: all-guile
-all-guile: configure-guile
-       @: $(MAKE); $(unstage)
+@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; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/guile && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \
-               $(TARGET-guile))
-@endif guile
+       $(RAW_CXX_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               $(TARGET-target-libstdc++-v3))
+@endif target-libstdc++-v3
 
 
 
+.PHONY: all-stage1-target-libstdc++-v3 maybe-all-stage1-target-libstdc++-v3
+.PHONY: clean-stage1-target-libstdc++-v3 maybe-clean-stage1-target-libstdc++-v3
+maybe-all-stage1-target-libstdc++-v3:
+maybe-clean-stage1-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stage1-target-libstdc++-v3: all-stage1-target-libstdc++-v3
+all-stage1: all-stage1-target-libstdc++-v3
+TARGET-stage1-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS)  \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
+                 \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
+               $(TARGET-stage1-target-libstdc++-v3)
 
-.PHONY: check-guile maybe-check-guile
-maybe-check-guile:
-@if guile
-maybe-check-guile: check-guile
+maybe-clean-stage1-target-libstdc++-v3: clean-stage1-target-libstdc++-v3
+clean-stage1: clean-stage1-target-libstdc++-v3
+clean-stage1-target-libstdc++-v3:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage1-libstdc++-v3/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
+         clean
+@endif target-libstdc++-v3-bootstrap
+
+
+.PHONY: all-stage2-target-libstdc++-v3 maybe-all-stage2-target-libstdc++-v3
+.PHONY: clean-stage2-target-libstdc++-v3 maybe-clean-stage2-target-libstdc++-v3
+maybe-all-stage2-target-libstdc++-v3:
+maybe-clean-stage2-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stage2-target-libstdc++-v3: all-stage2-target-libstdc++-v3
+all-stage2: all-stage2-target-libstdc++-v3
+TARGET-stage2-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stage2-target-libstdc++-v3: configure-stage2-target-libstdc++-v3
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
+               $(TARGET-stage2-target-libstdc++-v3)
+
+maybe-clean-stage2-target-libstdc++-v3: clean-stage2-target-libstdc++-v3
+clean-stage2: clean-stage2-target-libstdc++-v3
+clean-stage2-target-libstdc++-v3:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage2-libstdc++-v3/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libstdc++-v3-bootstrap
+
+
+.PHONY: all-stage3-target-libstdc++-v3 maybe-all-stage3-target-libstdc++-v3
+.PHONY: clean-stage3-target-libstdc++-v3 maybe-clean-stage3-target-libstdc++-v3
+maybe-all-stage3-target-libstdc++-v3:
+maybe-clean-stage3-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stage3-target-libstdc++-v3: all-stage3-target-libstdc++-v3
+all-stage3: all-stage3-target-libstdc++-v3
+TARGET-stage3-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stage3-target-libstdc++-v3: configure-stage3-target-libstdc++-v3
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
+               $(TARGET-stage3-target-libstdc++-v3)
+
+maybe-clean-stage3-target-libstdc++-v3: clean-stage3-target-libstdc++-v3
+clean-stage3: clean-stage3-target-libstdc++-v3
+clean-stage3-target-libstdc++-v3:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage3-libstdc++-v3/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libstdc++-v3-bootstrap
+
+
+.PHONY: all-stage4-target-libstdc++-v3 maybe-all-stage4-target-libstdc++-v3
+.PHONY: clean-stage4-target-libstdc++-v3 maybe-clean-stage4-target-libstdc++-v3
+maybe-all-stage4-target-libstdc++-v3:
+maybe-clean-stage4-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stage4-target-libstdc++-v3: all-stage4-target-libstdc++-v3
+all-stage4: all-stage4-target-libstdc++-v3
+TARGET-stage4-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stage4-target-libstdc++-v3: configure-stage4-target-libstdc++-v3
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
+               $(TARGET-stage4-target-libstdc++-v3)
+
+maybe-clean-stage4-target-libstdc++-v3: clean-stage4-target-libstdc++-v3
+clean-stage4: clean-stage4-target-libstdc++-v3
+clean-stage4-target-libstdc++-v3:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage4-libstdc++-v3/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libstdc++-v3-bootstrap
+
+
+.PHONY: all-stageprofile-target-libstdc++-v3 maybe-all-stageprofile-target-libstdc++-v3
+.PHONY: clean-stageprofile-target-libstdc++-v3 maybe-clean-stageprofile-target-libstdc++-v3
+maybe-all-stageprofile-target-libstdc++-v3:
+maybe-clean-stageprofile-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stageprofile-target-libstdc++-v3: all-stageprofile-target-libstdc++-v3
+all-stageprofile: all-stageprofile-target-libstdc++-v3
+TARGET-stageprofile-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stageprofile-target-libstdc++-v3: configure-stageprofile-target-libstdc++-v3
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
+               $(TARGET-stageprofile-target-libstdc++-v3)
+
+maybe-clean-stageprofile-target-libstdc++-v3: clean-stageprofile-target-libstdc++-v3
+clean-stageprofile: clean-stageprofile-target-libstdc++-v3
+clean-stageprofile-target-libstdc++-v3:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stageprofile-libstdc++-v3/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libstdc++-v3-bootstrap
+
+
+.PHONY: all-stagefeedback-target-libstdc++-v3 maybe-all-stagefeedback-target-libstdc++-v3
+.PHONY: clean-stagefeedback-target-libstdc++-v3 maybe-clean-stagefeedback-target-libstdc++-v3
+maybe-all-stagefeedback-target-libstdc++-v3:
+maybe-clean-stagefeedback-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-all-stagefeedback-target-libstdc++-v3: all-stagefeedback-target-libstdc++-v3
+all-stagefeedback: all-stagefeedback-target-libstdc++-v3
+TARGET-stagefeedback-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
+all-stagefeedback-target-libstdc++-v3: configure-stagefeedback-target-libstdc++-v3
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
+               $(TARGET-stagefeedback-target-libstdc++-v3)
+
+maybe-clean-stagefeedback-target-libstdc++-v3: clean-stagefeedback-target-libstdc++-v3
+clean-stagefeedback: clean-stagefeedback-target-libstdc++-v3
+clean-stagefeedback-target-libstdc++-v3:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stagefeedback-libstdc++-v3/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
+@endif target-libstdc++-v3-bootstrap
 
-check-guile:
+
+
+
+
+
+.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; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/guile && \
-         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
 
-@endif guile
+@endif target-libstdc++-v3
 
-.PHONY: install-guile maybe-install-guile
-maybe-install-guile:
-@if guile
-maybe-install-guile: install-guile
+.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-guile: installdirs
+install-target-libstdc++-v3: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/guile && \
-         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif guile
+@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-guile info-guile
-maybe-info-guile:
-@if guile
-maybe-info-guile: info-guile
+.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-guile: \
-    configure-guile 
+info-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing info in $(TARGET_SUBDIR)/libstdc++-v3"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 info) \
+                  info) \
          || exit 1
 
-@endif guile
+@endif target-libstdc++-v3
 
-.PHONY: maybe-dvi-guile dvi-guile
-maybe-dvi-guile:
-@if guile
-maybe-dvi-guile: dvi-guile
+.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-guile: \
-    configure-guile 
+dvi-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libstdc++-v3"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 dvi) \
+                  dvi) \
          || exit 1
 
-@endif guile
+@endif target-libstdc++-v3
 
-.PHONY: maybe-pdf-guile pdf-guile
-maybe-pdf-guile:
-@if guile
-maybe-pdf-guile: pdf-guile
+.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-guile: \
-    configure-guile 
+pdf-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libstdc++-v3"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 pdf) \
+                  pdf) \
          || exit 1
 
-@endif guile
+@endif target-libstdc++-v3
 
-.PHONY: maybe-html-guile html-guile
-maybe-html-guile:
-@if guile
-maybe-html-guile: html-guile
+.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-guile: \
-    configure-guile 
+html-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libstdc++-v3"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 html) \
+                  html) \
          || exit 1
 
-@endif guile
+@endif target-libstdc++-v3
 
-.PHONY: maybe-TAGS-guile TAGS-guile
-maybe-TAGS-guile:
-@if guile
-maybe-TAGS-guile: TAGS-guile
+.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-guile: \
-    configure-guile 
+TAGS-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libstdc++-v3"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 TAGS) \
+                  TAGS) \
          || exit 1
 
-@endif guile
+@endif target-libstdc++-v3
 
-.PHONY: maybe-install-info-guile install-info-guile
-maybe-install-info-guile:
-@if guile
-maybe-install-info-guile: install-info-guile
+.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-guile: \
-    configure-guile \
-    info-guile 
+install-info-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 \
+    info-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libstdc++-v3"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-info) \
+                  install-info) \
          || exit 1
 
-@endif guile
+@endif target-libstdc++-v3
 
-.PHONY: maybe-install-pdf-guile install-pdf-guile
-maybe-install-pdf-guile:
-@if guile
-maybe-install-pdf-guile: install-pdf-guile
+.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-guile: \
-    configure-guile \
-    pdf-guile 
+install-pdf-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 \
+    pdf-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libstdc++-v3"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-pdf) \
+                  install-pdf) \
          || exit 1
 
-@endif guile
+@endif target-libstdc++-v3
 
-.PHONY: maybe-install-html-guile install-html-guile
-maybe-install-html-guile:
-@if guile
-maybe-install-html-guile: install-html-guile
+.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-guile: \
-    configure-guile \
-    html-guile 
+install-html-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 \
+    html-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libstdc++-v3"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-html) \
+                  install-html) \
          || exit 1
 
-@endif guile
+@endif target-libstdc++-v3
 
-.PHONY: maybe-installcheck-guile installcheck-guile
-maybe-installcheck-guile:
-@if guile
-maybe-installcheck-guile: installcheck-guile
+.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-guile: \
-    configure-guile 
+installcheck-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libstdc++-v3"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 installcheck) \
+                  installcheck) \
          || exit 1
 
-@endif guile
+@endif target-libstdc++-v3
 
-.PHONY: maybe-mostlyclean-guile mostlyclean-guile
-maybe-mostlyclean-guile:
-@if guile
-maybe-mostlyclean-guile: mostlyclean-guile
+.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-guile: 
+mostlyclean-target-libstdc++-v3: 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libstdc++-v3"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 mostlyclean) \
+                  mostlyclean) \
          || exit 1
 
-@endif guile
+@endif target-libstdc++-v3
 
-.PHONY: maybe-clean-guile clean-guile
-maybe-clean-guile:
-@if guile
-maybe-clean-guile: clean-guile
+.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-guile: 
+clean-target-libstdc++-v3: 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing clean in $(TARGET_SUBDIR)/libstdc++-v3"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 clean) \
+                  clean) \
          || exit 1
 
-@endif guile
+@endif target-libstdc++-v3
 
-.PHONY: maybe-distclean-guile distclean-guile
-maybe-distclean-guile:
-@if guile
-maybe-distclean-guile: distclean-guile
+.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-guile: 
+distclean-target-libstdc++-v3: 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libstdc++-v3"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 distclean) \
+                  distclean) \
          || exit 1
 
-@endif guile
+@endif target-libstdc++-v3
 
-.PHONY: maybe-maintainer-clean-guile maintainer-clean-guile
-maybe-maintainer-clean-guile:
-@if guile
-maybe-maintainer-clean-guile: maintainer-clean-guile
+.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-guile: 
+maintainer-clean-target-libstdc++-v3: 
        @: $(MAKE); $(unstage)
-       @[ -f ./guile/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libstdc++-v3"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
+       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 maintainer-clean) \
+                  maintainer-clean) \
          || exit 1
 
-@endif guile
+@endif target-libstdc++-v3
 
 
 
-.PHONY: configure-tk maybe-configure-tk
-maybe-configure-tk:
+
+
+.PHONY: configure-target-libsanitizer maybe-configure-target-libsanitizer
+maybe-configure-target-libsanitizer:
 @if gcc-bootstrap
-configure-tk: stage_current
+configure-target-libsanitizer: stage_current
 @endif gcc-bootstrap
-@if tk
-maybe-configure-tk: configure-tk
-configure-tk: 
-       @: $(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; \
-       test ! -f $(HOST_SUBDIR)/tk/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tk ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/tk; \
-       cd "$(HOST_SUBDIR)/tk" || exit 1; \
+       echo "Checking multilib configuration for libsanitizer..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+           mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
+       $(RAW_CXX_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libsanitizer; \
+       cd "$(TARGET_SUBDIR)/libsanitizer" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/tk/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/tk"; \
-       libsrcdir="$$s/tk"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+       module_srcdir=libsanitizer; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias}  \
          || exit 1
-@endif tk
-
+@endif target-libsanitizer
 
 
 
-
-.PHONY: all-tk maybe-all-tk
-maybe-all-tk:
-@if gcc-bootstrap
-all-tk: stage_current
-@endif gcc-bootstrap
-@if tk
-TARGET-tk=all
-maybe-all-tk: all-tk
-all-tk: configure-tk
-       @: $(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; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/tk && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \
-               $(TARGET-tk))
-@endif tk
+       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: check-tk maybe-check-tk
-maybe-check-tk:
-@if tk
-maybe-check-tk: check-tk
 
-check-tk:
-       @: $(MAKE); $(unstage)
+.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; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/tk && \
-         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
+       $(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
 
-@endif tk
 
-.PHONY: install-tk maybe-install-tk
-maybe-install-tk:
-@if tk
-maybe-install-tk: install-tk
 
-install-tk: installdirs
-       @: $(MAKE); $(unstage)
+.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; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/tk && \
-         $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
-
-@endif tk
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-tk info-tk
-maybe-info-tk:
-@if tk
-maybe-info-tk: info-tk
+       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)
 
-info-tk: \
-    configure-tk 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+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; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 info) \
-         || exit 1
-
-@endif tk
-
-.PHONY: maybe-dvi-tk dvi-tk
-maybe-dvi-tk:
-@if tk
-maybe-dvi-tk: dvi-tk
-
-dvi-tk: \
-    configure-tk 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+       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; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 dvi) \
-         || exit 1
-
-@endif tk
-
-.PHONY: maybe-pdf-tk pdf-tk
-maybe-pdf-tk:
-@if tk
-maybe-pdf-tk: pdf-tk
-
-pdf-tk: \
-    configure-tk 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+       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; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 pdf) \
-         || exit 1
-
-@endif tk
-
-.PHONY: maybe-html-tk html-tk
-maybe-html-tk:
-@if tk
-maybe-html-tk: html-tk
-
-html-tk: \
-    configure-tk 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+       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; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 html) \
-         || exit 1
-
-@endif tk
-
-.PHONY: maybe-TAGS-tk TAGS-tk
-maybe-TAGS-tk:
-@if tk
-maybe-TAGS-tk: TAGS-tk
-
-TAGS-tk: \
-    configure-tk 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+       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; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 TAGS) \
-         || exit 1
+       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
 
-@endif tk
 
-.PHONY: maybe-install-info-tk install-info-tk
-maybe-install-info-tk:
-@if tk
-maybe-install-info-tk: install-info-tk
 
-install-info-tk: \
-    configure-tk \
-    info-tk 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-info) \
-         || exit 1
 
-@endif tk
 
-.PHONY: maybe-install-pdf-tk install-pdf-tk
-maybe-install-pdf-tk:
-@if tk
-maybe-install-pdf-tk: install-pdf-tk
 
-install-pdf-tk: \
-    configure-tk \
-    pdf-tk 
+.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)
-       @[ -f ./tk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-pdf) \
-         || exit 1
+       $(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 tk
+@endif target-libsanitizer
 
-.PHONY: maybe-install-html-tk install-html-tk
-maybe-install-html-tk:
-@if tk
-maybe-install-html-tk: install-html-tk
+.PHONY: install-target-libsanitizer maybe-install-target-libsanitizer
+maybe-install-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-target-libsanitizer: install-target-libsanitizer
 
-install-html-tk: \
-    configure-tk \
-    html-tk 
+install-target-libsanitizer: installdirs
        @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-html) \
-         || exit 1
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif tk
+@endif target-libsanitizer
 
-.PHONY: maybe-installcheck-tk installcheck-tk
-maybe-installcheck-tk:
-@if tk
-maybe-installcheck-tk: installcheck-tk
+.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
 
-installcheck-tk: \
-    configure-tk 
+install-strip-target-libsanitizer: installdirs
        @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 installcheck) \
-         || exit 1
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif tk
+@endif target-libsanitizer
 
-.PHONY: maybe-mostlyclean-tk mostlyclean-tk
-maybe-mostlyclean-tk:
-@if tk
-maybe-mostlyclean-tk: mostlyclean-tk
+# Other targets (info, dvi, pdf, etc.)
 
-mostlyclean-tk: 
+.PHONY: maybe-info-target-libsanitizer info-target-libsanitizer
+maybe-info-target-libsanitizer:
+@if target-libsanitizer
+maybe-info-target-libsanitizer: info-target-libsanitizer
+
+info-target-libsanitizer: \
+    configure-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing info in $(TARGET_SUBDIR)/libsanitizer"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in tk" ; \
-       (cd $(HOST_SUBDIR)/tk && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 mostlyclean) \
+                  info) \
          || exit 1
 
-@endif tk
+@endif target-libsanitizer
 
-.PHONY: maybe-clean-tk clean-tk
-maybe-clean-tk:
-@if tk
-maybe-clean-tk: clean-tk
+.PHONY: maybe-dvi-target-libsanitizer dvi-target-libsanitizer
+maybe-dvi-target-libsanitizer:
+@if target-libsanitizer
+maybe-dvi-target-libsanitizer: dvi-target-libsanitizer
 
-clean-tk: 
+dvi-target-libsanitizer: \
+    configure-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libsanitizer"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in tk" ; \
-       (cd $(HOST_SUBDIR)/tk && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 clean) \
+                  dvi) \
          || exit 1
 
-@endif tk
+@endif target-libsanitizer
 
-.PHONY: maybe-distclean-tk distclean-tk
-maybe-distclean-tk:
-@if tk
-maybe-distclean-tk: distclean-tk
+.PHONY: maybe-pdf-target-libsanitizer pdf-target-libsanitizer
+maybe-pdf-target-libsanitizer:
+@if target-libsanitizer
+maybe-pdf-target-libsanitizer: pdf-target-libsanitizer
 
-distclean-tk: 
+pdf-target-libsanitizer: \
+    configure-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libsanitizer"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in tk" ; \
-       (cd $(HOST_SUBDIR)/tk && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 distclean) \
+                  pdf) \
          || exit 1
 
-@endif tk
+@endif target-libsanitizer
 
-.PHONY: maybe-maintainer-clean-tk maintainer-clean-tk
-maybe-maintainer-clean-tk:
-@if tk
-maybe-maintainer-clean-tk: maintainer-clean-tk
+.PHONY: maybe-html-target-libsanitizer html-target-libsanitizer
+maybe-html-target-libsanitizer:
+@if target-libsanitizer
+maybe-html-target-libsanitizer: html-target-libsanitizer
 
-maintainer-clean-tk: 
+html-target-libsanitizer: \
+    configure-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f ./tk/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libsanitizer"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in tk" ; \
-       (cd $(HOST_SUBDIR)/tk && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 maintainer-clean) \
-         || exit 1
-
-@endif tk
-
-
-
-.PHONY: configure-libtermcap maybe-configure-libtermcap
-maybe-configure-libtermcap:
-@if gcc-bootstrap
-configure-libtermcap: stage_current
-@endif gcc-bootstrap
-@if libtermcap
-maybe-configure-libtermcap: configure-libtermcap
-configure-libtermcap: 
-       @: $(MAKE); $(unstage)
-       @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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/libtermcap; \
-       cd "$(HOST_SUBDIR)/libtermcap" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libtermcap/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libtermcap"; \
-       libsrcdir="$$s/libtermcap"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+                  html) \
          || exit 1
-@endif libtermcap
-
-
-
-
-
-.PHONY: all-libtermcap maybe-all-libtermcap
-maybe-all-libtermcap:
-@if gcc-bootstrap
-all-libtermcap: stage_current
-@endif gcc-bootstrap
-@if libtermcap
-TARGET-libtermcap=all
-maybe-all-libtermcap: all-libtermcap
-all-libtermcap: configure-libtermcap
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libtermcap && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-libtermcap))
-@endif libtermcap
-
-
-
-
-.PHONY: check-libtermcap maybe-check-libtermcap
-maybe-check-libtermcap:
-@if libtermcap
-maybe-check-libtermcap: check-libtermcap
-
-check-libtermcap:
-
-@endif libtermcap
-
-.PHONY: install-libtermcap maybe-install-libtermcap
-maybe-install-libtermcap:
-@if libtermcap
-maybe-install-libtermcap: install-libtermcap
-
-install-libtermcap: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libtermcap && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif libtermcap
 
-# Other targets (info, dvi, pdf, etc.)
+@endif target-libsanitizer
 
-.PHONY: maybe-info-libtermcap info-libtermcap
-maybe-info-libtermcap:
-@if libtermcap
-maybe-info-libtermcap: info-libtermcap
+.PHONY: maybe-TAGS-target-libsanitizer TAGS-target-libsanitizer
+maybe-TAGS-target-libsanitizer:
+@if target-libsanitizer
+maybe-TAGS-target-libsanitizer: TAGS-target-libsanitizer
 
-info-libtermcap: \
-    configure-libtermcap 
+TAGS-target-libsanitizer: \
+    configure-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libsanitizer"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in libtermcap" ; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 info) \
+                  TAGS) \
          || exit 1
 
-@endif libtermcap
+@endif target-libsanitizer
 
-.PHONY: maybe-dvi-libtermcap dvi-libtermcap
-maybe-dvi-libtermcap:
-@if libtermcap
-maybe-dvi-libtermcap: dvi-libtermcap
+.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
 
-dvi-libtermcap: \
-    configure-libtermcap 
+install-info-target-libsanitizer: \
+    configure-target-libsanitizer \
+    info-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libsanitizer"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in libtermcap" ; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 dvi) \
+                  install-info) \
          || exit 1
 
-@endif libtermcap
+@endif target-libsanitizer
 
-.PHONY: maybe-pdf-libtermcap pdf-libtermcap
-maybe-pdf-libtermcap:
-@if libtermcap
-maybe-pdf-libtermcap: pdf-libtermcap
+.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
 
-pdf-libtermcap: \
-    configure-libtermcap 
+install-pdf-target-libsanitizer: \
+    configure-target-libsanitizer \
+    pdf-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libsanitizer"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in libtermcap" ; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 pdf) \
+                  install-pdf) \
          || exit 1
 
-@endif libtermcap
+@endif target-libsanitizer
 
-.PHONY: maybe-html-libtermcap html-libtermcap
-maybe-html-libtermcap:
-@if libtermcap
-maybe-html-libtermcap: html-libtermcap
+.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
 
-html-libtermcap: \
-    configure-libtermcap 
+install-html-target-libsanitizer: \
+    configure-target-libsanitizer \
+    html-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libsanitizer"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in libtermcap" ; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 html) \
+                  install-html) \
          || exit 1
 
-@endif libtermcap
+@endif target-libsanitizer
 
-.PHONY: maybe-TAGS-libtermcap TAGS-libtermcap
-maybe-TAGS-libtermcap:
-@if libtermcap
-maybe-TAGS-libtermcap: TAGS-libtermcap
+.PHONY: maybe-installcheck-target-libsanitizer installcheck-target-libsanitizer
+maybe-installcheck-target-libsanitizer:
+@if target-libsanitizer
+maybe-installcheck-target-libsanitizer: installcheck-target-libsanitizer
 
-TAGS-libtermcap: \
-    configure-libtermcap 
+installcheck-target-libsanitizer: \
+    configure-target-libsanitizer 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libsanitizer"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in libtermcap" ; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 TAGS) \
+                  installcheck) \
          || exit 1
 
-@endif libtermcap
+@endif target-libsanitizer
 
-.PHONY: maybe-install-info-libtermcap install-info-libtermcap
-maybe-install-info-libtermcap:
-@if libtermcap
-maybe-install-info-libtermcap: install-info-libtermcap
+.PHONY: maybe-mostlyclean-target-libsanitizer mostlyclean-target-libsanitizer
+maybe-mostlyclean-target-libsanitizer:
+@if target-libsanitizer
+maybe-mostlyclean-target-libsanitizer: mostlyclean-target-libsanitizer
 
-install-info-libtermcap: \
-    configure-libtermcap \
-    info-libtermcap 
+mostlyclean-target-libsanitizer: 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libsanitizer"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in libtermcap" ; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-info) \
+                  mostlyclean) \
          || exit 1
 
-@endif libtermcap
+@endif target-libsanitizer
 
-.PHONY: maybe-install-pdf-libtermcap install-pdf-libtermcap
-maybe-install-pdf-libtermcap:
-@if libtermcap
-maybe-install-pdf-libtermcap: install-pdf-libtermcap
+.PHONY: maybe-clean-target-libsanitizer clean-target-libsanitizer
+maybe-clean-target-libsanitizer:
+@if target-libsanitizer
+maybe-clean-target-libsanitizer: clean-target-libsanitizer
 
-install-pdf-libtermcap: \
-    configure-libtermcap \
-    pdf-libtermcap 
+clean-target-libsanitizer: 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing clean in $(TARGET_SUBDIR)/libsanitizer"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in libtermcap" ; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-pdf) \
+                  clean) \
          || exit 1
 
-@endif libtermcap
+@endif target-libsanitizer
 
-.PHONY: maybe-install-html-libtermcap install-html-libtermcap
-maybe-install-html-libtermcap:
-@if libtermcap
-maybe-install-html-libtermcap: install-html-libtermcap
+.PHONY: maybe-distclean-target-libsanitizer distclean-target-libsanitizer
+maybe-distclean-target-libsanitizer:
+@if target-libsanitizer
+maybe-distclean-target-libsanitizer: distclean-target-libsanitizer
 
-install-html-libtermcap: \
-    configure-libtermcap \
-    html-libtermcap 
+distclean-target-libsanitizer: 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libsanitizer"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in libtermcap" ; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-html) \
+                  distclean) \
          || exit 1
 
-@endif libtermcap
+@endif target-libsanitizer
 
-.PHONY: maybe-installcheck-libtermcap installcheck-libtermcap
-maybe-installcheck-libtermcap:
-@if libtermcap
-maybe-installcheck-libtermcap: installcheck-libtermcap
+.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
 
-installcheck-libtermcap: \
-    configure-libtermcap 
+maintainer-clean-target-libsanitizer: 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtermcap/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libsanitizer"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in libtermcap" ; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libsanitizer && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 installcheck) \
+                  maintainer-clean) \
          || exit 1
 
-@endif libtermcap
-
-.PHONY: maybe-mostlyclean-libtermcap mostlyclean-libtermcap
-maybe-mostlyclean-libtermcap:
-@if libtermcap
-maybe-mostlyclean-libtermcap: mostlyclean-libtermcap
-
-# libtermcap doesn't support mostlyclean.
-mostlyclean-libtermcap:
-
-@endif libtermcap
-
-.PHONY: maybe-clean-libtermcap clean-libtermcap
-maybe-clean-libtermcap:
-@if libtermcap
-maybe-clean-libtermcap: clean-libtermcap
-
-# libtermcap doesn't support clean.
-clean-libtermcap:
-
-@endif libtermcap
-
-.PHONY: maybe-distclean-libtermcap distclean-libtermcap
-maybe-distclean-libtermcap:
-@if libtermcap
-maybe-distclean-libtermcap: distclean-libtermcap
+@endif target-libsanitizer
 
-# libtermcap doesn't support distclean.
-distclean-libtermcap:
 
-@endif libtermcap
 
-.PHONY: maybe-maintainer-clean-libtermcap maintainer-clean-libtermcap
-maybe-maintainer-clean-libtermcap:
-@if libtermcap
-maybe-maintainer-clean-libtermcap: maintainer-clean-libtermcap
 
-# libtermcap doesn't support maintainer-clean.
-maintainer-clean-libtermcap:
 
-@endif libtermcap
+.PHONY: configure-target-libmpx maybe-configure-target-libmpx
+maybe-configure-target-libmpx:
+@if gcc-bootstrap
+configure-target-libmpx: stage_current
+@endif gcc-bootstrap
+@if target-libmpx
+maybe-configure-target-libmpx: configure-target-libmpx
+configure-target-libmpx: 
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       echo "Checking multilib configuration for libmpx..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libmpx; \
+       cd "$(TARGET_SUBDIR)/libmpx" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libmpx; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias}  \
+         || exit 1
+@endif target-libmpx
 
 
 
-.PHONY: configure-utils maybe-configure-utils
-maybe-configure-utils:
-@if gcc-bootstrap
-configure-utils: stage_current
-@endif gcc-bootstrap
-@if utils
-maybe-configure-utils: configure-utils
-configure-utils: 
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage1-target-libmpx maybe-configure-stage1-target-libmpx
+maybe-configure-stage1-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-configure-stage1-target-libmpx: configure-stage1-target-libmpx
+configure-stage1-target-libmpx:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       echo "Checking multilib configuration for libmpx..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
+       $(NORMAL_TARGET_EXPORTS) \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 1 in $(TARGET_SUBDIR)/libmpx; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libmpx; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+          \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif target-libmpx-bootstrap
+
+.PHONY: configure-stage2-target-libmpx maybe-configure-stage2-target-libmpx
+maybe-configure-stage2-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-configure-stage2-target-libmpx: configure-stage2-target-libmpx
+configure-stage2-target-libmpx:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       echo "Checking multilib configuration for libmpx..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
+       $(NORMAL_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 2 in $(TARGET_SUBDIR)/libmpx; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libmpx; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif target-libmpx-bootstrap
+
+.PHONY: configure-stage3-target-libmpx maybe-configure-stage3-target-libmpx
+maybe-configure-stage3-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-configure-stage3-target-libmpx: configure-stage3-target-libmpx
+configure-stage3-target-libmpx:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       echo "Checking multilib configuration for libmpx..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
+       $(NORMAL_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 3 in $(TARGET_SUBDIR)/libmpx; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libmpx; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif target-libmpx-bootstrap
+
+.PHONY: configure-stage4-target-libmpx maybe-configure-stage4-target-libmpx
+maybe-configure-stage4-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-configure-stage4-target-libmpx: configure-stage4-target-libmpx
+configure-stage4-target-libmpx:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       echo "Checking multilib configuration for libmpx..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
+       $(NORMAL_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 4 in $(TARGET_SUBDIR)/libmpx; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libmpx; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif target-libmpx-bootstrap
+
+.PHONY: configure-stageprofile-target-libmpx maybe-configure-stageprofile-target-libmpx
+maybe-configure-stageprofile-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-configure-stageprofile-target-libmpx: configure-stageprofile-target-libmpx
+configure-stageprofile-target-libmpx:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       echo "Checking multilib configuration for libmpx..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
+       $(NORMAL_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage profile in $(TARGET_SUBDIR)/libmpx; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libmpx; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif target-libmpx-bootstrap
+
+.PHONY: configure-stagefeedback-target-libmpx maybe-configure-stagefeedback-target-libmpx
+maybe-configure-stagefeedback-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-configure-stagefeedback-target-libmpx: configure-stagefeedback-target-libmpx
+configure-stagefeedback-target-libmpx:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/utils/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/utils ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/utils; \
-       cd "$(HOST_SUBDIR)/utils" || exit 1; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       echo "Checking multilib configuration for libmpx..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
+       if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
+           mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
+       $(NORMAL_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(TARGET_SUBDIR)/libmpx; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
+       cd $(TARGET_SUBDIR)/libmpx || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/utils/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/utils"; \
-       libsrcdir="$$s/utils"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif utils
+       module_srcdir=libmpx; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif target-libmpx-bootstrap
 
 
 
 
 
-.PHONY: all-utils maybe-all-utils
-maybe-all-utils:
+.PHONY: all-target-libmpx maybe-all-target-libmpx
+maybe-all-target-libmpx:
 @if gcc-bootstrap
-all-utils: stage_current
+all-target-libmpx: stage_current
 @endif gcc-bootstrap
-@if utils
-TARGET-utils=all
-maybe-all-utils: all-utils
-all-utils: configure-utils
-       @: $(MAKE); $(unstage)
+@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; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/utils && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-utils))
-@endif utils
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libmpx && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libmpx))
+@endif target-libmpx
+
+
+
+.PHONY: all-stage1-target-libmpx maybe-all-stage1-target-libmpx
+.PHONY: clean-stage1-target-libmpx maybe-clean-stage1-target-libmpx
+maybe-all-stage1-target-libmpx:
+maybe-clean-stage1-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-all-stage1-target-libmpx: all-stage1-target-libmpx
+all-stage1: all-stage1-target-libmpx
+TARGET-stage1-target-libmpx = $(TARGET-target-libmpx)
+all-stage1-target-libmpx: configure-stage1-target-libmpx
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       cd $(TARGET_SUBDIR)/libmpx && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS)  \
+                 \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
+               $(TARGET-stage1-target-libmpx)
+
+maybe-clean-stage1-target-libmpx: clean-stage1-target-libmpx
+clean-stage1: clean-stage1-target-libmpx
+clean-stage1-target-libmpx:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage1-libmpx/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
+         clean
+@endif target-libmpx-bootstrap
+
+
+.PHONY: all-stage2-target-libmpx maybe-all-stage2-target-libmpx
+.PHONY: clean-stage2-target-libmpx maybe-clean-stage2-target-libmpx
+maybe-all-stage2-target-libmpx:
+maybe-clean-stage2-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-all-stage2-target-libmpx: all-stage2-target-libmpx
+all-stage2: all-stage2-target-libmpx
+TARGET-stage2-target-libmpx = $(TARGET-target-libmpx)
+all-stage2-target-libmpx: configure-stage2-target-libmpx
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       $(NORMAL_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libmpx && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS)   \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
+               $(TARGET-stage2-target-libmpx)
+
+maybe-clean-stage2-target-libmpx: clean-stage2-target-libmpx
+clean-stage2: clean-stage2-target-libmpx
+clean-stage2-target-libmpx:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage2-libmpx/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libmpx-bootstrap
+
+
+.PHONY: all-stage3-target-libmpx maybe-all-stage3-target-libmpx
+.PHONY: clean-stage3-target-libmpx maybe-clean-stage3-target-libmpx
+maybe-all-stage3-target-libmpx:
+maybe-clean-stage3-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-all-stage3-target-libmpx: all-stage3-target-libmpx
+all-stage3: all-stage3-target-libmpx
+TARGET-stage3-target-libmpx = $(TARGET-target-libmpx)
+all-stage3-target-libmpx: configure-stage3-target-libmpx
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       $(NORMAL_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libmpx && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS)   \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
+               $(TARGET-stage3-target-libmpx)
+
+maybe-clean-stage3-target-libmpx: clean-stage3-target-libmpx
+clean-stage3: clean-stage3-target-libmpx
+clean-stage3-target-libmpx:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage3-libmpx/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libmpx-bootstrap
+
+
+.PHONY: all-stage4-target-libmpx maybe-all-stage4-target-libmpx
+.PHONY: clean-stage4-target-libmpx maybe-clean-stage4-target-libmpx
+maybe-all-stage4-target-libmpx:
+maybe-clean-stage4-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-all-stage4-target-libmpx: all-stage4-target-libmpx
+all-stage4: all-stage4-target-libmpx
+TARGET-stage4-target-libmpx = $(TARGET-target-libmpx)
+all-stage4-target-libmpx: configure-stage4-target-libmpx
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       $(NORMAL_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libmpx && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS)   \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
+               $(TARGET-stage4-target-libmpx)
+
+maybe-clean-stage4-target-libmpx: clean-stage4-target-libmpx
+clean-stage4: clean-stage4-target-libmpx
+clean-stage4-target-libmpx:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage4-libmpx/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libmpx-bootstrap
+
+
+.PHONY: all-stageprofile-target-libmpx maybe-all-stageprofile-target-libmpx
+.PHONY: clean-stageprofile-target-libmpx maybe-clean-stageprofile-target-libmpx
+maybe-all-stageprofile-target-libmpx:
+maybe-clean-stageprofile-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-all-stageprofile-target-libmpx: all-stageprofile-target-libmpx
+all-stageprofile: all-stageprofile-target-libmpx
+TARGET-stageprofile-target-libmpx = $(TARGET-target-libmpx)
+all-stageprofile-target-libmpx: configure-stageprofile-target-libmpx
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       $(NORMAL_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libmpx && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS)   \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
+               $(TARGET-stageprofile-target-libmpx)
+
+maybe-clean-stageprofile-target-libmpx: clean-stageprofile-target-libmpx
+clean-stageprofile: clean-stageprofile-target-libmpx
+clean-stageprofile-target-libmpx:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stageprofile-libmpx/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libmpx-bootstrap
+
+
+.PHONY: all-stagefeedback-target-libmpx maybe-all-stagefeedback-target-libmpx
+.PHONY: clean-stagefeedback-target-libmpx maybe-clean-stagefeedback-target-libmpx
+maybe-all-stagefeedback-target-libmpx:
+maybe-clean-stagefeedback-target-libmpx:
+@if target-libmpx-bootstrap
+maybe-all-stagefeedback-target-libmpx: all-stagefeedback-target-libmpx
+all-stagefeedback: all-stagefeedback-target-libmpx
+TARGET-stagefeedback-target-libmpx = $(TARGET-target-libmpx)
+all-stagefeedback-target-libmpx: configure-stagefeedback-target-libmpx
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       $(NORMAL_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libmpx && \
+        \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS)   \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
+               $(TARGET-stagefeedback-target-libmpx)
+
+maybe-clean-stagefeedback-target-libmpx: clean-stagefeedback-target-libmpx
+clean-stagefeedback: clean-stagefeedback-target-libmpx
+clean-stagefeedback-target-libmpx:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stagefeedback-libmpx/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libmpx && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libmpx-bootstrap
 
 
 
 
-.PHONY: check-utils maybe-check-utils
-maybe-check-utils:
-@if utils
-maybe-check-utils: check-utils
 
-check-utils:
 
-@endif utils
+.PHONY: check-target-libmpx maybe-check-target-libmpx
+maybe-check-target-libmpx:
+@if target-libmpx
+maybe-check-target-libmpx: check-target-libmpx
 
-.PHONY: install-utils maybe-install-utils
-maybe-install-utils:
-@if utils
-maybe-install-utils: install-utils
+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)
 
-install-utils: installdirs
+@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; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/utils && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libmpx && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif utils
+@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-utils info-utils
-maybe-info-utils:
-@if utils
-maybe-info-utils: info-utils
+.PHONY: maybe-info-target-libmpx info-target-libmpx
+maybe-info-target-libmpx:
+@if target-libmpx
+maybe-info-target-libmpx: info-target-libmpx
 
-info-utils: \
-    configure-utils 
+info-target-libmpx: \
+    configure-target-libmpx 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing info in utils" ; \
-       (cd $(HOST_SUBDIR)/utils && \
+       (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) \
+                  info) \
          || exit 1
 
-@endif utils
+@endif target-libmpx
 
-.PHONY: maybe-dvi-utils dvi-utils
-maybe-dvi-utils:
-@if utils
-maybe-dvi-utils: dvi-utils
+.PHONY: maybe-dvi-target-libmpx dvi-target-libmpx
+maybe-dvi-target-libmpx:
+@if target-libmpx
+maybe-dvi-target-libmpx: dvi-target-libmpx
 
-dvi-utils: \
-    configure-utils 
+dvi-target-libmpx: \
+    configure-target-libmpx 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing dvi in utils" ; \
-       (cd $(HOST_SUBDIR)/utils && \
+       (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) \
+                  dvi) \
          || exit 1
 
-@endif utils
+@endif target-libmpx
 
-.PHONY: maybe-pdf-utils pdf-utils
-maybe-pdf-utils:
-@if utils
-maybe-pdf-utils: pdf-utils
+.PHONY: maybe-pdf-target-libmpx pdf-target-libmpx
+maybe-pdf-target-libmpx:
+@if target-libmpx
+maybe-pdf-target-libmpx: pdf-target-libmpx
 
-pdf-utils: \
-    configure-utils 
+pdf-target-libmpx: \
+    configure-target-libmpx 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing pdf in utils" ; \
-       (cd $(HOST_SUBDIR)/utils && \
+       (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) \
+                  pdf) \
          || exit 1
 
-@endif utils
+@endif target-libmpx
 
-.PHONY: maybe-html-utils html-utils
-maybe-html-utils:
-@if utils
-maybe-html-utils: html-utils
+.PHONY: maybe-html-target-libmpx html-target-libmpx
+maybe-html-target-libmpx:
+@if target-libmpx
+maybe-html-target-libmpx: html-target-libmpx
 
-html-utils: \
-    configure-utils 
+html-target-libmpx: \
+    configure-target-libmpx 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing html in utils" ; \
-       (cd $(HOST_SUBDIR)/utils && \
+       (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) \
+                  html) \
          || exit 1
 
-@endif utils
+@endif target-libmpx
 
-.PHONY: maybe-TAGS-utils TAGS-utils
-maybe-TAGS-utils:
-@if utils
-maybe-TAGS-utils: TAGS-utils
+.PHONY: maybe-TAGS-target-libmpx TAGS-target-libmpx
+maybe-TAGS-target-libmpx:
+@if target-libmpx
+maybe-TAGS-target-libmpx: TAGS-target-libmpx
 
-TAGS-utils: \
-    configure-utils 
+TAGS-target-libmpx: \
+    configure-target-libmpx 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing TAGS in utils" ; \
-       (cd $(HOST_SUBDIR)/utils && \
+       (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) \
+                  TAGS) \
          || exit 1
 
-@endif utils
+@endif target-libmpx
 
-.PHONY: maybe-install-info-utils install-info-utils
-maybe-install-info-utils:
-@if utils
-maybe-install-info-utils: install-info-utils
+.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-utils: \
-    configure-utils \
-    info-utils 
+install-info-target-libmpx: \
+    configure-target-libmpx \
+    info-target-libmpx 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing install-info in utils" ; \
-       (cd $(HOST_SUBDIR)/utils && \
+       (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) \
+                  install-info) \
          || exit 1
 
-@endif utils
+@endif target-libmpx
 
-.PHONY: maybe-install-pdf-utils install-pdf-utils
-maybe-install-pdf-utils:
-@if utils
-maybe-install-pdf-utils: install-pdf-utils
+.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-utils: \
-    configure-utils \
-    pdf-utils 
+install-pdf-target-libmpx: \
+    configure-target-libmpx \
+    pdf-target-libmpx 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing install-pdf in utils" ; \
-       (cd $(HOST_SUBDIR)/utils && \
+       (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) \
+                  install-pdf) \
          || exit 1
 
-@endif utils
+@endif target-libmpx
 
-.PHONY: maybe-install-html-utils install-html-utils
-maybe-install-html-utils:
-@if utils
-maybe-install-html-utils: install-html-utils
+.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-utils: \
-    configure-utils \
-    html-utils 
+install-html-target-libmpx: \
+    configure-target-libmpx \
+    html-target-libmpx 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing install-html in utils" ; \
-       (cd $(HOST_SUBDIR)/utils && \
+       (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) \
+                  install-html) \
          || exit 1
 
-@endif utils
+@endif target-libmpx
 
-.PHONY: maybe-installcheck-utils installcheck-utils
-maybe-installcheck-utils:
-@if utils
-maybe-installcheck-utils: installcheck-utils
+.PHONY: maybe-installcheck-target-libmpx installcheck-target-libmpx
+maybe-installcheck-target-libmpx:
+@if target-libmpx
+maybe-installcheck-target-libmpx: installcheck-target-libmpx
 
-installcheck-utils: \
-    configure-utils 
+installcheck-target-libmpx: \
+    configure-target-libmpx 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing installcheck in utils" ; \
-       (cd $(HOST_SUBDIR)/utils && \
+       (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) \
+                  installcheck) \
          || exit 1
 
-@endif utils
+@endif target-libmpx
 
-.PHONY: maybe-mostlyclean-utils mostlyclean-utils
-maybe-mostlyclean-utils:
-@if utils
-maybe-mostlyclean-utils: mostlyclean-utils
+.PHONY: maybe-mostlyclean-target-libmpx mostlyclean-target-libmpx
+maybe-mostlyclean-target-libmpx:
+@if target-libmpx
+maybe-mostlyclean-target-libmpx: mostlyclean-target-libmpx
 
-mostlyclean-utils: 
+mostlyclean-target-libmpx: 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing mostlyclean in utils" ; \
-       (cd $(HOST_SUBDIR)/utils && \
+       (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) \
+                  mostlyclean) \
          || exit 1
 
-@endif utils
+@endif target-libmpx
 
-.PHONY: maybe-clean-utils clean-utils
-maybe-clean-utils:
-@if utils
-maybe-clean-utils: clean-utils
+.PHONY: maybe-clean-target-libmpx clean-target-libmpx
+maybe-clean-target-libmpx:
+@if target-libmpx
+maybe-clean-target-libmpx: clean-target-libmpx
 
-clean-utils: 
+clean-target-libmpx: 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing clean in utils" ; \
-       (cd $(HOST_SUBDIR)/utils && \
+       (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) \
+                  clean) \
          || exit 1
 
-@endif utils
+@endif target-libmpx
 
-.PHONY: maybe-distclean-utils distclean-utils
-maybe-distclean-utils:
-@if utils
-maybe-distclean-utils: distclean-utils
+.PHONY: maybe-distclean-target-libmpx distclean-target-libmpx
+maybe-distclean-target-libmpx:
+@if target-libmpx
+maybe-distclean-target-libmpx: distclean-target-libmpx
 
-distclean-utils: 
+distclean-target-libmpx: 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(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; \
-       echo "Doing distclean in utils" ; \
-       (cd $(HOST_SUBDIR)/utils && \
+       (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) \
+                  distclean) \
          || exit 1
 
-@endif utils
+@endif target-libmpx
 
-.PHONY: maybe-maintainer-clean-utils maintainer-clean-utils
-maybe-maintainer-clean-utils:
-@if utils
-maybe-maintainer-clean-utils: maintainer-clean-utils
+.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-utils: 
+maintainer-clean-target-libmpx: 
        @: $(MAKE); $(unstage)
-       @[ -f ./utils/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 utils" ; \
-       (cd $(HOST_SUBDIR)/utils && \
-         $(MAKE) $(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 utils
-
+       $(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: configure-gnattools maybe-configure-gnattools
-maybe-configure-gnattools:
-@if gcc-bootstrap
-configure-gnattools: stage_current
-@endif gcc-bootstrap
-@if gnattools
-maybe-configure-gnattools: configure-gnattools
-configure-gnattools: 
-       @: $(MAKE); $(unstage)
-       @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 ; \
-       $(HOST_EXPORTS) \
-       echo Configuring in $(HOST_SUBDIR)/gnattools; \
-       cd "$(HOST_SUBDIR)/gnattools" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gnattools/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gnattools"; \
-       libsrcdir="$$s/gnattools"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif gnattools
 
 
 
 
+.PHONY: check-target-libvtv maybe-check-target-libvtv
+maybe-check-target-libvtv:
+@if target-libvtv
+maybe-check-target-libvtv: check-target-libvtv
 
-.PHONY: all-gnattools maybe-all-gnattools
-maybe-all-gnattools:
-@if gcc-bootstrap
-all-gnattools: stage_current
-@endif gcc-bootstrap
-@if gnattools
-TARGET-gnattools=all
-maybe-all-gnattools: all-gnattools
-all-gnattools: configure-gnattools
+check-target-libvtv:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gnattools && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-gnattools))
-@endif gnattools
-
-
+       $(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: check-gnattools maybe-check-gnattools
-maybe-check-gnattools:
-@if gnattools
-maybe-check-gnattools: check-gnattools
+.PHONY: install-target-libvtv maybe-install-target-libvtv
+maybe-install-target-libvtv:
+@if target-libvtv
+maybe-install-target-libvtv: install-target-libvtv
 
-check-gnattools:
+install-target-libvtv: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gnattools && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libvtv && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif gnattools
+@endif target-libvtv
 
-.PHONY: install-gnattools maybe-install-gnattools
-maybe-install-gnattools:
-@if gnattools
-maybe-install-gnattools: install-gnattools
+.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-gnattools: installdirs
+install-strip-target-libvtv: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gnattools && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+       $(RAW_CXX_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libvtv && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif gnattools
+@endif target-libvtv
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-gnattools info-gnattools
-maybe-info-gnattools:
-@if gnattools
-maybe-info-gnattools: info-gnattools
+.PHONY: maybe-info-target-libvtv info-target-libvtv
+maybe-info-target-libvtv:
+@if target-libvtv
+maybe-info-target-libvtv: info-target-libvtv
 
-info-gnattools: \
-    configure-gnattools 
+info-target-libvtv: \
+    configure-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing info in $(TARGET_SUBDIR)/libvtv"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/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) \
+                  info) \
          || exit 1
 
-@endif gnattools
+@endif target-libvtv
 
-.PHONY: maybe-dvi-gnattools dvi-gnattools
-maybe-dvi-gnattools:
-@if gnattools
-maybe-dvi-gnattools: dvi-gnattools
+.PHONY: maybe-dvi-target-libvtv dvi-target-libvtv
+maybe-dvi-target-libvtv:
+@if target-libvtv
+maybe-dvi-target-libvtv: dvi-target-libvtv
 
-dvi-gnattools: \
-    configure-gnattools 
+dvi-target-libvtv: \
+    configure-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libvtv"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/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) \
+                  dvi) \
          || exit 1
 
-@endif gnattools
+@endif target-libvtv
 
-.PHONY: maybe-pdf-gnattools pdf-gnattools
-maybe-pdf-gnattools:
-@if gnattools
-maybe-pdf-gnattools: pdf-gnattools
+.PHONY: maybe-pdf-target-libvtv pdf-target-libvtv
+maybe-pdf-target-libvtv:
+@if target-libvtv
+maybe-pdf-target-libvtv: pdf-target-libvtv
 
-pdf-gnattools: \
-    configure-gnattools 
+pdf-target-libvtv: \
+    configure-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libvtv"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/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) \
+                  pdf) \
          || exit 1
 
-@endif gnattools
+@endif target-libvtv
 
-.PHONY: maybe-html-gnattools html-gnattools
-maybe-html-gnattools:
-@if gnattools
-maybe-html-gnattools: html-gnattools
+.PHONY: maybe-html-target-libvtv html-target-libvtv
+maybe-html-target-libvtv:
+@if target-libvtv
+maybe-html-target-libvtv: html-target-libvtv
 
-html-gnattools: \
-    configure-gnattools 
+html-target-libvtv: \
+    configure-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing html in $(TARGET_SUBDIR)/libvtv"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/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) \
+                  html) \
          || exit 1
 
-@endif gnattools
+@endif target-libvtv
 
-.PHONY: maybe-TAGS-gnattools TAGS-gnattools
-maybe-TAGS-gnattools:
-@if gnattools
-maybe-TAGS-gnattools: TAGS-gnattools
+.PHONY: maybe-TAGS-target-libvtv TAGS-target-libvtv
+maybe-TAGS-target-libvtv:
+@if target-libvtv
+maybe-TAGS-target-libvtv: TAGS-target-libvtv
 
-TAGS-gnattools: \
-    configure-gnattools 
+TAGS-target-libvtv: \
+    configure-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libvtv"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/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) \
+                  TAGS) \
          || exit 1
 
-@endif gnattools
+@endif target-libvtv
 
-.PHONY: maybe-install-info-gnattools install-info-gnattools
-maybe-install-info-gnattools:
-@if gnattools
-maybe-install-info-gnattools: install-info-gnattools
+.PHONY: maybe-install-info-target-libvtv install-info-target-libvtv
+maybe-install-info-target-libvtv:
+@if target-libvtv
+maybe-install-info-target-libvtv: install-info-target-libvtv
 
-install-info-gnattools: \
-    configure-gnattools \
-    info-gnattools 
+install-info-target-libvtv: \
+    configure-target-libvtv \
+    info-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libvtv"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/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) \
+                  install-info) \
          || exit 1
 
-@endif gnattools
+@endif target-libvtv
 
-.PHONY: maybe-install-pdf-gnattools install-pdf-gnattools
-maybe-install-pdf-gnattools:
-@if gnattools
-maybe-install-pdf-gnattools: install-pdf-gnattools
+.PHONY: maybe-install-pdf-target-libvtv install-pdf-target-libvtv
+maybe-install-pdf-target-libvtv:
+@if target-libvtv
+maybe-install-pdf-target-libvtv: install-pdf-target-libvtv
 
-install-pdf-gnattools: \
-    configure-gnattools \
-    pdf-gnattools 
+install-pdf-target-libvtv: \
+    configure-target-libvtv \
+    pdf-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libvtv"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/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) \
+                  install-pdf) \
          || exit 1
 
-@endif gnattools
+@endif target-libvtv
 
-.PHONY: maybe-install-html-gnattools install-html-gnattools
-maybe-install-html-gnattools:
-@if gnattools
-maybe-install-html-gnattools: install-html-gnattools
+.PHONY: maybe-install-html-target-libvtv install-html-target-libvtv
+maybe-install-html-target-libvtv:
+@if target-libvtv
+maybe-install-html-target-libvtv: install-html-target-libvtv
 
-install-html-gnattools: \
-    configure-gnattools \
-    html-gnattools 
+install-html-target-libvtv: \
+    configure-target-libvtv \
+    html-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libvtv"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/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) \
+                  install-html) \
          || exit 1
 
-@endif gnattools
+@endif target-libvtv
 
-.PHONY: maybe-installcheck-gnattools installcheck-gnattools
-maybe-installcheck-gnattools:
-@if gnattools
-maybe-installcheck-gnattools: installcheck-gnattools
+.PHONY: maybe-installcheck-target-libvtv installcheck-target-libvtv
+maybe-installcheck-target-libvtv:
+@if target-libvtv
+maybe-installcheck-target-libvtv: installcheck-target-libvtv
 
-installcheck-gnattools: \
-    configure-gnattools 
+installcheck-target-libvtv: \
+    configure-target-libvtv 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libvtv"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/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) \
+                  installcheck) \
          || exit 1
 
-@endif gnattools
+@endif target-libvtv
 
-.PHONY: maybe-mostlyclean-gnattools mostlyclean-gnattools
-maybe-mostlyclean-gnattools:
-@if gnattools
-maybe-mostlyclean-gnattools: mostlyclean-gnattools
+.PHONY: maybe-mostlyclean-target-libvtv mostlyclean-target-libvtv
+maybe-mostlyclean-target-libvtv:
+@if target-libvtv
+maybe-mostlyclean-target-libvtv: mostlyclean-target-libvtv
 
-mostlyclean-gnattools: 
+mostlyclean-target-libvtv: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libvtv"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/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) \
+                  mostlyclean) \
          || exit 1
 
-@endif gnattools
+@endif target-libvtv
 
-.PHONY: maybe-clean-gnattools clean-gnattools
-maybe-clean-gnattools:
-@if gnattools
-maybe-clean-gnattools: clean-gnattools
+.PHONY: maybe-clean-target-libvtv clean-target-libvtv
+maybe-clean-target-libvtv:
+@if target-libvtv
+maybe-clean-target-libvtv: clean-target-libvtv
 
-clean-gnattools: 
+clean-target-libvtv: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing clean in $(TARGET_SUBDIR)/libvtv"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/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) \
+                  clean) \
          || exit 1
 
-@endif gnattools
+@endif target-libvtv
 
-.PHONY: maybe-distclean-gnattools distclean-gnattools
-maybe-distclean-gnattools:
-@if gnattools
-maybe-distclean-gnattools: distclean-gnattools
+.PHONY: maybe-distclean-target-libvtv distclean-target-libvtv
+maybe-distclean-target-libvtv:
+@if target-libvtv
+maybe-distclean-target-libvtv: distclean-target-libvtv
 
-distclean-gnattools: 
+distclean-target-libvtv: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libvtv"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/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) \
+                  distclean) \
          || exit 1
 
-@endif gnattools
+@endif target-libvtv
 
-.PHONY: maybe-maintainer-clean-gnattools maintainer-clean-gnattools
-maybe-maintainer-clean-gnattools:
-@if gnattools
-maybe-maintainer-clean-gnattools: maintainer-clean-gnattools
+.PHONY: maybe-maintainer-clean-target-libvtv maintainer-clean-target-libvtv
+maybe-maintainer-clean-target-libvtv:
+@if target-libvtv
+maybe-maintainer-clean-target-libvtv: maintainer-clean-target-libvtv
 
-maintainer-clean-gnattools: 
+maintainer-clean-target-libvtv: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnattools/Makefile ] || exit 0; \
+       @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libvtv"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in gnattools" ; \
-       (cd $(HOST_SUBDIR)/gnattools && \
+       (cd $(TARGET_SUBDIR)/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) \
+                  maintainer-clean) \
          || exit 1
 
-@endif gnattools
-
-
+@endif target-libvtv
 
-# ---------------------------------------
-# Modules which run on the target machine
-# ---------------------------------------
 
 
 
 
-.PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3
-maybe-configure-target-libstdc++-v3:
+.PHONY: configure-target-libcilkrts maybe-configure-target-libcilkrts
+maybe-configure-target-libcilkrts:
 @if gcc-bootstrap
-configure-target-libstdc++-v3: stage_current
+configure-target-libcilkrts: stage_current
 @endif gcc-bootstrap
-@if target-libstdc++-v3
-maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3
-configure-target-libstdc++-v3: 
+@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 libstdc++-v3..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+       echo "Checking multilib configuration for 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)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libcilkrts/Makefile; \
+           mv $(TARGET_SUBDIR)/libcilkrts/multilib.tmp $(TARGET_SUBDIR)/libcilkrts/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         mv $(TARGET_SUBDIR)/libcilkrts/multilib.tmp $(TARGET_SUBDIR)/libcilkrts/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 $(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)/libstdc++-v3/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libcilkrts/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-       libsrcdir="$$s/libstdc++-v3"; \
+       module_srcdir=libcilkrts; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
-@endif target-libstdc++-v3
+@endif target-libcilkrts
 
 
 
 
 
-.PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3
-maybe-all-target-libstdc++-v3:
+.PHONY: all-target-libcilkrts maybe-all-target-libcilkrts
+maybe-all-target-libcilkrts:
 @if gcc-bootstrap
-all-target-libstdc++-v3: stage_current
+all-target-libcilkrts: stage_current
 @endif gcc-bootstrap
-@if target-libstdc++-v3
-TARGET-target-libstdc++-v3=all
-maybe-all-target-libstdc++-v3: all-target-libstdc++-v3
-all-target-libstdc++-v3: configure-target-libstdc++-v3
+@if target-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; \
-       $(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
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libcilkrts))
+@endif target-libcilkrts
 
 
 
 
 
-.PHONY: check-target-libstdc++-v3 maybe-check-target-libstdc++-v3
-maybe-check-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-check-target-libstdc++-v3: check-target-libstdc++-v3
+.PHONY: check-target-libcilkrts maybe-check-target-libcilkrts
+maybe-check-target-libcilkrts:
+@if target-libcilkrts
+maybe-check-target-libcilkrts: check-target-libcilkrts
 
-check-target-libstdc++-v3:
+check-target-libcilkrts:
        @: $(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)
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
-@endif target-libstdc++-v3
+@endif target-libcilkrts
 
-.PHONY: install-target-libstdc++-v3 maybe-install-target-libstdc++-v3
-maybe-install-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-install-target-libstdc++-v3: install-target-libstdc++-v3
+.PHONY: install-target-libcilkrts maybe-install-target-libcilkrts
+maybe-install-target-libcilkrts:
+@if target-libcilkrts
+maybe-install-target-libcilkrts: install-target-libcilkrts
 
-install-target-libstdc++-v3: installdirs
+install-target-libcilkrts: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-libstdc++-v3
+@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-libstdc++-v3 info-target-libstdc++-v3
-maybe-info-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-info-target-libstdc++-v3: info-target-libstdc++-v3
+.PHONY: maybe-info-target-libcilkrts info-target-libcilkrts
+maybe-info-target-libcilkrts:
+@if target-libcilkrts
+maybe-info-target-libcilkrts: info-target-libcilkrts
 
-info-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
+info-target-libcilkrts: \
+    configure-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/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" ; \
+       $(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)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -40832,25 +39198,25 @@ info-target-libstdc++-v3: \
                   info) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libcilkrts
 
-.PHONY: maybe-dvi-target-libstdc++-v3 dvi-target-libstdc++-v3
-maybe-dvi-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-dvi-target-libstdc++-v3: dvi-target-libstdc++-v3
+.PHONY: maybe-dvi-target-libcilkrts dvi-target-libcilkrts
+maybe-dvi-target-libcilkrts:
+@if target-libcilkrts
+maybe-dvi-target-libcilkrts: dvi-target-libcilkrts
 
-dvi-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
+dvi-target-libcilkrts: \
+    configure-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/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" ; \
+       $(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)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -40858,25 +39224,25 @@ dvi-target-libstdc++-v3: \
                   dvi) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libcilkrts
 
-.PHONY: maybe-pdf-target-libstdc++-v3 pdf-target-libstdc++-v3
-maybe-pdf-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-pdf-target-libstdc++-v3: pdf-target-libstdc++-v3
+.PHONY: maybe-pdf-target-libcilkrts pdf-target-libcilkrts
+maybe-pdf-target-libcilkrts:
+@if target-libcilkrts
+maybe-pdf-target-libcilkrts: pdf-target-libcilkrts
 
-pdf-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
+pdf-target-libcilkrts: \
+    configure-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/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" ; \
+       $(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)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -40884,25 +39250,25 @@ pdf-target-libstdc++-v3: \
                   pdf) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libcilkrts
 
-.PHONY: maybe-html-target-libstdc++-v3 html-target-libstdc++-v3
-maybe-html-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-html-target-libstdc++-v3: html-target-libstdc++-v3
+.PHONY: maybe-html-target-libcilkrts html-target-libcilkrts
+maybe-html-target-libcilkrts:
+@if target-libcilkrts
+maybe-html-target-libcilkrts: html-target-libcilkrts
 
-html-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
+html-target-libcilkrts: \
+    configure-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/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" ; \
+       $(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)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -40910,25 +39276,25 @@ html-target-libstdc++-v3: \
                   html) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libcilkrts
 
-.PHONY: maybe-TAGS-target-libstdc++-v3 TAGS-target-libstdc++-v3
-maybe-TAGS-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-TAGS-target-libstdc++-v3: TAGS-target-libstdc++-v3
+.PHONY: maybe-TAGS-target-libcilkrts TAGS-target-libcilkrts
+maybe-TAGS-target-libcilkrts:
+@if target-libcilkrts
+maybe-TAGS-target-libcilkrts: TAGS-target-libcilkrts
 
-TAGS-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
+TAGS-target-libcilkrts: \
+    configure-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/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" ; \
+       $(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)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -40936,26 +39302,26 @@ TAGS-target-libstdc++-v3: \
                   TAGS) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libcilkrts
 
-.PHONY: maybe-install-info-target-libstdc++-v3 install-info-target-libstdc++-v3
-maybe-install-info-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-install-info-target-libstdc++-v3: install-info-target-libstdc++-v3
+.PHONY: maybe-install-info-target-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-libstdc++-v3: \
-    configure-target-libstdc++-v3 \
-    info-target-libstdc++-v3 
+install-info-target-libcilkrts: \
+    configure-target-libcilkrts \
+    info-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/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" ; \
+       $(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)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -40963,26 +39329,26 @@ install-info-target-libstdc++-v3: \
                   install-info) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libcilkrts
 
-.PHONY: maybe-install-pdf-target-libstdc++-v3 install-pdf-target-libstdc++-v3
-maybe-install-pdf-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-install-pdf-target-libstdc++-v3: install-pdf-target-libstdc++-v3
+.PHONY: maybe-install-pdf-target-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-libstdc++-v3: \
-    configure-target-libstdc++-v3 \
-    pdf-target-libstdc++-v3 
+install-pdf-target-libcilkrts: \
+    configure-target-libcilkrts \
+    pdf-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/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" ; \
+       $(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)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -40990,26 +39356,26 @@ install-pdf-target-libstdc++-v3: \
                   install-pdf) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libcilkrts
 
-.PHONY: maybe-install-html-target-libstdc++-v3 install-html-target-libstdc++-v3
-maybe-install-html-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-install-html-target-libstdc++-v3: install-html-target-libstdc++-v3
+.PHONY: maybe-install-html-target-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-libstdc++-v3: \
-    configure-target-libstdc++-v3 \
-    html-target-libstdc++-v3 
+install-html-target-libcilkrts: \
+    configure-target-libcilkrts \
+    html-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/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" ; \
+       $(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)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41017,25 +39383,25 @@ install-html-target-libstdc++-v3: \
                   install-html) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libcilkrts
 
-.PHONY: maybe-installcheck-target-libstdc++-v3 installcheck-target-libstdc++-v3
-maybe-installcheck-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-installcheck-target-libstdc++-v3: installcheck-target-libstdc++-v3
+.PHONY: maybe-installcheck-target-libcilkrts installcheck-target-libcilkrts
+maybe-installcheck-target-libcilkrts:
+@if target-libcilkrts
+maybe-installcheck-target-libcilkrts: installcheck-target-libcilkrts
 
-installcheck-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
+installcheck-target-libcilkrts: \
+    configure-target-libcilkrts 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/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" ; \
+       $(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)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41043,24 +39409,24 @@ installcheck-target-libstdc++-v3: \
                   installcheck) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libcilkrts
 
-.PHONY: maybe-mostlyclean-target-libstdc++-v3 mostlyclean-target-libstdc++-v3
-maybe-mostlyclean-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-mostlyclean-target-libstdc++-v3: mostlyclean-target-libstdc++-v3
+.PHONY: maybe-mostlyclean-target-libcilkrts mostlyclean-target-libcilkrts
+maybe-mostlyclean-target-libcilkrts:
+@if target-libcilkrts
+maybe-mostlyclean-target-libcilkrts: mostlyclean-target-libcilkrts
 
-mostlyclean-target-libstdc++-v3: 
+mostlyclean-target-libcilkrts: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/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" ; \
+       $(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)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41068,24 +39434,24 @@ mostlyclean-target-libstdc++-v3:
                   mostlyclean) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libcilkrts
 
-.PHONY: maybe-clean-target-libstdc++-v3 clean-target-libstdc++-v3
-maybe-clean-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-clean-target-libstdc++-v3: clean-target-libstdc++-v3
+.PHONY: maybe-clean-target-libcilkrts clean-target-libcilkrts
+maybe-clean-target-libcilkrts:
+@if target-libcilkrts
+maybe-clean-target-libcilkrts: clean-target-libcilkrts
 
-clean-target-libstdc++-v3: 
+clean-target-libcilkrts: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/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" ; \
+       $(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)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41093,24 +39459,24 @@ clean-target-libstdc++-v3:
                   clean) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libcilkrts
 
-.PHONY: maybe-distclean-target-libstdc++-v3 distclean-target-libstdc++-v3
-maybe-distclean-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-distclean-target-libstdc++-v3: distclean-target-libstdc++-v3
+.PHONY: maybe-distclean-target-libcilkrts distclean-target-libcilkrts
+maybe-distclean-target-libcilkrts:
+@if target-libcilkrts
+maybe-distclean-target-libcilkrts: distclean-target-libcilkrts
 
-distclean-target-libstdc++-v3: 
+distclean-target-libcilkrts: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/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" ; \
+       $(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)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41118,24 +39484,24 @@ distclean-target-libstdc++-v3:
                   distclean) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libcilkrts
 
-.PHONY: maybe-maintainer-clean-target-libstdc++-v3 maintainer-clean-target-libstdc++-v3
-maybe-maintainer-clean-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-maintainer-clean-target-libstdc++-v3: maintainer-clean-target-libstdc++-v3
+.PHONY: maybe-maintainer-clean-target-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-libstdc++-v3: 
+maintainer-clean-target-libcilkrts: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libcilkrts/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" ; \
+       $(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)/libstdc++-v3 && \
+       (cd $(TARGET_SUBDIR)/libcilkrts && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41143,130 +39509,146 @@ maintainer-clean-target-libstdc++-v3:
                   maintainer-clean) \
          || exit 1
 
-@endif target-libstdc++-v3
+@endif target-libcilkrts
 
 
 
 
 
-.PHONY: configure-target-libmudflap maybe-configure-target-libmudflap
-maybe-configure-target-libmudflap:
+.PHONY: configure-target-liboffloadmic maybe-configure-target-liboffloadmic
+maybe-configure-target-liboffloadmic:
 @if gcc-bootstrap
-configure-target-libmudflap: stage_current
+configure-target-liboffloadmic: stage_current
 @endif gcc-bootstrap
-@if target-libmudflap
-maybe-configure-target-libmudflap: configure-target-libmudflap
-configure-target-libmudflap: 
+@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 libmudflap..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmudflap/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libmudflap/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libmudflap/multilib.tmp; \
+       echo "Checking multilib configuration for 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)/libmudflap/Makefile; \
-           mv $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/liboffloadmic/Makefile; \
+           mv $(TARGET_SUBDIR)/liboffloadmic/multilib.tmp $(TARGET_SUBDIR)/liboffloadmic/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; \
+         mv $(TARGET_SUBDIR)/liboffloadmic/multilib.tmp $(TARGET_SUBDIR)/liboffloadmic/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 $(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)/libmudflap/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/liboffloadmic/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libmudflap"; \
-       libsrcdir="$$s/libmudflap"; \
+       module_srcdir=liboffloadmic; \
        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} @extra_liboffloadmic_configure_flags@ \
          || exit 1
-@endif target-libmudflap
+@endif target-liboffloadmic
 
 
 
 
 
-.PHONY: all-target-libmudflap maybe-all-target-libmudflap
-maybe-all-target-libmudflap:
+.PHONY: all-target-liboffloadmic maybe-all-target-liboffloadmic
+maybe-all-target-liboffloadmic:
 @if gcc-bootstrap
-all-target-libmudflap: stage_current
+all-target-liboffloadmic: stage_current
 @endif gcc-bootstrap
-@if target-libmudflap
-TARGET-target-libmudflap=all
-maybe-all-target-libmudflap: all-target-libmudflap
-all-target-libmudflap: configure-target-libmudflap
+@if target-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)/libmudflap && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libmudflap))
-@endif target-libmudflap
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-liboffloadmic))
+@endif target-liboffloadmic
 
 
 
 
 
-.PHONY: check-target-libmudflap maybe-check-target-libmudflap
-maybe-check-target-libmudflap:
-@if target-libmudflap
-maybe-check-target-libmudflap: check-target-libmudflap
+.PHONY: check-target-liboffloadmic maybe-check-target-liboffloadmic
+maybe-check-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-check-target-liboffloadmic: check-target-liboffloadmic
 
-check-target-libmudflap:
+check-target-liboffloadmic:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
-@endif target-libmudflap
+@endif target-liboffloadmic
 
-.PHONY: install-target-libmudflap maybe-install-target-libmudflap
-maybe-install-target-libmudflap:
-@if target-libmudflap
-maybe-install-target-libmudflap: install-target-libmudflap
+.PHONY: install-target-liboffloadmic maybe-install-target-liboffloadmic
+maybe-install-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-install-target-liboffloadmic: install-target-liboffloadmic
 
-install-target-libmudflap: installdirs
+install-target-liboffloadmic: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-libmudflap
+@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-libmudflap info-target-libmudflap
-maybe-info-target-libmudflap:
-@if target-libmudflap
-maybe-info-target-libmudflap: info-target-libmudflap
+.PHONY: maybe-info-target-liboffloadmic info-target-liboffloadmic
+maybe-info-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-info-target-liboffloadmic: info-target-liboffloadmic
 
-info-target-libmudflap: \
-    configure-target-libmudflap 
+info-target-liboffloadmic: \
+    configure-target-liboffloadmic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41274,25 +39656,25 @@ info-target-libmudflap: \
                   info) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-liboffloadmic
 
-.PHONY: maybe-dvi-target-libmudflap dvi-target-libmudflap
-maybe-dvi-target-libmudflap:
-@if target-libmudflap
-maybe-dvi-target-libmudflap: dvi-target-libmudflap
+.PHONY: maybe-dvi-target-liboffloadmic dvi-target-liboffloadmic
+maybe-dvi-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-dvi-target-liboffloadmic: dvi-target-liboffloadmic
 
-dvi-target-libmudflap: \
-    configure-target-libmudflap 
+dvi-target-liboffloadmic: \
+    configure-target-liboffloadmic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41300,25 +39682,25 @@ dvi-target-libmudflap: \
                   dvi) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-liboffloadmic
 
-.PHONY: maybe-pdf-target-libmudflap pdf-target-libmudflap
-maybe-pdf-target-libmudflap:
-@if target-libmudflap
-maybe-pdf-target-libmudflap: pdf-target-libmudflap
+.PHONY: maybe-pdf-target-liboffloadmic pdf-target-liboffloadmic
+maybe-pdf-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-pdf-target-liboffloadmic: pdf-target-liboffloadmic
 
-pdf-target-libmudflap: \
-    configure-target-libmudflap 
+pdf-target-liboffloadmic: \
+    configure-target-liboffloadmic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41326,25 +39708,25 @@ pdf-target-libmudflap: \
                   pdf) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-liboffloadmic
 
-.PHONY: maybe-html-target-libmudflap html-target-libmudflap
-maybe-html-target-libmudflap:
-@if target-libmudflap
-maybe-html-target-libmudflap: html-target-libmudflap
+.PHONY: maybe-html-target-liboffloadmic html-target-liboffloadmic
+maybe-html-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-html-target-liboffloadmic: html-target-liboffloadmic
 
-html-target-libmudflap: \
-    configure-target-libmudflap 
+html-target-liboffloadmic: \
+    configure-target-liboffloadmic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41352,25 +39734,25 @@ html-target-libmudflap: \
                   html) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-liboffloadmic
 
-.PHONY: maybe-TAGS-target-libmudflap TAGS-target-libmudflap
-maybe-TAGS-target-libmudflap:
-@if target-libmudflap
-maybe-TAGS-target-libmudflap: TAGS-target-libmudflap
+.PHONY: maybe-TAGS-target-liboffloadmic TAGS-target-liboffloadmic
+maybe-TAGS-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-TAGS-target-liboffloadmic: TAGS-target-liboffloadmic
 
-TAGS-target-libmudflap: \
-    configure-target-libmudflap 
+TAGS-target-liboffloadmic: \
+    configure-target-liboffloadmic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41378,26 +39760,26 @@ TAGS-target-libmudflap: \
                   TAGS) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-liboffloadmic
 
-.PHONY: maybe-install-info-target-libmudflap install-info-target-libmudflap
-maybe-install-info-target-libmudflap:
-@if target-libmudflap
-maybe-install-info-target-libmudflap: install-info-target-libmudflap
+.PHONY: maybe-install-info-target-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-libmudflap: \
-    configure-target-libmudflap \
-    info-target-libmudflap 
+install-info-target-liboffloadmic: \
+    configure-target-liboffloadmic \
+    info-target-liboffloadmic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41405,26 +39787,26 @@ install-info-target-libmudflap: \
                   install-info) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-liboffloadmic
 
-.PHONY: maybe-install-pdf-target-libmudflap install-pdf-target-libmudflap
-maybe-install-pdf-target-libmudflap:
-@if target-libmudflap
-maybe-install-pdf-target-libmudflap: install-pdf-target-libmudflap
+.PHONY: maybe-install-pdf-target-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-libmudflap: \
-    configure-target-libmudflap \
-    pdf-target-libmudflap 
+install-pdf-target-liboffloadmic: \
+    configure-target-liboffloadmic \
+    pdf-target-liboffloadmic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-pdf in $(TARGET_SUBDIR)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41432,26 +39814,26 @@ install-pdf-target-libmudflap: \
                   install-pdf) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-liboffloadmic
 
-.PHONY: maybe-install-html-target-libmudflap install-html-target-libmudflap
-maybe-install-html-target-libmudflap:
-@if target-libmudflap
-maybe-install-html-target-libmudflap: install-html-target-libmudflap
+.PHONY: maybe-install-html-target-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-libmudflap: \
-    configure-target-libmudflap \
-    html-target-libmudflap 
+install-html-target-liboffloadmic: \
+    configure-target-liboffloadmic \
+    html-target-liboffloadmic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-html in $(TARGET_SUBDIR)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41459,25 +39841,25 @@ install-html-target-libmudflap: \
                   install-html) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-liboffloadmic
 
-.PHONY: maybe-installcheck-target-libmudflap installcheck-target-libmudflap
-maybe-installcheck-target-libmudflap:
-@if target-libmudflap
-maybe-installcheck-target-libmudflap: installcheck-target-libmudflap
+.PHONY: maybe-installcheck-target-liboffloadmic installcheck-target-liboffloadmic
+maybe-installcheck-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-installcheck-target-liboffloadmic: installcheck-target-liboffloadmic
 
-installcheck-target-libmudflap: \
-    configure-target-libmudflap 
+installcheck-target-liboffloadmic: \
+    configure-target-liboffloadmic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41485,24 +39867,24 @@ installcheck-target-libmudflap: \
                   installcheck) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-liboffloadmic
 
-.PHONY: maybe-mostlyclean-target-libmudflap mostlyclean-target-libmudflap
-maybe-mostlyclean-target-libmudflap:
-@if target-libmudflap
-maybe-mostlyclean-target-libmudflap: mostlyclean-target-libmudflap
+.PHONY: maybe-mostlyclean-target-liboffloadmic mostlyclean-target-liboffloadmic
+maybe-mostlyclean-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-mostlyclean-target-liboffloadmic: mostlyclean-target-liboffloadmic
 
-mostlyclean-target-libmudflap: 
+mostlyclean-target-liboffloadmic: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41510,24 +39892,24 @@ mostlyclean-target-libmudflap:
                   mostlyclean) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-liboffloadmic
 
-.PHONY: maybe-clean-target-libmudflap clean-target-libmudflap
-maybe-clean-target-libmudflap:
-@if target-libmudflap
-maybe-clean-target-libmudflap: clean-target-libmudflap
+.PHONY: maybe-clean-target-liboffloadmic clean-target-liboffloadmic
+maybe-clean-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-clean-target-liboffloadmic: clean-target-liboffloadmic
 
-clean-target-libmudflap: 
+clean-target-liboffloadmic: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41535,24 +39917,24 @@ clean-target-libmudflap:
                   clean) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-liboffloadmic
 
-.PHONY: maybe-distclean-target-libmudflap distclean-target-libmudflap
-maybe-distclean-target-libmudflap:
-@if target-libmudflap
-maybe-distclean-target-libmudflap: distclean-target-libmudflap
+.PHONY: maybe-distclean-target-liboffloadmic distclean-target-liboffloadmic
+maybe-distclean-target-liboffloadmic:
+@if target-liboffloadmic
+maybe-distclean-target-liboffloadmic: distclean-target-liboffloadmic
 
-distclean-target-libmudflap: 
+distclean-target-liboffloadmic: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41560,24 +39942,24 @@ distclean-target-libmudflap:
                   distclean) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-liboffloadmic
 
-.PHONY: maybe-maintainer-clean-target-libmudflap maintainer-clean-target-libmudflap
-maybe-maintainer-clean-target-libmudflap:
-@if target-libmudflap
-maybe-maintainer-clean-target-libmudflap: maintainer-clean-target-libmudflap
+.PHONY: maybe-maintainer-clean-target-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-libmudflap: 
+maintainer-clean-target-liboffloadmic: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libmudflap" ; \
+       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)/libmudflap && \
+       (cd $(TARGET_SUBDIR)/liboffloadmic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -41585,7 +39967,7 @@ maintainer-clean-target-libmudflap:
                   maintainer-clean) \
          || exit 1
 
-@endif target-libmudflap
+@endif target-liboffloadmic
 
 
 
@@ -41603,8 +39985,8 @@ configure-target-libssp:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for libssp..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libssp/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libssp/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libssp/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libssp/multilib.tmp; \
@@ -41616,8 +39998,8 @@ configure-target-libssp:
          mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/libssp/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \
-       $(NORMAL_TARGET_EXPORTS) \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp; \
+       $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/libssp; \
        cd "$(TARGET_SUBDIR)/libssp" || exit 1; \
        case $(srcdir) in \
@@ -41625,12 +40007,13 @@ configure-target-libssp:
          *) topdir=`echo $(TARGET_SUBDIR)/libssp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libssp"; \
-       libsrcdir="$$s/libssp"; \
+       module_srcdir=libssp; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-libssp
 
@@ -41650,9 +40033,9 @@ all-target-libssp: configure-target-libssp
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
+       $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/libssp && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-libssp))
 @endif target-libssp
 
@@ -41690,6 +40073,21 @@ install-target-libssp: installdirs
 
 @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
+
+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)/libssp && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libssp
+
 # Other targets (info, dvi, pdf, etc.)
 
 .PHONY: maybe-info-target-libssp info-target-libssp
@@ -41700,11 +40098,11 @@ maybe-info-target-libssp: info-target-libssp
 info-target-libssp: \
     configure-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41726,11 +40124,11 @@ maybe-dvi-target-libssp: dvi-target-libssp
 dvi-target-libssp: \
     configure-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41752,11 +40150,11 @@ maybe-pdf-target-libssp: pdf-target-libssp
 pdf-target-libssp: \
     configure-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41778,11 +40176,11 @@ maybe-html-target-libssp: html-target-libssp
 html-target-libssp: \
     configure-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41804,11 +40202,11 @@ maybe-TAGS-target-libssp: TAGS-target-libssp
 TAGS-target-libssp: \
     configure-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41831,11 +40229,11 @@ install-info-target-libssp: \
     configure-target-libssp \
     info-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41858,11 +40256,11 @@ install-pdf-target-libssp: \
     configure-target-libssp \
     pdf-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-pdf in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41885,11 +40283,11 @@ install-html-target-libssp: \
     configure-target-libssp \
     html-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-html in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41911,11 +40309,11 @@ maybe-installcheck-target-libssp: installcheck-target-libssp
 installcheck-target-libssp: \
     configure-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41936,11 +40334,11 @@ maybe-mostlyclean-target-libssp: mostlyclean-target-libssp
 
 mostlyclean-target-libssp: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41961,11 +40359,11 @@ maybe-clean-target-libssp: clean-target-libssp
 
 clean-target-libssp: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -41986,11 +40384,11 @@ maybe-distclean-target-libssp: distclean-target-libssp
 
 distclean-target-libssp: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42011,11 +40409,11 @@ maybe-maintainer-clean-target-libssp: maintainer-clean-target-libssp
 
 maintainer-clean-target-libssp: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libssp" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libssp"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42045,8 +40443,8 @@ configure-target-newlib:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for newlib..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/newlib/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/newlib/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/newlib/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/newlib/multilib.tmp; \
@@ -42058,8 +40456,8 @@ configure-target-newlib:
          mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
-       $(NORMAL_TARGET_EXPORTS) \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib; \
+       $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/newlib; \
        cd "$(TARGET_SUBDIR)/newlib" || exit 1; \
        case $(srcdir) in \
@@ -42067,12 +40465,13 @@ configure-target-newlib:
          *) topdir=`echo $(TARGET_SUBDIR)/newlib/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/newlib"; \
-       libsrcdir="$$s/newlib"; \
+       module_srcdir=newlib; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-newlib
 
@@ -42092,9 +40491,9 @@ all-target-newlib: configure-target-newlib
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
+       $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/newlib && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-newlib))
 @endif target-newlib
 
@@ -42132,6 +40531,21 @@ install-target-newlib: installdirs
 
 @endif target-newlib
 
+.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-newlib: installdirs
+       @: $(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)  install-strip)
+
+@endif target-newlib
+
 # Other targets (info, dvi, pdf, etc.)
 
 .PHONY: maybe-info-target-newlib info-target-newlib
@@ -42142,11 +40556,11 @@ maybe-info-target-newlib: info-target-newlib
 info-target-newlib: \
     configure-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42168,11 +40582,11 @@ maybe-dvi-target-newlib: dvi-target-newlib
 dvi-target-newlib: \
     configure-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42194,11 +40608,11 @@ maybe-pdf-target-newlib: pdf-target-newlib
 pdf-target-newlib: \
     configure-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42220,11 +40634,11 @@ maybe-html-target-newlib: html-target-newlib
 html-target-newlib: \
     configure-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42246,11 +40660,11 @@ maybe-TAGS-target-newlib: TAGS-target-newlib
 TAGS-target-newlib: \
     configure-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42273,11 +40687,11 @@ install-info-target-newlib: \
     configure-target-newlib \
     info-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42300,11 +40714,11 @@ install-pdf-target-newlib: \
     configure-target-newlib \
     pdf-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-pdf in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42327,11 +40741,11 @@ install-html-target-newlib: \
     configure-target-newlib \
     html-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-html in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42353,11 +40767,11 @@ maybe-installcheck-target-newlib: installcheck-target-newlib
 installcheck-target-newlib: \
     configure-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42378,11 +40792,11 @@ maybe-mostlyclean-target-newlib: mostlyclean-target-newlib
 
 mostlyclean-target-newlib: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42403,11 +40817,11 @@ maybe-clean-target-newlib: clean-target-newlib
 
 clean-target-newlib: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42428,11 +40842,11 @@ maybe-distclean-target-newlib: distclean-target-newlib
 
 distclean-target-newlib: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42453,11 +40867,11 @@ maybe-maintainer-clean-target-newlib: maintainer-clean-target-newlib
 
 maintainer-clean-target-newlib: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/newlib" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/newlib"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -42486,8 +40900,8 @@ configure-target-libgcc:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for libgcc..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
@@ -42499,8 +40913,8 @@ configure-target-libgcc:
          mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
-       $(NORMAL_TARGET_EXPORTS) \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
+       $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/libgcc; \
        cd "$(TARGET_SUBDIR)/libgcc" || exit 1; \
        case $(srcdir) in \
@@ -42508,12 +40922,13 @@ configure-target-libgcc:
          *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
+       module_srcdir=libgcc; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-libgcc
 
@@ -42528,8 +40943,9 @@ configure-stage1-target-libgcc:
        @$(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 ; \
+       $(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; \
@@ -42541,24 +40957,25 @@ configure-stage1-target-libgcc:
          mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       CFLAGS="$(STAGE1_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE1_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
-       echo Configuring stage 1 in $(TARGET_SUBDIR)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+       $(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; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
           \
-         --disable-intermodule $(STAGE1_CHECKING)        --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+         $(STAGE1_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
 .PHONY: configure-stage2-target-libgcc maybe-configure-stage2-target-libgcc
@@ -42570,8 +40987,9 @@ configure-stage2-target-libgcc:
        @$(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 ; \
+       $(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; \
@@ -42584,67 +41002,25 @@ configure-stage2-target-libgcc:
        fi; \
        test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
        $(NORMAL_TARGET_EXPORTS) \
-         \
-       CFLAGS="$(STAGE2_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
-       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; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif target-libgcc-bootstrap
-
-.PHONY: configure-stageb2g0-target-libgcc maybe-configure-stageb2g0-target-libgcc
-maybe-configure-stageb2g0-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-configure-stageb2g0-target-libgcc: configure-stageb2g0-target-libgcc
-configure-stageb2g0-target-libgcc:
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       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="$(STAGE2_LIBCFLAGS) -g0 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_LIBCFLAGS) -g0 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
-       echo Configuring stage b2g0 in $(TARGET_SUBDIR)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 2 in $(TARGET_SUBDIR)/libgcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
        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; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
+         $(STAGE2_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
 .PHONY: configure-stage3-target-libgcc maybe-configure-stage3-target-libgcc
@@ -42656,51 +41032,9 @@ configure-stage3-target-libgcc:
        @$(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="$(STAGE3_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
-       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; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
-@endif target-libgcc-bootstrap
-
-.PHONY: configure-stageb3g2-target-libgcc maybe-configure-stageb3g2-target-libgcc
-maybe-configure-stageb3g2-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-configure-stageb3g2-target-libgcc: configure-stageb3g2-target-libgcc
-configure-stageb3g2-target-libgcc:
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for libgcc..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
@@ -42713,24 +41047,25 @@ configure-stageb3g2-target-libgcc:
        fi; \
        test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
        $(NORMAL_TARGET_EXPORTS) \
-         \
-       CFLAGS="$(STAGE3_LIBCFLAGS) -g2 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_LIBCFLAGS) -g2 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
-       echo Configuring stage b3g2 in $(TARGET_SUBDIR)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 3 in $(TARGET_SUBDIR)/libgcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
        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; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
+         $(STAGE3_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
 .PHONY: configure-stage4-target-libgcc maybe-configure-stage4-target-libgcc
@@ -42742,8 +41077,9 @@ configure-stage4-target-libgcc:
        @$(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 ; \
+       $(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; \
@@ -42756,24 +41092,25 @@ configure-stage4-target-libgcc:
        fi; \
        test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
        $(NORMAL_TARGET_EXPORTS) \
-         \
-       CFLAGS="$(STAGE4_CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE4_CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
-       echo Configuring stage 4 in $(TARGET_SUBDIR)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 4 in $(TARGET_SUBDIR)/libgcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
        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; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
+         $(STAGE4_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
 .PHONY: configure-stageprofile-target-libgcc maybe-configure-stageprofile-target-libgcc
@@ -42785,8 +41122,9 @@ configure-stageprofile-target-libgcc:
        @$(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 ; \
+       $(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; \
@@ -42799,24 +41137,25 @@ configure-stageprofile-target-libgcc:
        fi; \
        test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
        $(NORMAL_TARGET_EXPORTS) \
-         \
-       CFLAGS="$(STAGE2_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
-       echo Configuring stage profile in $(TARGET_SUBDIR)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage profile in $(TARGET_SUBDIR)/libgcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
        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; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
+         $(STAGEprofile_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
 .PHONY: configure-stagefeedback-target-libgcc maybe-configure-stagefeedback-target-libgcc
@@ -42828,8 +41167,9 @@ configure-stagefeedback-target-libgcc:
        @$(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 ; \
+       $(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; \
@@ -42842,24 +41182,25 @@ configure-stagefeedback-target-libgcc:
        fi; \
        test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
        $(NORMAL_TARGET_EXPORTS) \
-         \
-       CFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
-       echo Configuring stage feedback in $(TARGET_SUBDIR)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(TARGET_SUBDIR)/libgcc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
        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; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=libgcc; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
-         @stage2_werror_flag@ 
+         $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
 
@@ -42877,9 +41218,9 @@ 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) \
+       $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/libgcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-libgcc))
 @endif target-libgcc
 
@@ -42897,13 +41238,20 @@ 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; \
-       $(NORMAL_TARGET_EXPORTS) \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(NORMAL_TARGET_EXPORTS)  \
        cd $(TARGET_SUBDIR)/libgcc && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-               LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS)   \
+               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
@@ -42917,7 +41265,7 @@ clean-stage1-target-libgcc:
        fi; \
        cd $(TARGET_SUBDIR)/libgcc && \
        $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                clean
+         clean
 @endif target-libgcc-bootstrap
 
 
@@ -42933,14 +41281,20 @@ 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="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS)   \
+               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
@@ -42953,47 +41307,7 @@ clean-stage2-target-libgcc:
          $(MAKE) stage2-start; \
        fi; \
        cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
-@endif target-libgcc-bootstrap
-
-
-.PHONY: all-stageb2g0-target-libgcc maybe-all-stageb2g0-target-libgcc
-.PHONY: clean-stageb2g0-target-libgcc maybe-clean-stageb2g0-target-libgcc
-maybe-all-stageb2g0-target-libgcc:
-maybe-clean-stageb2g0-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-all-stageb2g0-target-libgcc: all-stageb2g0-target-libgcc
-all-stageb2g0: all-stageb2g0-target-libgcc
-TARGET-stageb2g0-target-libgcc = $(TARGET-target-libgcc)
-all-stageb2g0-target-libgcc: configure-stageb2g0-target-libgcc
-       @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-        \
-       cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_TARGET_FLAGS)   \
-               $(TARGET-stageb2g0-target-libgcc)
-
-maybe-clean-stageb2g0-target-libgcc: clean-stageb2g0-target-libgcc
-clean-stageb2g0: clean-stageb2g0-target-libgcc
-clean-stageb2g0-target-libgcc:
-       @if [ $(current_stage) = stageb2g0 ]; then \
-         [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
-       else \
-         [ -f $(TARGET_SUBDIR)/stageb2g0-libgcc/Makefile ] || exit 0; \
-         $(MAKE) stageb2g0-start; \
-       fi; \
-       cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
 @endif target-libgcc-bootstrap
 
 
@@ -43009,14 +41323,20 @@ 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="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS)   \
+               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
@@ -43029,47 +41349,7 @@ clean-stage3-target-libgcc:
          $(MAKE) stage3-start; \
        fi; \
        cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
-@endif target-libgcc-bootstrap
-
-
-.PHONY: all-stageb3g2-target-libgcc maybe-all-stageb3g2-target-libgcc
-.PHONY: clean-stageb3g2-target-libgcc maybe-clean-stageb3g2-target-libgcc
-maybe-all-stageb3g2-target-libgcc:
-maybe-clean-stageb3g2-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-all-stageb3g2-target-libgcc: all-stageb3g2-target-libgcc
-all-stageb3g2: all-stageb3g2-target-libgcc
-TARGET-stageb3g2-target-libgcc = $(TARGET-target-libgcc)
-all-stageb3g2-target-libgcc: configure-stageb3g2-target-libgcc
-       @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-        \
-       cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_TARGET_FLAGS)   \
-               $(TARGET-stageb3g2-target-libgcc)
-
-maybe-clean-stageb3g2-target-libgcc: clean-stageb3g2-target-libgcc
-clean-stageb3g2: clean-stageb3g2-target-libgcc
-clean-stageb3g2-target-libgcc:
-       @if [ $(current_stage) = stageb3g2 ]; then \
-         [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
-       else \
-         [ -f $(TARGET_SUBDIR)/stageb3g2-libgcc/Makefile ] || exit 0; \
-         $(MAKE) stageb3g2-start; \
-       fi; \
-       cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
 @endif target-libgcc-bootstrap
 
 
@@ -43085,14 +41365,20 @@ 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; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
        $(NORMAL_TARGET_EXPORTS) \
-        \
+         \
        cd $(TARGET_SUBDIR)/libgcc && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-               LIBCFLAGS="$(STAGE4_CFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_TARGET_FLAGS)   \
+               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
@@ -43105,9 +41391,7 @@ clean-stage4-target-libgcc:
          $(MAKE) stage4-start; \
        fi; \
        cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
 @endif target-libgcc-bootstrap
 
 
@@ -43123,14 +41407,20 @@ 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="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-               LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-               CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS)   \
+               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
@@ -43143,9 +41433,7 @@ clean-stageprofile-target-libgcc:
          $(MAKE) stageprofile-start; \
        fi; \
        cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
 @endif target-libgcc-bootstrap
 
 
@@ -43161,14 +41449,20 @@ 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; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        $(NORMAL_TARGET_EXPORTS) \
-        \
+         \
        cd $(TARGET_SUBDIR)/libgcc && \
+        \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-               LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-               CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_TARGET_FLAGS)   \
+               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
@@ -43181,9 +41475,7 @@ clean-stagefeedback-target-libgcc:
          $(MAKE) stagefeedback-start; \
        fi; \
        cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
 @endif target-libgcc-bootstrap
 
 
@@ -43216,6 +41508,21 @@ install-target-libgcc: installdirs
 
 @endif target-libgcc
 
+.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-libgcc: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libgcc && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libgcc
+
 # Other targets (info, dvi, pdf, etc.)
 
 .PHONY: maybe-info-target-libgcc info-target-libgcc
@@ -43226,11 +41533,11 @@ maybe-info-target-libgcc: info-target-libgcc
 info-target-libgcc: \
     configure-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43252,11 +41559,11 @@ maybe-dvi-target-libgcc: dvi-target-libgcc
 dvi-target-libgcc: \
     configure-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43278,11 +41585,11 @@ maybe-pdf-target-libgcc: pdf-target-libgcc
 pdf-target-libgcc: \
     configure-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43304,11 +41611,11 @@ maybe-html-target-libgcc: html-target-libgcc
 html-target-libgcc: \
     configure-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43330,11 +41637,11 @@ maybe-TAGS-target-libgcc: TAGS-target-libgcc
 TAGS-target-libgcc: \
     configure-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43357,11 +41664,11 @@ install-info-target-libgcc: \
     configure-target-libgcc \
     info-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43384,11 +41691,11 @@ install-pdf-target-libgcc: \
     configure-target-libgcc \
     pdf-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-pdf in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43411,11 +41718,11 @@ install-html-target-libgcc: \
     configure-target-libgcc \
     html-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-html in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43437,11 +41744,11 @@ maybe-installcheck-target-libgcc: installcheck-target-libgcc
 installcheck-target-libgcc: \
     configure-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43462,11 +41769,11 @@ maybe-mostlyclean-target-libgcc: mostlyclean-target-libgcc
 
 mostlyclean-target-libgcc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43487,11 +41794,11 @@ maybe-clean-target-libgcc: clean-target-libgcc
 
 clean-target-libgcc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43512,11 +41819,11 @@ maybe-distclean-target-libgcc: distclean-target-libgcc
 
 distclean-target-libgcc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43537,11 +41844,11 @@ maybe-maintainer-clean-target-libgcc: maintainer-clean-target-libgcc
 
 maintainer-clean-target-libgcc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgcc" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgcc"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -43559,124 +41866,140 @@ maintainer-clean-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 ; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo Configuring in $(TARGET_SUBDIR)/libgfortran; \
-       cd "$(TARGET_SUBDIR)/libgfortran" || exit 1; \
+       test ! -f $(TARGET_SUBDIR)/libbacktrace/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libbacktrace; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libbacktrace; \
+       cd "$(TARGET_SUBDIR)/libbacktrace" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/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
+       $(NORMAL_TARGET_EXPORTS)  \
+       (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-libbacktrace maybe-install-strip-target-libbacktrace
+maybe-install-strip-target-libbacktrace:
+@if target-libbacktrace
+maybe-install-strip-target-libbacktrace: install-strip-target-libbacktrace
+
+install-strip-target-libbacktrace: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libbacktrace && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libbacktrace
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-target-libgfortran info-target-libgfortran
-maybe-info-target-libgfortran:
-@if target-libgfortran
-maybe-info-target-libgfortran: info-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-libgfortran: \
-    configure-target-libgfortran 
+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}" \
@@ -43684,25 +42007,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}" \
@@ -43710,25 +42033,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}" \
@@ -43736,25 +42059,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}" \
@@ -43762,25 +42085,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}" \
@@ -43788,26 +42111,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}" \
@@ -43815,26 +42138,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}" \
@@ -43842,26 +42165,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}" \
@@ -43869,25 +42192,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}" \
@@ -43895,24 +42218,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}" \
@@ -43920,24 +42243,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}" \
@@ -43945,24 +42268,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}" \
@@ -43970,24 +42293,24 @@ distclean-target-libgfortran:
                   distclean) \
          || exit 1
 
-@endif target-libgfortran
-
-.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
+@endif target-libbacktrace
 
-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-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}" \
@@ -43995,130 +42318,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 ; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo Configuring in $(TARGET_SUBDIR)/libobjc; \
-       cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \
+       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)/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
+       $(NORMAL_TARGET_EXPORTS)  \
+       (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-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-libquadmath: installdirs
+       @: $(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)  install-strip)
+
+@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}" \
@@ -44126,25 +42465,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}" \
@@ -44152,25 +42491,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}" \
@@ -44178,25 +42517,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}" \
@@ -44204,25 +42543,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}" \
@@ -44230,26 +42569,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}" \
@@ -44257,26 +42596,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}" \
@@ -44284,26 +42623,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}" \
@@ -44311,25 +42650,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}" \
@@ -44337,24 +42676,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}" \
@@ -44362,24 +42701,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}" \
@@ -44387,24 +42726,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}" \
@@ -44412,24 +42751,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}" \
@@ -44437,125 +42776,146 @@ maintainer-clean-target-libobjc:
                   maintainer-clean) \
          || exit 1
 
-@endif target-libobjc
+@endif target-libquadmath
 
 
 
 
 
-.PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
-maybe-configure-target-libtermcap:
+.PHONY: configure-target-libgfortran maybe-configure-target-libgfortran
+maybe-configure-target-libgfortran:
 @if gcc-bootstrap
-configure-target-libtermcap: stage_current
+configure-target-libgfortran: stage_current
 @endif gcc-bootstrap
-@if target-libtermcap
-maybe-configure-target-libtermcap: configure-target-libtermcap
-configure-target-libtermcap: 
+@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 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 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)/libtermcap/Makefile; \
-           mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libgfortran/Makefile; \
+           mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
+         mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo Configuring in $(TARGET_SUBDIR)/libtermcap; \
-       cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \
+       test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libgfortran; \
+       cd "$(TARGET_SUBDIR)/libgfortran" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libtermcap/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libgfortran/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libtermcap"; \
-       libsrcdir="$$s/libtermcap"; \
+       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-libtermcap
+@endif target-libgfortran
 
 
 
 
 
-.PHONY: all-target-libtermcap maybe-all-target-libtermcap
-maybe-all-target-libtermcap:
+.PHONY: all-target-libgfortran maybe-all-target-libgfortran
+maybe-all-target-libgfortran:
 @if gcc-bootstrap
-all-target-libtermcap: stage_current
+all-target-libgfortran: 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-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)/libtermcap && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libtermcap))
-@endif target-libtermcap
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libgfortran))
+@endif target-libgfortran
 
 
 
 
 
-.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-libgfortran maybe-check-target-libgfortran
+maybe-check-target-libgfortran:
+@if target-libgfortran
+maybe-check-target-libgfortran: check-target-libgfortran
 
-# Dummy target for uncheckable module.
-check-target-libtermcap:
+check-target-libgfortran:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
-@endif target-libtermcap
+@endif target-libgfortran
 
-.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-libgfortran maybe-install-target-libgfortran
+maybe-install-target-libgfortran:
+@if target-libgfortran
+maybe-install-target-libgfortran: install-target-libgfortran
 
-install-target-libtermcap: 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)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-libtermcap
+@endif target-libgfortran
+
+.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-libgfortran: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libgfortran
 
 # 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-libgfortran info-target-libgfortran
+maybe-info-target-libgfortran:
+@if target-libgfortran
+maybe-info-target-libgfortran: info-target-libgfortran
 
-info-target-libtermcap: \
-    configure-target-libtermcap 
+info-target-libgfortran: \
+    configure-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/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)/libtermcap" ; \
+       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)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -44563,25 +42923,25 @@ info-target-libtermcap: \
                   info) \
          || exit 1
 
-@endif target-libtermcap
+@endif target-libgfortran
 
-.PHONY: maybe-dvi-target-libtermcap dvi-target-libtermcap
-maybe-dvi-target-libtermcap:
-@if target-libtermcap
-maybe-dvi-target-libtermcap: dvi-target-libtermcap
+.PHONY: maybe-dvi-target-libgfortran dvi-target-libgfortran
+maybe-dvi-target-libgfortran:
+@if target-libgfortran
+maybe-dvi-target-libgfortran: dvi-target-libgfortran
 
-dvi-target-libtermcap: \
-    configure-target-libtermcap 
+dvi-target-libgfortran: \
+    configure-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/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)/libtermcap" ; \
+       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)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -44589,25 +42949,25 @@ dvi-target-libtermcap: \
                   dvi) \
          || exit 1
 
-@endif target-libtermcap
+@endif target-libgfortran
 
-.PHONY: maybe-pdf-target-libtermcap pdf-target-libtermcap
-maybe-pdf-target-libtermcap:
-@if target-libtermcap
-maybe-pdf-target-libtermcap: pdf-target-libtermcap
+.PHONY: maybe-pdf-target-libgfortran pdf-target-libgfortran
+maybe-pdf-target-libgfortran:
+@if target-libgfortran
+maybe-pdf-target-libgfortran: pdf-target-libgfortran
 
-pdf-target-libtermcap: \
-    configure-target-libtermcap 
+pdf-target-libgfortran: \
+    configure-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/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)/libtermcap" ; \
+       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)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -44615,25 +42975,25 @@ pdf-target-libtermcap: \
                   pdf) \
          || exit 1
 
-@endif target-libtermcap
+@endif target-libgfortran
 
-.PHONY: maybe-html-target-libtermcap html-target-libtermcap
-maybe-html-target-libtermcap:
-@if target-libtermcap
-maybe-html-target-libtermcap: html-target-libtermcap
+.PHONY: maybe-html-target-libgfortran html-target-libgfortran
+maybe-html-target-libgfortran:
+@if target-libgfortran
+maybe-html-target-libgfortran: html-target-libgfortran
 
-html-target-libtermcap: \
-    configure-target-libtermcap 
+html-target-libgfortran: \
+    configure-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/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)/libtermcap" ; \
+       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)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -44641,25 +43001,25 @@ html-target-libtermcap: \
                   html) \
          || exit 1
 
-@endif target-libtermcap
+@endif target-libgfortran
 
-.PHONY: maybe-TAGS-target-libtermcap TAGS-target-libtermcap
-maybe-TAGS-target-libtermcap:
-@if target-libtermcap
-maybe-TAGS-target-libtermcap: TAGS-target-libtermcap
+.PHONY: maybe-TAGS-target-libgfortran TAGS-target-libgfortran
+maybe-TAGS-target-libgfortran:
+@if target-libgfortran
+maybe-TAGS-target-libgfortran: TAGS-target-libgfortran
 
-TAGS-target-libtermcap: \
-    configure-target-libtermcap 
+TAGS-target-libgfortran: \
+    configure-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/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)/libtermcap" ; \
+       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)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -44667,26 +43027,26 @@ TAGS-target-libtermcap: \
                   TAGS) \
          || exit 1
 
-@endif target-libtermcap
+@endif target-libgfortran
 
-.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-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-libtermcap: \
-    configure-target-libtermcap \
-    info-target-libtermcap 
+install-info-target-libgfortran: \
+    configure-target-libgfortran \
+    info-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/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)/libtermcap" ; \
+       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)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -44694,26 +43054,26 @@ install-info-target-libtermcap: \
                   install-info) \
          || exit 1
 
-@endif target-libtermcap
+@endif target-libgfortran
 
-.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-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-libtermcap: \
-    configure-target-libtermcap \
-    pdf-target-libtermcap 
+install-pdf-target-libgfortran: \
+    configure-target-libgfortran \
+    pdf-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/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)/libtermcap" ; \
+       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)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -44721,26 +43081,26 @@ install-pdf-target-libtermcap: \
                   install-pdf) \
          || exit 1
 
-@endif target-libtermcap
+@endif target-libgfortran
 
-.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-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-libtermcap: \
-    configure-target-libtermcap \
-    html-target-libtermcap 
+install-html-target-libgfortran: \
+    configure-target-libgfortran \
+    html-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/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)/libtermcap" ; \
+       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)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -44748,25 +43108,25 @@ install-html-target-libtermcap: \
                   install-html) \
          || exit 1
 
-@endif target-libtermcap
+@endif target-libgfortran
 
-.PHONY: maybe-installcheck-target-libtermcap installcheck-target-libtermcap
-maybe-installcheck-target-libtermcap:
-@if target-libtermcap
-maybe-installcheck-target-libtermcap: installcheck-target-libtermcap
+.PHONY: maybe-installcheck-target-libgfortran installcheck-target-libgfortran
+maybe-installcheck-target-libgfortran:
+@if target-libgfortran
+maybe-installcheck-target-libgfortran: installcheck-target-libgfortran
 
-installcheck-target-libtermcap: \
-    configure-target-libtermcap 
+installcheck-target-libgfortran: \
+    configure-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/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)/libtermcap" ; \
+       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)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -44774,170 +43134,246 @@ installcheck-target-libtermcap: \
                   installcheck) \
          || exit 1
 
-@endif target-libtermcap
+@endif target-libgfortran
 
-.PHONY: maybe-mostlyclean-target-libtermcap mostlyclean-target-libtermcap
-maybe-mostlyclean-target-libtermcap:
-@if target-libtermcap
-maybe-mostlyclean-target-libtermcap: mostlyclean-target-libtermcap
+.PHONY: maybe-mostlyclean-target-libgfortran mostlyclean-target-libgfortran
+maybe-mostlyclean-target-libgfortran:
+@if target-libgfortran
+maybe-mostlyclean-target-libgfortran: mostlyclean-target-libgfortran
 
-# libtermcap doesn't support mostlyclean.
-mostlyclean-target-libtermcap:
+mostlyclean-target-libgfortran: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgfortran"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
+         $(MAKE) $(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-libtermcap
+@endif target-libgfortran
 
-.PHONY: maybe-clean-target-libtermcap clean-target-libtermcap
-maybe-clean-target-libtermcap:
-@if target-libtermcap
-maybe-clean-target-libtermcap: clean-target-libtermcap
+.PHONY: maybe-clean-target-libgfortran clean-target-libgfortran
+maybe-clean-target-libgfortran:
+@if target-libgfortran
+maybe-clean-target-libgfortran: clean-target-libgfortran
 
-# libtermcap doesn't support clean.
-clean-target-libtermcap:
+clean-target-libgfortran: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing clean in $(TARGET_SUBDIR)/libgfortran"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
+         $(MAKE) $(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-libtermcap
+@endif target-libgfortran
 
-.PHONY: maybe-distclean-target-libtermcap distclean-target-libtermcap
-maybe-distclean-target-libtermcap:
-@if target-libtermcap
-maybe-distclean-target-libtermcap: distclean-target-libtermcap
+.PHONY: maybe-distclean-target-libgfortran distclean-target-libgfortran
+maybe-distclean-target-libgfortran:
+@if target-libgfortran
+maybe-distclean-target-libgfortran: distclean-target-libgfortran
 
-# libtermcap doesn't support distclean.
-distclean-target-libtermcap:
+distclean-target-libgfortran: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libgfortran"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
+         $(MAKE) $(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-libtermcap
+@endif target-libgfortran
 
-.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
+.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
 
-# libtermcap doesn't support maintainer-clean.
-maintainer-clean-target-libtermcap:
+maintainer-clean-target-libgfortran: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgfortran"; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
+         $(MAKE) $(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-libtermcap
+@endif target-libgfortran
 
 
 
 
 
-.PHONY: configure-target-winsup maybe-configure-target-winsup
-maybe-configure-target-winsup:
+.PHONY: configure-target-libobjc maybe-configure-target-libobjc
+maybe-configure-target-libobjc:
 @if gcc-bootstrap
-configure-target-winsup: stage_current
+configure-target-libobjc: stage_current
 @endif gcc-bootstrap
-@if target-winsup
-maybe-configure-target-winsup: configure-target-winsup
-configure-target-winsup: 
+@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 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 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)/winsup/Makefile; \
-           mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libobjc/Makefile; \
+           mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
+         mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo Configuring in $(TARGET_SUBDIR)/winsup; \
-       cd "$(TARGET_SUBDIR)/winsup" || exit 1; \
+       test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libobjc; \
+       cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/winsup/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libobjc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/winsup"; \
-       libsrcdir="$$s/winsup"; \
+       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-winsup
+@endif target-libobjc
 
 
 
 
 
-.PHONY: all-target-winsup maybe-all-target-winsup
-maybe-all-target-winsup:
+.PHONY: all-target-libobjc maybe-all-target-libobjc
+maybe-all-target-libobjc:
 @if gcc-bootstrap
-all-target-winsup: stage_current
+all-target-libobjc: 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-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)/winsup && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-winsup))
-@endif target-winsup
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libobjc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libobjc))
+@endif target-libobjc
 
 
 
 
 
-.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-libobjc maybe-check-target-libobjc
+maybe-check-target-libobjc:
+@if target-libobjc
+maybe-check-target-libobjc: check-target-libobjc
 
-check-target-winsup:
+check-target-libobjc:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
-@endif target-winsup
+@endif target-libobjc
 
-.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-libobjc maybe-install-target-libobjc
+maybe-install-target-libobjc:
+@if target-libobjc
+maybe-install-target-libobjc: install-target-libobjc
 
-install-target-winsup: 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)/winsup && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-winsup
+@endif target-libobjc
+
+.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-libobjc: installdirs
+       @: $(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)  install-strip)
+
+@endif target-libobjc
 
 # 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-libobjc info-target-libobjc
+maybe-info-target-libobjc:
+@if target-libobjc
+maybe-info-target-libobjc: info-target-libobjc
 
-info-target-winsup: \
-    configure-target-winsup 
+info-target-libobjc: \
+    configure-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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)/winsup && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -44945,25 +43381,25 @@ info-target-winsup: \
                   info) \
          || exit 1
 
-@endif target-winsup
+@endif target-libobjc
 
-.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-libobjc dvi-target-libobjc
+maybe-dvi-target-libobjc:
+@if target-libobjc
+maybe-dvi-target-libobjc: dvi-target-libobjc
 
-dvi-target-winsup: \
-    configure-target-winsup 
+dvi-target-libobjc: \
+    configure-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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)/winsup && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -44971,25 +43407,25 @@ dvi-target-winsup: \
                   dvi) \
          || exit 1
 
-@endif target-winsup
+@endif target-libobjc
 
-.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-libobjc pdf-target-libobjc
+maybe-pdf-target-libobjc:
+@if target-libobjc
+maybe-pdf-target-libobjc: pdf-target-libobjc
 
-pdf-target-winsup: \
-    configure-target-winsup 
+pdf-target-libobjc: \
+    configure-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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)/winsup && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -44997,25 +43433,25 @@ pdf-target-winsup: \
                   pdf) \
          || exit 1
 
-@endif target-winsup
+@endif target-libobjc
 
-.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-libobjc html-target-libobjc
+maybe-html-target-libobjc:
+@if target-libobjc
+maybe-html-target-libobjc: html-target-libobjc
 
-html-target-winsup: \
-    configure-target-winsup 
+html-target-libobjc: \
+    configure-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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)/winsup && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45023,25 +43459,25 @@ html-target-winsup: \
                   html) \
          || exit 1
 
-@endif target-winsup
+@endif target-libobjc
 
-.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-libobjc TAGS-target-libobjc
+maybe-TAGS-target-libobjc:
+@if target-libobjc
+maybe-TAGS-target-libobjc: TAGS-target-libobjc
 
-TAGS-target-winsup: \
-    configure-target-winsup 
+TAGS-target-libobjc: \
+    configure-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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)/winsup && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45049,26 +43485,26 @@ TAGS-target-winsup: \
                   TAGS) \
          || exit 1
 
-@endif target-winsup
+@endif target-libobjc
 
-.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-libobjc install-info-target-libobjc
+maybe-install-info-target-libobjc:
+@if target-libobjc
+maybe-install-info-target-libobjc: install-info-target-libobjc
 
-install-info-target-winsup: \
-    configure-target-winsup \
-    info-target-winsup 
+install-info-target-libobjc: \
+    configure-target-libobjc \
+    info-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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)/winsup && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45076,26 +43512,26 @@ install-info-target-winsup: \
                   install-info) \
          || exit 1
 
-@endif target-winsup
+@endif target-libobjc
 
-.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-libobjc install-pdf-target-libobjc
+maybe-install-pdf-target-libobjc:
+@if target-libobjc
+maybe-install-pdf-target-libobjc: install-pdf-target-libobjc
 
-install-pdf-target-winsup: \
-    configure-target-winsup \
-    pdf-target-winsup 
+install-pdf-target-libobjc: \
+    configure-target-libobjc \
+    pdf-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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)/winsup && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45103,26 +43539,26 @@ install-pdf-target-winsup: \
                   install-pdf) \
          || exit 1
 
-@endif target-winsup
+@endif target-libobjc
 
-.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-libobjc install-html-target-libobjc
+maybe-install-html-target-libobjc:
+@if target-libobjc
+maybe-install-html-target-libobjc: install-html-target-libobjc
 
-install-html-target-winsup: \
-    configure-target-winsup \
-    html-target-winsup 
+install-html-target-libobjc: \
+    configure-target-libobjc \
+    html-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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)/winsup && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45130,25 +43566,25 @@ install-html-target-winsup: \
                   install-html) \
          || exit 1
 
-@endif target-winsup
+@endif target-libobjc
 
-.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-libobjc installcheck-target-libobjc
+maybe-installcheck-target-libobjc:
+@if target-libobjc
+maybe-installcheck-target-libobjc: installcheck-target-libobjc
 
-installcheck-target-winsup: \
-    configure-target-winsup 
+installcheck-target-libobjc: \
+    configure-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/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)/winsup" ; \
+       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)/winsup && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45156,24 +43592,24 @@ installcheck-target-winsup: \
                   installcheck) \
          || exit 1
 
-@endif target-winsup
+@endif target-libobjc
 
-.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-libobjc mostlyclean-target-libobjc
+maybe-mostlyclean-target-libobjc:
+@if target-libobjc
+maybe-mostlyclean-target-libobjc: mostlyclean-target-libobjc
 
-mostlyclean-target-winsup: 
+mostlyclean-target-libobjc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/winsup" ; \
+       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)/winsup && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45181,24 +43617,24 @@ mostlyclean-target-winsup:
                   mostlyclean) \
          || exit 1
 
-@endif target-winsup
+@endif target-libobjc
 
-.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-libobjc clean-target-libobjc
+maybe-clean-target-libobjc:
+@if target-libobjc
+maybe-clean-target-libobjc: clean-target-libobjc
 
-clean-target-winsup: 
+clean-target-libobjc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/winsup" ; \
+       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)/winsup && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45206,24 +43642,24 @@ clean-target-winsup:
                   clean) \
          || exit 1
 
-@endif target-winsup
+@endif target-libobjc
 
-.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-libobjc distclean-target-libobjc
+maybe-distclean-target-libobjc:
+@if target-libobjc
+maybe-distclean-target-libobjc: distclean-target-libobjc
 
-distclean-target-winsup: 
+distclean-target-libobjc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/winsup" ; \
+       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)/winsup && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45231,24 +43667,24 @@ distclean-target-winsup:
                   distclean) \
          || exit 1
 
-@endif target-winsup
+@endif target-libobjc
 
-.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-libobjc maintainer-clean-target-libobjc
+maybe-maintainer-clean-target-libobjc:
+@if target-libobjc
+maybe-maintainer-clean-target-libobjc: maintainer-clean-target-libobjc
 
-maintainer-clean-target-winsup: 
+maintainer-clean-target-libobjc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/winsup" ; \
+       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)/winsup && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45256,125 +43692,146 @@ maintainer-clean-target-winsup:
                   maintainer-clean) \
          || exit 1
 
-@endif target-winsup
+@endif target-libobjc
 
 
 
 
 
-.PHONY: configure-target-libgloss maybe-configure-target-libgloss
-maybe-configure-target-libgloss:
+.PHONY: configure-target-libgo maybe-configure-target-libgo
+maybe-configure-target-libgo:
 @if gcc-bootstrap
-configure-target-libgloss: stage_current
+configure-target-libgo: stage_current
 @endif gcc-bootstrap
-@if target-libgloss
-maybe-configure-target-libgloss: configure-target-libgloss
-configure-target-libgloss: 
+@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 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; \
+       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)/libgloss/Makefile; \
-           mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libgo/Makefile; \
+           mv $(TARGET_SUBDIR)/libgo/multilib.tmp $(TARGET_SUBDIR)/libgo/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
+         mv $(TARGET_SUBDIR)/libgo/multilib.tmp $(TARGET_SUBDIR)/libgo/multilib.out; \
        fi; \
-       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; \
+       test ! -f $(TARGET_SUBDIR)/libgo/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgo; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libgo; \
+       cd "$(TARGET_SUBDIR)/libgo" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgloss/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libgo/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgloss"; \
-       libsrcdir="$$s/libgloss"; \
+       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-libgloss
+@endif target-libgo
 
 
 
 
 
-.PHONY: all-target-libgloss maybe-all-target-libgloss
-maybe-all-target-libgloss:
+.PHONY: all-target-libgo maybe-all-target-libgo
+maybe-all-target-libgo:
 @if gcc-bootstrap
-all-target-libgloss: stage_current
+all-target-libgo: 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-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)/libgloss && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libgloss))
-@endif target-libgloss
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libgo && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libgo))
+@endif target-libgo
 
 
 
 
 
-.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-libgo maybe-check-target-libgo
+maybe-check-target-libgo:
+@if target-libgo
+maybe-check-target-libgo: check-target-libgo
 
-# Dummy target for uncheckable module.
-check-target-libgloss:
+check-target-libgo:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libgo && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
-@endif target-libgloss
+@endif target-libgo
 
-.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-libgo maybe-install-target-libgo
+maybe-install-target-libgo:
+@if target-libgo
+maybe-install-target-libgo: install-target-libgo
 
-install-target-libgloss: 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)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-libgloss
+@endif target-libgo
+
+.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-libgo: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libgo && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libgo
 
 # 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-libgo info-target-libgo
+maybe-info-target-libgo:
+@if target-libgo
+maybe-info-target-libgo: info-target-libgo
 
-info-target-libgloss: \
-    configure-target-libgloss 
+info-target-libgo: \
+    configure-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45382,25 +43839,25 @@ info-target-libgloss: \
                   info) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libgo
 
-.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-libgo dvi-target-libgo
+maybe-dvi-target-libgo:
+@if target-libgo
+maybe-dvi-target-libgo: dvi-target-libgo
 
-dvi-target-libgloss: \
-    configure-target-libgloss 
+dvi-target-libgo: \
+    configure-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45408,25 +43865,25 @@ dvi-target-libgloss: \
                   dvi) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libgo
 
-.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-libgo pdf-target-libgo
+maybe-pdf-target-libgo:
+@if target-libgo
+maybe-pdf-target-libgo: pdf-target-libgo
 
-pdf-target-libgloss: \
-    configure-target-libgloss 
+pdf-target-libgo: \
+    configure-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45434,25 +43891,25 @@ pdf-target-libgloss: \
                   pdf) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libgo
 
-.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-libgo html-target-libgo
+maybe-html-target-libgo:
+@if target-libgo
+maybe-html-target-libgo: html-target-libgo
 
-html-target-libgloss: \
-    configure-target-libgloss 
+html-target-libgo: \
+    configure-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45460,25 +43917,25 @@ html-target-libgloss: \
                   html) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libgo
 
-.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-libgo TAGS-target-libgo
+maybe-TAGS-target-libgo:
+@if target-libgo
+maybe-TAGS-target-libgo: TAGS-target-libgo
 
-TAGS-target-libgloss: \
-    configure-target-libgloss 
+TAGS-target-libgo: \
+    configure-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45486,26 +43943,26 @@ TAGS-target-libgloss: \
                   TAGS) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libgo
 
-.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-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-libgloss: \
-    configure-target-libgloss \
-    info-target-libgloss 
+install-info-target-libgo: \
+    configure-target-libgo \
+    info-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45513,26 +43970,26 @@ install-info-target-libgloss: \
                   install-info) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libgo
 
-.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-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-libgloss: \
-    configure-target-libgloss \
-    pdf-target-libgloss 
+install-pdf-target-libgo: \
+    configure-target-libgo \
+    pdf-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45540,26 +43997,26 @@ install-pdf-target-libgloss: \
                   install-pdf) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libgo
 
-.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-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-libgloss: \
-    configure-target-libgloss \
-    html-target-libgloss 
+install-html-target-libgo: \
+    configure-target-libgo \
+    html-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45567,25 +44024,25 @@ install-html-target-libgloss: \
                   install-html) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libgo
 
-.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-libgo installcheck-target-libgo
+maybe-installcheck-target-libgo:
+@if target-libgo
+maybe-installcheck-target-libgo: installcheck-target-libgo
 
-installcheck-target-libgloss: \
-    configure-target-libgloss 
+installcheck-target-libgo: \
+    configure-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45593,24 +44050,24 @@ installcheck-target-libgloss: \
                   installcheck) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libgo
 
-.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-libgo mostlyclean-target-libgo
+maybe-mostlyclean-target-libgo:
+@if target-libgo
+maybe-mostlyclean-target-libgo: mostlyclean-target-libgo
 
-mostlyclean-target-libgloss: 
+mostlyclean-target-libgo: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45618,24 +44075,24 @@ mostlyclean-target-libgloss:
                   mostlyclean) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libgo
 
-.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-libgo clean-target-libgo
+maybe-clean-target-libgo:
+@if target-libgo
+maybe-clean-target-libgo: clean-target-libgo
 
-clean-target-libgloss: 
+clean-target-libgo: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45643,24 +44100,24 @@ clean-target-libgloss:
                   clean) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libgo
 
-.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-libgo distclean-target-libgo
+maybe-distclean-target-libgo:
+@if target-libgo
+maybe-distclean-target-libgo: distclean-target-libgo
 
-distclean-target-libgloss: 
+distclean-target-libgo: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45668,24 +44125,24 @@ distclean-target-libgloss:
                   distclean) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libgo
 
-.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-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-libgloss: 
+maintainer-clean-target-libgo: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/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)/libgloss" ; \
+       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)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45693,130 +44150,141 @@ maintainer-clean-target-libgloss:
                   maintainer-clean) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libgo
 
 
 
 
 
-.PHONY: configure-target-libiberty maybe-configure-target-libiberty
-maybe-configure-target-libiberty:
+.PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
+maybe-configure-target-libtermcap:
 @if gcc-bootstrap
-configure-target-libiberty: stage_current
+configure-target-libtermcap: stage_current
 @endif gcc-bootstrap
-@if target-libiberty
-maybe-configure-target-libiberty: configure-target-libiberty
-configure-target-libiberty: 
+@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 libiberty..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libiberty/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libiberty/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libiberty/multilib.tmp; \
+       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)/libiberty/Makefile; \
-           mv $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libtermcap/Makefile; \
+           mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; \
+         mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo Configuring in $(TARGET_SUBDIR)/libiberty; \
-       cd "$(TARGET_SUBDIR)/libiberty" || exit 1; \
+       test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libtermcap; \
+       cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libiberty/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libtermcap/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
+       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-libiberty
+@endif target-libtermcap
 
 
 
 
 
-.PHONY: all-target-libiberty maybe-all-target-libiberty
-maybe-all-target-libiberty:
+.PHONY: all-target-libtermcap maybe-all-target-libtermcap
+maybe-all-target-libtermcap:
 @if gcc-bootstrap
-all-target-libiberty: stage_current
+all-target-libtermcap: stage_current
 @endif gcc-bootstrap
-@if target-libiberty
-TARGET-target-libiberty=all
-maybe-all-target-libiberty: all-target-libiberty
-all-target-libiberty: configure-target-libiberty
+@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)/libiberty && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libiberty))
-@endif target-libiberty
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libtermcap))
+@endif target-libtermcap
+
+
 
 
 
+.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-libtermcap:
 
+@endif target-libtermcap
 
-.PHONY: check-target-libiberty maybe-check-target-libiberty
-maybe-check-target-libiberty:
-@if target-libiberty
-maybe-check-target-libiberty: check-target-libiberty
+.PHONY: install-target-libtermcap maybe-install-target-libtermcap
+maybe-install-target-libtermcap:
+@if target-libtermcap
+maybe-install-target-libtermcap: install-target-libtermcap
 
-check-target-libiberty:
+install-target-libtermcap: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libiberty && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+       (cd $(TARGET_SUBDIR)/libtermcap && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-libiberty
+@endif target-libtermcap
 
-.PHONY: install-target-libiberty maybe-install-target-libiberty
-maybe-install-target-libiberty:
-@if target-libiberty
-maybe-install-target-libiberty: install-target-libiberty
+.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-target-libiberty: 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)/libiberty && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+       (cd $(TARGET_SUBDIR)/libtermcap && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif target-libiberty
+@endif target-libtermcap
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-target-libiberty info-target-libiberty
-maybe-info-target-libiberty:
-@if target-libiberty
-maybe-info-target-libiberty: info-target-libiberty
+.PHONY: maybe-info-target-libtermcap info-target-libtermcap
+maybe-info-target-libtermcap:
+@if target-libtermcap
+maybe-info-target-libtermcap: info-target-libtermcap
 
-info-target-libiberty: \
-    configure-target-libiberty 
+info-target-libtermcap: \
+    configure-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45824,25 +44292,25 @@ info-target-libiberty: \
                   info) \
          || exit 1
 
-@endif target-libiberty
+@endif target-libtermcap
 
-.PHONY: maybe-dvi-target-libiberty dvi-target-libiberty
-maybe-dvi-target-libiberty:
-@if target-libiberty
-maybe-dvi-target-libiberty: dvi-target-libiberty
+.PHONY: maybe-dvi-target-libtermcap dvi-target-libtermcap
+maybe-dvi-target-libtermcap:
+@if target-libtermcap
+maybe-dvi-target-libtermcap: dvi-target-libtermcap
 
-dvi-target-libiberty: \
-    configure-target-libiberty 
+dvi-target-libtermcap: \
+    configure-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45850,25 +44318,25 @@ dvi-target-libiberty: \
                   dvi) \
          || exit 1
 
-@endif target-libiberty
+@endif target-libtermcap
 
-.PHONY: maybe-pdf-target-libiberty pdf-target-libiberty
-maybe-pdf-target-libiberty:
-@if target-libiberty
-maybe-pdf-target-libiberty: pdf-target-libiberty
+.PHONY: maybe-pdf-target-libtermcap pdf-target-libtermcap
+maybe-pdf-target-libtermcap:
+@if target-libtermcap
+maybe-pdf-target-libtermcap: pdf-target-libtermcap
 
-pdf-target-libiberty: \
-    configure-target-libiberty 
+pdf-target-libtermcap: \
+    configure-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45876,25 +44344,25 @@ pdf-target-libiberty: \
                   pdf) \
          || exit 1
 
-@endif target-libiberty
+@endif target-libtermcap
 
-.PHONY: maybe-html-target-libiberty html-target-libiberty
-maybe-html-target-libiberty:
-@if target-libiberty
-maybe-html-target-libiberty: html-target-libiberty
+.PHONY: maybe-html-target-libtermcap html-target-libtermcap
+maybe-html-target-libtermcap:
+@if target-libtermcap
+maybe-html-target-libtermcap: html-target-libtermcap
 
-html-target-libiberty: \
-    configure-target-libiberty 
+html-target-libtermcap: \
+    configure-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45902,25 +44370,25 @@ html-target-libiberty: \
                   html) \
          || exit 1
 
-@endif target-libiberty
+@endif target-libtermcap
 
-.PHONY: maybe-TAGS-target-libiberty TAGS-target-libiberty
-maybe-TAGS-target-libiberty:
-@if target-libiberty
-maybe-TAGS-target-libiberty: TAGS-target-libiberty
+.PHONY: maybe-TAGS-target-libtermcap TAGS-target-libtermcap
+maybe-TAGS-target-libtermcap:
+@if target-libtermcap
+maybe-TAGS-target-libtermcap: TAGS-target-libtermcap
 
-TAGS-target-libiberty: \
-    configure-target-libiberty 
+TAGS-target-libtermcap: \
+    configure-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45928,26 +44396,26 @@ TAGS-target-libiberty: \
                   TAGS) \
          || exit 1
 
-@endif target-libiberty
+@endif target-libtermcap
 
-.PHONY: maybe-install-info-target-libiberty install-info-target-libiberty
-maybe-install-info-target-libiberty:
-@if target-libiberty
-maybe-install-info-target-libiberty: install-info-target-libiberty
+.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-libiberty: \
-    configure-target-libiberty \
-    info-target-libiberty 
+install-info-target-libtermcap: \
+    configure-target-libtermcap \
+    info-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45955,26 +44423,26 @@ install-info-target-libiberty: \
                   install-info) \
          || exit 1
 
-@endif target-libiberty
+@endif target-libtermcap
 
-.PHONY: maybe-install-pdf-target-libiberty install-pdf-target-libiberty
-maybe-install-pdf-target-libiberty:
-@if target-libiberty
-maybe-install-pdf-target-libiberty: install-pdf-target-libiberty
+.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-libiberty: \
-    configure-target-libiberty \
-    pdf-target-libiberty 
+install-pdf-target-libtermcap: \
+    configure-target-libtermcap \
+    pdf-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -45982,26 +44450,26 @@ install-pdf-target-libiberty: \
                   install-pdf) \
          || exit 1
 
-@endif target-libiberty
+@endif target-libtermcap
 
-.PHONY: maybe-install-html-target-libiberty install-html-target-libiberty
-maybe-install-html-target-libiberty:
-@if target-libiberty
-maybe-install-html-target-libiberty: install-html-target-libiberty
+.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-libiberty: \
-    configure-target-libiberty \
-    html-target-libiberty 
+install-html-target-libtermcap: \
+    configure-target-libtermcap \
+    html-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46009,25 +44477,25 @@ install-html-target-libiberty: \
                   install-html) \
          || exit 1
 
-@endif target-libiberty
+@endif target-libtermcap
 
-.PHONY: maybe-installcheck-target-libiberty installcheck-target-libiberty
-maybe-installcheck-target-libiberty:
-@if target-libiberty
-maybe-installcheck-target-libiberty: installcheck-target-libiberty
+.PHONY: maybe-installcheck-target-libtermcap installcheck-target-libtermcap
+maybe-installcheck-target-libtermcap:
+@if target-libtermcap
+maybe-installcheck-target-libtermcap: installcheck-target-libtermcap
 
-installcheck-target-libiberty: \
-    configure-target-libiberty 
+installcheck-target-libtermcap: \
+    configure-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46035,230 +44503,186 @@ installcheck-target-libiberty: \
                   installcheck) \
          || exit 1
 
-@endif target-libiberty
+@endif target-libtermcap
 
-.PHONY: maybe-mostlyclean-target-libiberty mostlyclean-target-libiberty
-maybe-mostlyclean-target-libiberty:
-@if target-libiberty
-maybe-mostlyclean-target-libiberty: mostlyclean-target-libiberty
+.PHONY: maybe-mostlyclean-target-libtermcap mostlyclean-target-libtermcap
+maybe-mostlyclean-target-libtermcap:
+@if target-libtermcap
+maybe-mostlyclean-target-libtermcap: mostlyclean-target-libtermcap
 
-mostlyclean-target-libiberty: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libiberty" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libiberty && \
-         $(MAKE) $(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-libiberty
+@endif target-libtermcap
 
-.PHONY: maybe-clean-target-libiberty clean-target-libiberty
-maybe-clean-target-libiberty:
-@if target-libiberty
-maybe-clean-target-libiberty: clean-target-libiberty
+.PHONY: maybe-clean-target-libtermcap clean-target-libtermcap
+maybe-clean-target-libtermcap:
+@if target-libtermcap
+maybe-clean-target-libtermcap: clean-target-libtermcap
 
-clean-target-libiberty: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libiberty" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libiberty && \
-         $(MAKE) $(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-libiberty
+@endif target-libtermcap
 
-.PHONY: maybe-distclean-target-libiberty distclean-target-libiberty
-maybe-distclean-target-libiberty:
-@if target-libiberty
-maybe-distclean-target-libiberty: distclean-target-libiberty
+.PHONY: maybe-distclean-target-libtermcap distclean-target-libtermcap
+maybe-distclean-target-libtermcap:
+@if target-libtermcap
+maybe-distclean-target-libtermcap: distclean-target-libtermcap
 
-distclean-target-libiberty: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libiberty" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libiberty && \
-         $(MAKE) $(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-libiberty
+@endif target-libtermcap
 
-.PHONY: maybe-maintainer-clean-target-libiberty maintainer-clean-target-libiberty
-maybe-maintainer-clean-target-libiberty:
-@if target-libiberty
-maybe-maintainer-clean-target-libiberty: maintainer-clean-target-libiberty
+.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-libiberty: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libiberty && \
-         $(MAKE) $(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-libiberty
+@endif target-libtermcap
 
 
 
 
 
-.PHONY: configure-target-gperf maybe-configure-target-gperf
-maybe-configure-target-gperf:
+.PHONY: configure-target-winsup maybe-configure-target-winsup
+maybe-configure-target-winsup:
 @if gcc-bootstrap
-configure-target-gperf: stage_current
+configure-target-winsup: stage_current
 @endif gcc-bootstrap
-@if target-gperf
-maybe-configure-target-gperf: configure-target-gperf
-configure-target-gperf: 
+@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 gperf..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/gperf/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/gperf/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/gperf/multilib.tmp $(TARGET_SUBDIR)/gperf/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/gperf/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)/gperf/Makefile; \
-           mv $(TARGET_SUBDIR)/gperf/multilib.tmp $(TARGET_SUBDIR)/gperf/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/winsup/Makefile; \
+           mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/gperf/multilib.tmp $(TARGET_SUBDIR)/gperf/multilib.out; \
+         mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/gperf/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo Configuring in $(TARGET_SUBDIR)/gperf; \
-       cd "$(TARGET_SUBDIR)/gperf" || exit 1; \
+       test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/winsup; \
+       cd "$(TARGET_SUBDIR)/winsup" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/gperf/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/winsup/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gperf"; \
-       libsrcdir="$$s/gperf"; \
+       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-gperf
+@endif target-winsup
 
 
 
 
 
-.PHONY: all-target-gperf maybe-all-target-gperf
-maybe-all-target-gperf:
+.PHONY: all-target-winsup maybe-all-target-winsup
+maybe-all-target-winsup:
 @if gcc-bootstrap
-all-target-gperf: stage_current
+all-target-winsup: stage_current
 @endif gcc-bootstrap
-@if target-gperf
-TARGET-target-gperf=all
-maybe-all-target-gperf: all-target-gperf
-all-target-gperf: configure-target-gperf
+@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)/gperf && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-gperf))
-@endif target-gperf
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/winsup && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-winsup))
+@endif target-winsup
 
 
 
 
 
-.PHONY: check-target-gperf maybe-check-target-gperf
-maybe-check-target-gperf:
-@if target-gperf
-maybe-check-target-gperf: check-target-gperf
+.PHONY: check-target-winsup maybe-check-target-winsup
+maybe-check-target-winsup:
+@if target-winsup
+maybe-check-target-winsup: check-target-winsup
 
-check-target-gperf:
+check-target-winsup:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/gperf && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
-@endif target-gperf
+@endif target-winsup
 
-.PHONY: install-target-gperf maybe-install-target-gperf
-maybe-install-target-gperf:
-@if target-gperf
-maybe-install-target-gperf: install-target-gperf
+.PHONY: install-target-winsup maybe-install-target-winsup
+maybe-install-target-winsup:
+@if target-winsup
+maybe-install-target-winsup: install-target-winsup
 
-install-target-gperf: 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)/gperf && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-gperf
+@endif target-winsup
+
+.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-winsup: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/winsup && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-winsup
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-target-gperf info-target-gperf
-maybe-info-target-gperf:
-@if target-gperf
-maybe-info-target-gperf: info-target-gperf
+.PHONY: maybe-info-target-winsup info-target-winsup
+maybe-info-target-winsup:
+@if target-winsup
+maybe-info-target-winsup: info-target-winsup
 
-info-target-gperf: \
-    configure-target-gperf 
+info-target-winsup: \
+    configure-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46266,25 +44690,25 @@ info-target-gperf: \
                   info) \
          || exit 1
 
-@endif target-gperf
+@endif target-winsup
 
-.PHONY: maybe-dvi-target-gperf dvi-target-gperf
-maybe-dvi-target-gperf:
-@if target-gperf
-maybe-dvi-target-gperf: dvi-target-gperf
+.PHONY: maybe-dvi-target-winsup dvi-target-winsup
+maybe-dvi-target-winsup:
+@if target-winsup
+maybe-dvi-target-winsup: dvi-target-winsup
 
-dvi-target-gperf: \
-    configure-target-gperf 
+dvi-target-winsup: \
+    configure-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46292,25 +44716,25 @@ dvi-target-gperf: \
                   dvi) \
          || exit 1
 
-@endif target-gperf
+@endif target-winsup
 
-.PHONY: maybe-pdf-target-gperf pdf-target-gperf
-maybe-pdf-target-gperf:
-@if target-gperf
-maybe-pdf-target-gperf: pdf-target-gperf
+.PHONY: maybe-pdf-target-winsup pdf-target-winsup
+maybe-pdf-target-winsup:
+@if target-winsup
+maybe-pdf-target-winsup: pdf-target-winsup
 
-pdf-target-gperf: \
-    configure-target-gperf 
+pdf-target-winsup: \
+    configure-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46318,25 +44742,25 @@ pdf-target-gperf: \
                   pdf) \
          || exit 1
 
-@endif target-gperf
+@endif target-winsup
 
-.PHONY: maybe-html-target-gperf html-target-gperf
-maybe-html-target-gperf:
-@if target-gperf
-maybe-html-target-gperf: html-target-gperf
+.PHONY: maybe-html-target-winsup html-target-winsup
+maybe-html-target-winsup:
+@if target-winsup
+maybe-html-target-winsup: html-target-winsup
 
-html-target-gperf: \
-    configure-target-gperf 
+html-target-winsup: \
+    configure-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46344,25 +44768,25 @@ html-target-gperf: \
                   html) \
          || exit 1
 
-@endif target-gperf
+@endif target-winsup
 
-.PHONY: maybe-TAGS-target-gperf TAGS-target-gperf
-maybe-TAGS-target-gperf:
-@if target-gperf
-maybe-TAGS-target-gperf: TAGS-target-gperf
+.PHONY: maybe-TAGS-target-winsup TAGS-target-winsup
+maybe-TAGS-target-winsup:
+@if target-winsup
+maybe-TAGS-target-winsup: TAGS-target-winsup
 
-TAGS-target-gperf: \
-    configure-target-gperf 
+TAGS-target-winsup: \
+    configure-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46370,26 +44794,26 @@ TAGS-target-gperf: \
                   TAGS) \
          || exit 1
 
-@endif target-gperf
+@endif target-winsup
 
-.PHONY: maybe-install-info-target-gperf install-info-target-gperf
-maybe-install-info-target-gperf:
-@if target-gperf
-maybe-install-info-target-gperf: install-info-target-gperf
+.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-gperf: \
-    configure-target-gperf \
-    info-target-gperf 
+install-info-target-winsup: \
+    configure-target-winsup \
+    info-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46397,26 +44821,26 @@ install-info-target-gperf: \
                   install-info) \
          || exit 1
 
-@endif target-gperf
+@endif target-winsup
 
-.PHONY: maybe-install-pdf-target-gperf install-pdf-target-gperf
-maybe-install-pdf-target-gperf:
-@if target-gperf
-maybe-install-pdf-target-gperf: install-pdf-target-gperf
+.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-gperf: \
-    configure-target-gperf \
-    pdf-target-gperf 
+install-pdf-target-winsup: \
+    configure-target-winsup \
+    pdf-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46424,26 +44848,26 @@ install-pdf-target-gperf: \
                   install-pdf) \
          || exit 1
 
-@endif target-gperf
+@endif target-winsup
 
-.PHONY: maybe-install-html-target-gperf install-html-target-gperf
-maybe-install-html-target-gperf:
-@if target-gperf
-maybe-install-html-target-gperf: install-html-target-gperf
+.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-gperf: \
-    configure-target-gperf \
-    html-target-gperf 
+install-html-target-winsup: \
+    configure-target-winsup \
+    html-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46451,25 +44875,25 @@ install-html-target-gperf: \
                   install-html) \
          || exit 1
 
-@endif target-gperf
+@endif target-winsup
 
-.PHONY: maybe-installcheck-target-gperf installcheck-target-gperf
-maybe-installcheck-target-gperf:
-@if target-gperf
-maybe-installcheck-target-gperf: installcheck-target-gperf
+.PHONY: maybe-installcheck-target-winsup installcheck-target-winsup
+maybe-installcheck-target-winsup:
+@if target-winsup
+maybe-installcheck-target-winsup: installcheck-target-winsup
 
-installcheck-target-gperf: \
-    configure-target-gperf 
+installcheck-target-winsup: \
+    configure-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46477,24 +44901,24 @@ installcheck-target-gperf: \
                   installcheck) \
          || exit 1
 
-@endif target-gperf
+@endif target-winsup
 
-.PHONY: maybe-mostlyclean-target-gperf mostlyclean-target-gperf
-maybe-mostlyclean-target-gperf:
-@if target-gperf
-maybe-mostlyclean-target-gperf: mostlyclean-target-gperf
+.PHONY: maybe-mostlyclean-target-winsup mostlyclean-target-winsup
+maybe-mostlyclean-target-winsup:
+@if target-winsup
+maybe-mostlyclean-target-winsup: mostlyclean-target-winsup
 
-mostlyclean-target-gperf: 
+mostlyclean-target-winsup: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46502,24 +44926,24 @@ mostlyclean-target-gperf:
                   mostlyclean) \
          || exit 1
 
-@endif target-gperf
+@endif target-winsup
 
-.PHONY: maybe-clean-target-gperf clean-target-gperf
-maybe-clean-target-gperf:
-@if target-gperf
-maybe-clean-target-gperf: clean-target-gperf
+.PHONY: maybe-clean-target-winsup clean-target-winsup
+maybe-clean-target-winsup:
+@if target-winsup
+maybe-clean-target-winsup: clean-target-winsup
 
-clean-target-gperf: 
+clean-target-winsup: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46527,24 +44951,24 @@ clean-target-gperf:
                   clean) \
          || exit 1
 
-@endif target-gperf
+@endif target-winsup
 
-.PHONY: maybe-distclean-target-gperf distclean-target-gperf
-maybe-distclean-target-gperf:
-@if target-gperf
-maybe-distclean-target-gperf: distclean-target-gperf
+.PHONY: maybe-distclean-target-winsup distclean-target-winsup
+maybe-distclean-target-winsup:
+@if target-winsup
+maybe-distclean-target-winsup: distclean-target-winsup
 
-distclean-target-gperf: 
+distclean-target-winsup: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46552,24 +44976,24 @@ distclean-target-gperf:
                   distclean) \
          || exit 1
 
-@endif target-gperf
+@endif target-winsup
 
-.PHONY: maybe-maintainer-clean-target-gperf maintainer-clean-target-gperf
-maybe-maintainer-clean-target-gperf:
-@if target-gperf
-maybe-maintainer-clean-target-gperf: maintainer-clean-target-gperf
+.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-gperf: 
+maintainer-clean-target-winsup: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46577,120 +45001,141 @@ maintainer-clean-target-gperf:
                   maintainer-clean) \
          || exit 1
 
-@endif target-gperf
+@endif target-winsup
 
 
 
 
 
-.PHONY: configure-target-examples maybe-configure-target-examples
-maybe-configure-target-examples:
+.PHONY: configure-target-libgloss maybe-configure-target-libgloss
+maybe-configure-target-libgloss:
 @if gcc-bootstrap
-configure-target-examples: stage_current
+configure-target-libgloss: stage_current
 @endif gcc-bootstrap
-@if target-examples
-maybe-configure-target-examples: configure-target-examples
-configure-target-examples: 
+@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 examples..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/examples/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/examples/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/examples/multilib.tmp $(TARGET_SUBDIR)/examples/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/examples/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)/examples/Makefile; \
-           mv $(TARGET_SUBDIR)/examples/multilib.tmp $(TARGET_SUBDIR)/examples/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libgloss/Makefile; \
+           mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/examples/multilib.tmp $(TARGET_SUBDIR)/examples/multilib.out; \
+         mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/examples/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo Configuring in $(TARGET_SUBDIR)/examples; \
-       cd "$(TARGET_SUBDIR)/examples" || 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)/examples/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libgloss/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/examples"; \
-       libsrcdir="$$s/examples"; \
+       module_srcdir=libgloss; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
-@endif target-examples
+@endif target-libgloss
 
 
 
 
 
-.PHONY: all-target-examples maybe-all-target-examples
-maybe-all-target-examples:
+.PHONY: all-target-libgloss maybe-all-target-libgloss
+maybe-all-target-libgloss:
 @if gcc-bootstrap
-all-target-examples: stage_current
+all-target-libgloss: stage_current
 @endif gcc-bootstrap
-@if target-examples
-TARGET-target-examples=all
-maybe-all-target-examples: all-target-examples
-all-target-examples: configure-target-examples
+@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; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/examples && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-examples))
-@endif target-examples
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libgloss && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libgloss))
+@endif target-libgloss
 
 
 
 
 
-.PHONY: check-target-examples maybe-check-target-examples
-maybe-check-target-examples:
-@if target-examples
-maybe-check-target-examples: check-target-examples
+.PHONY: check-target-libgloss maybe-check-target-libgloss
+maybe-check-target-libgloss:
+@if target-libgloss
+maybe-check-target-libgloss: check-target-libgloss
 
 # Dummy target for uncheckable module.
-check-target-examples:
+check-target-libgloss:
 
-@endif target-examples
+@endif target-libgloss
 
-.PHONY: install-target-examples maybe-install-target-examples
-maybe-install-target-examples:
-@if target-examples
-maybe-install-target-examples: install-target-examples
+.PHONY: install-target-libgloss maybe-install-target-libgloss
+maybe-install-target-libgloss:
+@if target-libgloss
+maybe-install-target-libgloss: install-target-libgloss
 
-# Dummy target for uninstallable.
-install-target-examples:
+install-target-libgloss: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libgloss && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libgloss
+
+.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-libgloss: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libgloss && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif target-examples
+@endif target-libgloss
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-target-examples info-target-examples
-maybe-info-target-examples:
-@if target-examples
-maybe-info-target-examples: info-target-examples
+.PHONY: maybe-info-target-libgloss info-target-libgloss
+maybe-info-target-libgloss:
+@if target-libgloss
+maybe-info-target-libgloss: info-target-libgloss
 
-info-target-examples: \
-    configure-target-examples 
+info-target-libgloss: \
+    configure-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/examples" ; \
+       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)/examples && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46698,25 +45143,25 @@ info-target-examples: \
                   info) \
          || exit 1
 
-@endif target-examples
+@endif target-libgloss
 
-.PHONY: maybe-dvi-target-examples dvi-target-examples
-maybe-dvi-target-examples:
-@if target-examples
-maybe-dvi-target-examples: dvi-target-examples
+.PHONY: maybe-dvi-target-libgloss dvi-target-libgloss
+maybe-dvi-target-libgloss:
+@if target-libgloss
+maybe-dvi-target-libgloss: dvi-target-libgloss
 
-dvi-target-examples: \
-    configure-target-examples 
+dvi-target-libgloss: \
+    configure-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/examples" ; \
+       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)/examples && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46724,25 +45169,25 @@ dvi-target-examples: \
                   dvi) \
          || exit 1
 
-@endif target-examples
+@endif target-libgloss
 
-.PHONY: maybe-pdf-target-examples pdf-target-examples
-maybe-pdf-target-examples:
-@if target-examples
-maybe-pdf-target-examples: pdf-target-examples
+.PHONY: maybe-pdf-target-libgloss pdf-target-libgloss
+maybe-pdf-target-libgloss:
+@if target-libgloss
+maybe-pdf-target-libgloss: pdf-target-libgloss
 
-pdf-target-examples: \
-    configure-target-examples 
+pdf-target-libgloss: \
+    configure-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/examples" ; \
+       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)/examples && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46750,25 +45195,25 @@ pdf-target-examples: \
                   pdf) \
          || exit 1
 
-@endif target-examples
+@endif target-libgloss
 
-.PHONY: maybe-html-target-examples html-target-examples
-maybe-html-target-examples:
-@if target-examples
-maybe-html-target-examples: html-target-examples
+.PHONY: maybe-html-target-libgloss html-target-libgloss
+maybe-html-target-libgloss:
+@if target-libgloss
+maybe-html-target-libgloss: html-target-libgloss
 
-html-target-examples: \
-    configure-target-examples 
+html-target-libgloss: \
+    configure-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/examples" ; \
+       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)/examples && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46776,25 +45221,25 @@ html-target-examples: \
                   html) \
          || exit 1
 
-@endif target-examples
+@endif target-libgloss
 
-.PHONY: maybe-TAGS-target-examples TAGS-target-examples
-maybe-TAGS-target-examples:
-@if target-examples
-maybe-TAGS-target-examples: TAGS-target-examples
+.PHONY: maybe-TAGS-target-libgloss TAGS-target-libgloss
+maybe-TAGS-target-libgloss:
+@if target-libgloss
+maybe-TAGS-target-libgloss: TAGS-target-libgloss
 
-TAGS-target-examples: \
-    configure-target-examples 
+TAGS-target-libgloss: \
+    configure-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/examples" ; \
+       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)/examples && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46802,26 +45247,26 @@ TAGS-target-examples: \
                   TAGS) \
          || exit 1
 
-@endif target-examples
+@endif target-libgloss
 
-.PHONY: maybe-install-info-target-examples install-info-target-examples
-maybe-install-info-target-examples:
-@if target-examples
-maybe-install-info-target-examples: install-info-target-examples
+.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-examples: \
-    configure-target-examples \
-    info-target-examples 
+install-info-target-libgloss: \
+    configure-target-libgloss \
+    info-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/examples" ; \
+       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)/examples && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46829,26 +45274,26 @@ install-info-target-examples: \
                   install-info) \
          || exit 1
 
-@endif target-examples
+@endif target-libgloss
 
-.PHONY: maybe-install-pdf-target-examples install-pdf-target-examples
-maybe-install-pdf-target-examples:
-@if target-examples
-maybe-install-pdf-target-examples: install-pdf-target-examples
+.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-examples: \
-    configure-target-examples \
-    pdf-target-examples 
+install-pdf-target-libgloss: \
+    configure-target-libgloss \
+    pdf-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-pdf in $(TARGET_SUBDIR)/examples" ; \
+       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)/examples && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46856,26 +45301,26 @@ install-pdf-target-examples: \
                   install-pdf) \
          || exit 1
 
-@endif target-examples
+@endif target-libgloss
 
-.PHONY: maybe-install-html-target-examples install-html-target-examples
-maybe-install-html-target-examples:
-@if target-examples
-maybe-install-html-target-examples: install-html-target-examples
+.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-examples: \
-    configure-target-examples \
-    html-target-examples 
+install-html-target-libgloss: \
+    configure-target-libgloss \
+    html-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-html in $(TARGET_SUBDIR)/examples" ; \
+       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)/examples && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46883,25 +45328,25 @@ install-html-target-examples: \
                   install-html) \
          || exit 1
 
-@endif target-examples
+@endif target-libgloss
 
-.PHONY: maybe-installcheck-target-examples installcheck-target-examples
-maybe-installcheck-target-examples:
-@if target-examples
-maybe-installcheck-target-examples: installcheck-target-examples
+.PHONY: maybe-installcheck-target-libgloss installcheck-target-libgloss
+maybe-installcheck-target-libgloss:
+@if target-libgloss
+maybe-installcheck-target-libgloss: installcheck-target-libgloss
 
-installcheck-target-examples: \
-    configure-target-examples 
+installcheck-target-libgloss: \
+    configure-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/examples" ; \
+       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)/examples && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46909,24 +45354,24 @@ installcheck-target-examples: \
                   installcheck) \
          || exit 1
 
-@endif target-examples
+@endif target-libgloss
 
-.PHONY: maybe-mostlyclean-target-examples mostlyclean-target-examples
-maybe-mostlyclean-target-examples:
-@if target-examples
-maybe-mostlyclean-target-examples: mostlyclean-target-examples
+.PHONY: maybe-mostlyclean-target-libgloss mostlyclean-target-libgloss
+maybe-mostlyclean-target-libgloss:
+@if target-libgloss
+maybe-mostlyclean-target-libgloss: mostlyclean-target-libgloss
 
-mostlyclean-target-examples: 
+mostlyclean-target-libgloss: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/examples" ; \
+       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)/examples && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46934,24 +45379,24 @@ mostlyclean-target-examples:
                   mostlyclean) \
          || exit 1
 
-@endif target-examples
+@endif target-libgloss
 
-.PHONY: maybe-clean-target-examples clean-target-examples
-maybe-clean-target-examples:
-@if target-examples
-maybe-clean-target-examples: clean-target-examples
+.PHONY: maybe-clean-target-libgloss clean-target-libgloss
+maybe-clean-target-libgloss:
+@if target-libgloss
+maybe-clean-target-libgloss: clean-target-libgloss
 
-clean-target-examples: 
+clean-target-libgloss: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/examples" ; \
+       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)/examples && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46959,24 +45404,24 @@ clean-target-examples:
                   clean) \
          || exit 1
 
-@endif target-examples
+@endif target-libgloss
 
-.PHONY: maybe-distclean-target-examples distclean-target-examples
-maybe-distclean-target-examples:
-@if target-examples
-maybe-distclean-target-examples: distclean-target-examples
+.PHONY: maybe-distclean-target-libgloss distclean-target-libgloss
+maybe-distclean-target-libgloss:
+@if target-libgloss
+maybe-distclean-target-libgloss: distclean-target-libgloss
 
-distclean-target-examples: 
+distclean-target-libgloss: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/examples" ; \
+       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)/examples && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -46984,24 +45429,24 @@ distclean-target-examples:
                   distclean) \
          || exit 1
 
-@endif target-examples
+@endif target-libgloss
 
-.PHONY: maybe-maintainer-clean-target-examples maintainer-clean-target-examples
-maybe-maintainer-clean-target-examples:
-@if target-examples
-maybe-maintainer-clean-target-examples: maintainer-clean-target-examples
+.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-examples: 
+maintainer-clean-target-libgloss: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/examples" ; \
+       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)/examples && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47009,7 +45454,7 @@ maintainer-clean-target-examples:
                   maintainer-clean) \
          || exit 1
 
-@endif target-examples
+@endif target-libgloss
 
 
 
@@ -47027,8 +45472,8 @@ configure-target-libffi:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        echo "Checking multilib configuration for libffi..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libffi/multilib.tmp 2> /dev/null ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libffi/multilib.tmp 2> /dev/null; \
        if test -r $(TARGET_SUBDIR)/libffi/multilib.out; then \
          if cmp -s $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; then \
            rm -f $(TARGET_SUBDIR)/libffi/multilib.tmp; \
@@ -47040,8 +45485,8 @@ configure-target-libffi:
          mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \
        fi; \
        test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
-       $(NORMAL_TARGET_EXPORTS) \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi; \
+       $(NORMAL_TARGET_EXPORTS)  \
        echo Configuring in $(TARGET_SUBDIR)/libffi; \
        cd "$(TARGET_SUBDIR)/libffi" || exit 1; \
        case $(srcdir) in \
@@ -47049,12 +45494,13 @@ configure-target-libffi:
          *) topdir=`echo $(TARGET_SUBDIR)/libffi/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libffi"; \
-       libsrcdir="$$s/libffi"; \
+       module_srcdir=libffi; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif target-libffi
 
@@ -47074,9 +45520,9 @@ all-target-libffi: configure-target-libffi
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
+       $(NORMAL_TARGET_EXPORTS)  \
        (cd $(TARGET_SUBDIR)/libffi && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
                $(TARGET-target-libffi))
 @endif target-libffi
 
@@ -47104,13 +45550,18 @@ maybe-install-target-libffi:
 @if target-libffi
 maybe-install-target-libffi: install-target-libffi
 
-install-target-libffi: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libffi && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+# Dummy target for uninstallable.
+install-target-libffi:
+
+@endif target-libffi
+
+.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
+
+# Dummy target for uninstallable.
+install-strip-target-libffi:
 
 @endif target-libffi
 
@@ -47124,11 +45575,11 @@ maybe-info-target-libffi: info-target-libffi
 info-target-libffi: \
     configure-target-libffi 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -47150,11 +45601,11 @@ maybe-dvi-target-libffi: dvi-target-libffi
 dvi-target-libffi: \
     configure-target-libffi 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -47176,11 +45627,11 @@ maybe-pdf-target-libffi: pdf-target-libffi
 pdf-target-libffi: \
     configure-target-libffi 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -47202,11 +45653,11 @@ maybe-html-target-libffi: html-target-libffi
 html-target-libffi: \
     configure-target-libffi 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -47228,11 +45679,11 @@ maybe-TAGS-target-libffi: TAGS-target-libffi
 TAGS-target-libffi: \
     configure-target-libffi 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -47255,11 +45706,11 @@ install-info-target-libffi: \
     configure-target-libffi \
     info-target-libffi 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -47282,11 +45733,11 @@ install-pdf-target-libffi: \
     configure-target-libffi \
     pdf-target-libffi 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-pdf in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -47309,11 +45760,11 @@ install-html-target-libffi: \
     configure-target-libffi \
     html-target-libffi 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-html in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -47335,11 +45786,11 @@ maybe-installcheck-target-libffi: installcheck-target-libffi
 installcheck-target-libffi: \
     configure-target-libffi 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -47360,11 +45811,11 @@ maybe-mostlyclean-target-libffi: mostlyclean-target-libffi
 
 mostlyclean-target-libffi: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -47385,11 +45836,11 @@ maybe-clean-target-libffi: clean-target-libffi
 
 clean-target-libffi: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -47410,11 +45861,11 @@ maybe-distclean-target-libffi: distclean-target-libffi
 
 distclean-target-libffi: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -47435,11 +45886,11 @@ maybe-maintainer-clean-target-libffi: maintainer-clean-target-libffi
 
 maintainer-clean-target-libffi: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libffi" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libffi"; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
@@ -47457,124 +45908,140 @@ maintainer-clean-target-libffi:
 
 
 
-.PHONY: configure-target-libjava maybe-configure-target-libjava
-maybe-configure-target-libjava:
+.PHONY: configure-target-zlib maybe-configure-target-zlib
+maybe-configure-target-zlib:
 @if gcc-bootstrap
-configure-target-libjava: stage_current
+configure-target-zlib: stage_current
 @endif gcc-bootstrap
-@if target-libjava
-maybe-configure-target-libjava: configure-target-libjava
-configure-target-libjava: 
+@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 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 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)/libjava/Makefile; \
-           mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/zlib/Makefile; \
+           mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \
+         mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/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)/zlib/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/zlib; \
+       cd "$(TARGET_SUBDIR)/zlib" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libjava/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/zlib/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libjava"; \
-       libsrcdir="$$s/libjava"; \
+       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-libjava
+@endif target-zlib
 
 
 
 
 
-.PHONY: all-target-libjava maybe-all-target-libjava
-maybe-all-target-libjava:
+.PHONY: all-target-zlib maybe-all-target-zlib
+maybe-all-target-zlib:
 @if gcc-bootstrap
-all-target-libjava: stage_current
+all-target-zlib: 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-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; \
-       $(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)/zlib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-zlib))
+@endif target-zlib
 
 
 
 
 
-.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-zlib maybe-check-target-zlib
+maybe-check-target-zlib:
+@if target-zlib
+maybe-check-target-zlib: check-target-zlib
 
-check-target-libjava:
+check-target-zlib:
        @: $(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)
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/zlib && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
-@endif target-libjava
+@endif target-zlib
 
-.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-zlib maybe-install-target-zlib
+maybe-install-target-zlib:
+@if target-zlib
+maybe-install-target-zlib: install-target-zlib
 
-install-target-libjava: installdirs
+install-target-zlib: 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)/zlib && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-libjava
+@endif target-zlib
+
+.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-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)
+
+@endif target-zlib
 
 # 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-zlib info-target-zlib
+maybe-info-target-zlib:
+@if target-zlib
+maybe-info-target-zlib: info-target-zlib
 
-info-target-libjava: \
-    configure-target-libjava 
+info-target-zlib: \
+    configure-target-zlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib"; \
        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)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47582,25 +46049,25 @@ info-target-libjava: \
                   info) \
          || exit 1
 
-@endif target-libjava
+@endif target-zlib
 
-.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-zlib dvi-target-zlib
+maybe-dvi-target-zlib:
+@if target-zlib
+maybe-dvi-target-zlib: dvi-target-zlib
 
-dvi-target-libjava: \
-    configure-target-libjava 
+dvi-target-zlib: \
+    configure-target-zlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib"; \
        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)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47608,25 +46075,25 @@ dvi-target-libjava: \
                   dvi) \
          || exit 1
 
-@endif target-libjava
+@endif target-zlib
 
-.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-zlib pdf-target-zlib
+maybe-pdf-target-zlib:
+@if target-zlib
+maybe-pdf-target-zlib: pdf-target-zlib
 
-pdf-target-libjava: \
-    configure-target-libjava 
+pdf-target-zlib: \
+    configure-target-zlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib"; \
        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)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47634,25 +46101,25 @@ pdf-target-libjava: \
                   pdf) \
          || exit 1
 
-@endif target-libjava
+@endif target-zlib
 
-.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-zlib html-target-zlib
+maybe-html-target-zlib:
+@if target-zlib
+maybe-html-target-zlib: html-target-zlib
 
-html-target-libjava: \
-    configure-target-libjava 
+html-target-zlib: \
+    configure-target-zlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib"; \
        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)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47660,25 +46127,25 @@ html-target-libjava: \
                   html) \
          || exit 1
 
-@endif target-libjava
+@endif target-zlib
 
-.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-zlib TAGS-target-zlib
+maybe-TAGS-target-zlib:
+@if target-zlib
+maybe-TAGS-target-zlib: TAGS-target-zlib
 
-TAGS-target-libjava: \
-    configure-target-libjava 
+TAGS-target-zlib: \
+    configure-target-zlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib"; \
        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)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47686,26 +46153,26 @@ TAGS-target-libjava: \
                   TAGS) \
          || exit 1
 
-@endif target-libjava
+@endif target-zlib
 
-.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-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-libjava: \
-    configure-target-libjava \
-    info-target-libjava 
+install-info-target-zlib: \
+    configure-target-zlib \
+    info-target-zlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib"; \
        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)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47713,26 +46180,26 @@ install-info-target-libjava: \
                   install-info) \
          || exit 1
 
-@endif target-libjava
+@endif target-zlib
 
-.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-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-libjava: \
-    configure-target-libjava \
-    pdf-target-libjava 
+install-pdf-target-zlib: \
+    configure-target-zlib \
+    pdf-target-zlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib"; \
        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)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47740,26 +46207,26 @@ install-pdf-target-libjava: \
                   install-pdf) \
          || exit 1
 
-@endif target-libjava
+@endif target-zlib
 
-.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-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-libjava: \
-    configure-target-libjava \
-    html-target-libjava 
+install-html-target-zlib: \
+    configure-target-zlib \
+    html-target-zlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib"; \
        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)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47767,25 +46234,25 @@ install-html-target-libjava: \
                   install-html) \
          || exit 1
 
-@endif target-libjava
+@endif target-zlib
 
-.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-zlib installcheck-target-zlib
+maybe-installcheck-target-zlib:
+@if target-zlib
+maybe-installcheck-target-zlib: installcheck-target-zlib
 
-installcheck-target-libjava: \
-    configure-target-libjava 
+installcheck-target-zlib: \
+    configure-target-zlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib"; \
        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)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47793,24 +46260,24 @@ installcheck-target-libjava: \
                   installcheck) \
          || exit 1
 
-@endif target-libjava
+@endif target-zlib
 
-.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-zlib mostlyclean-target-zlib
+maybe-mostlyclean-target-zlib:
+@if target-zlib
+maybe-mostlyclean-target-zlib: mostlyclean-target-zlib
 
-mostlyclean-target-libjava: 
+mostlyclean-target-zlib: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib"; \
        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)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47818,24 +46285,24 @@ mostlyclean-target-libjava:
                   mostlyclean) \
          || exit 1
 
-@endif target-libjava
+@endif target-zlib
 
-.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-zlib clean-target-zlib
+maybe-clean-target-zlib:
+@if target-zlib
+maybe-clean-target-zlib: clean-target-zlib
 
-clean-target-libjava: 
+clean-target-zlib: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib"; \
        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)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47843,24 +46310,24 @@ clean-target-libjava:
                   clean) \
          || exit 1
 
-@endif target-libjava
+@endif target-zlib
 
-.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-zlib distclean-target-zlib
+maybe-distclean-target-zlib:
+@if target-zlib
+maybe-distclean-target-zlib: distclean-target-zlib
 
-distclean-target-libjava: 
+distclean-target-zlib: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib"; \
        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)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47868,24 +46335,24 @@ distclean-target-libjava:
                   distclean) \
          || exit 1
 
-@endif target-libjava
+@endif target-zlib
 
-.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-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-libjava: 
+maintainer-clean-target-zlib: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib"; \
        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)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47893,130 +46360,146 @@ maintainer-clean-target-libjava:
                   maintainer-clean) \
          || exit 1
 
-@endif target-libjava
+@endif target-zlib
 
 
 
 
 
-.PHONY: configure-target-zlib maybe-configure-target-zlib
-maybe-configure-target-zlib:
+.PHONY: configure-target-rda maybe-configure-target-rda
+maybe-configure-target-rda:
 @if gcc-bootstrap
-configure-target-zlib: stage_current
+configure-target-rda: stage_current
 @endif gcc-bootstrap
-@if target-zlib
-maybe-configure-target-zlib: configure-target-zlib
-configure-target-zlib: 
+@if target-rda
+maybe-configure-target-rda: configure-target-rda
+configure-target-rda: 
        @: $(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 rda..."; \
+       $(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; \
          else \
-           rm -f $(TARGET_SUBDIR)/zlib/Makefile; \
-           mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/rda/Makefile; \
+           mv $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; \
+         mv $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo Configuring in $(TARGET_SUBDIR)/zlib; \
-       cd "$(TARGET_SUBDIR)/zlib" || exit 1; \
+       test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/rda; \
+       cd "$(TARGET_SUBDIR)/rda" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/zlib/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/rda/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
+       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-zlib
+@endif target-rda
 
 
 
 
 
-.PHONY: all-target-zlib maybe-all-target-zlib
-maybe-all-target-zlib:
+.PHONY: all-target-rda maybe-all-target-rda
+maybe-all-target-rda:
 @if gcc-bootstrap
-all-target-zlib: stage_current
+all-target-rda: 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-rda
+TARGET-target-rda=all
+maybe-all-target-rda: all-target-rda
+all-target-rda: configure-target-rda
        @: $(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
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/rda && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-rda))
+@endif target-rda
 
 
 
 
 
-.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-rda maybe-check-target-rda
+maybe-check-target-rda:
+@if target-rda
+maybe-check-target-rda: check-target-rda
 
-check-target-zlib:
+check-target-rda:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/rda && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
-@endif target-zlib
+@endif target-rda
 
-.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-rda maybe-install-target-rda
+maybe-install-target-rda:
+@if target-rda
+maybe-install-target-rda: install-target-rda
 
-install-target-zlib: installdirs
+install-target-rda: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/rda && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-zlib
+@endif target-rda
+
+.PHONY: install-strip-target-rda maybe-install-strip-target-rda
+maybe-install-strip-target-rda:
+@if target-rda
+maybe-install-strip-target-rda: install-strip-target-rda
+
+install-strip-target-rda: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/rda && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-rda
 
 # 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-rda info-target-rda
+maybe-info-target-rda:
+@if target-rda
+maybe-info-target-rda: info-target-rda
 
-info-target-zlib: \
-    configure-target-zlib 
+info-target-rda: \
+    configure-target-rda 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/rda && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48024,25 +46507,25 @@ info-target-zlib: \
                   info) \
          || exit 1
 
-@endif target-zlib
+@endif target-rda
 
-.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-rda dvi-target-rda
+maybe-dvi-target-rda:
+@if target-rda
+maybe-dvi-target-rda: dvi-target-rda
 
-dvi-target-zlib: \
-    configure-target-zlib 
+dvi-target-rda: \
+    configure-target-rda 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/rda && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48050,25 +46533,25 @@ dvi-target-zlib: \
                   dvi) \
          || exit 1
 
-@endif target-zlib
+@endif target-rda
 
-.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-rda pdf-target-rda
+maybe-pdf-target-rda:
+@if target-rda
+maybe-pdf-target-rda: pdf-target-rda
 
-pdf-target-zlib: \
-    configure-target-zlib 
+pdf-target-rda: \
+    configure-target-rda 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/rda && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48076,25 +46559,25 @@ pdf-target-zlib: \
                   pdf) \
          || exit 1
 
-@endif target-zlib
+@endif target-rda
 
-.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-rda html-target-rda
+maybe-html-target-rda:
+@if target-rda
+maybe-html-target-rda: html-target-rda
 
-html-target-zlib: \
-    configure-target-zlib 
+html-target-rda: \
+    configure-target-rda 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/rda && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48102,25 +46585,25 @@ html-target-zlib: \
                   html) \
          || exit 1
 
-@endif target-zlib
+@endif target-rda
 
-.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-rda TAGS-target-rda
+maybe-TAGS-target-rda:
+@if target-rda
+maybe-TAGS-target-rda: TAGS-target-rda
 
-TAGS-target-zlib: \
-    configure-target-zlib 
+TAGS-target-rda: \
+    configure-target-rda 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/rda && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48128,26 +46611,26 @@ TAGS-target-zlib: \
                   TAGS) \
          || exit 1
 
-@endif target-zlib
+@endif target-rda
 
-.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-rda install-info-target-rda
+maybe-install-info-target-rda:
+@if target-rda
+maybe-install-info-target-rda: install-info-target-rda
 
-install-info-target-zlib: \
-    configure-target-zlib \
-    info-target-zlib 
+install-info-target-rda: \
+    configure-target-rda \
+    info-target-rda 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/rda && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48155,26 +46638,26 @@ install-info-target-zlib: \
                   install-info) \
          || exit 1
 
-@endif target-zlib
+@endif target-rda
 
-.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-rda install-pdf-target-rda
+maybe-install-pdf-target-rda:
+@if target-rda
+maybe-install-pdf-target-rda: install-pdf-target-rda
 
-install-pdf-target-zlib: \
-    configure-target-zlib \
-    pdf-target-zlib 
+install-pdf-target-rda: \
+    configure-target-rda \
+    pdf-target-rda 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/rda && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48182,26 +46665,26 @@ install-pdf-target-zlib: \
                   install-pdf) \
          || exit 1
 
-@endif target-zlib
+@endif target-rda
 
-.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-rda install-html-target-rda
+maybe-install-html-target-rda:
+@if target-rda
+maybe-install-html-target-rda: install-html-target-rda
 
-install-html-target-zlib: \
-    configure-target-zlib \
-    html-target-zlib 
+install-html-target-rda: \
+    configure-target-rda \
+    html-target-rda 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/rda && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48209,25 +46692,25 @@ install-html-target-zlib: \
                   install-html) \
          || exit 1
 
-@endif target-zlib
+@endif target-rda
 
-.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-rda installcheck-target-rda
+maybe-installcheck-target-rda:
+@if target-rda
+maybe-installcheck-target-rda: installcheck-target-rda
 
-installcheck-target-zlib: \
-    configure-target-zlib 
+installcheck-target-rda: \
+    configure-target-rda 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/rda && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48235,24 +46718,24 @@ installcheck-target-zlib: \
                   installcheck) \
          || exit 1
 
-@endif target-zlib
+@endif target-rda
 
-.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-rda mostlyclean-target-rda
+maybe-mostlyclean-target-rda:
+@if target-rda
+maybe-mostlyclean-target-rda: mostlyclean-target-rda
 
-mostlyclean-target-zlib: 
+mostlyclean-target-rda: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/rda && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48260,24 +46743,24 @@ mostlyclean-target-zlib:
                   mostlyclean) \
          || exit 1
 
-@endif target-zlib
+@endif target-rda
 
-.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-rda clean-target-rda
+maybe-clean-target-rda:
+@if target-rda
+maybe-clean-target-rda: clean-target-rda
 
-clean-target-zlib: 
+clean-target-rda: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/rda && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48285,24 +46768,24 @@ clean-target-zlib:
                   clean) \
          || exit 1
 
-@endif target-zlib
+@endif target-rda
 
-.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-rda distclean-target-rda
+maybe-distclean-target-rda:
+@if target-rda
+maybe-distclean-target-rda: distclean-target-rda
 
-distclean-target-zlib: 
+distclean-target-rda: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/rda && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48310,24 +46793,24 @@ distclean-target-zlib:
                   distclean) \
          || exit 1
 
-@endif target-zlib
+@endif target-rda
 
-.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-rda maintainer-clean-target-rda
+maybe-maintainer-clean-target-rda:
+@if target-rda
+maybe-maintainer-clean-target-rda: maintainer-clean-target-rda
 
-maintainer-clean-target-zlib: 
+maintainer-clean-target-rda: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/zlib/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)/zlib" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/zlib && \
+       (cd $(TARGET_SUBDIR)/rda && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48335,130 +46818,146 @@ maintainer-clean-target-zlib:
                   maintainer-clean) \
          || exit 1
 
-@endif target-zlib
+@endif target-rda
 
 
 
 
 
-.PHONY: configure-target-boehm-gc maybe-configure-target-boehm-gc
-maybe-configure-target-boehm-gc:
+.PHONY: configure-target-libada maybe-configure-target-libada
+maybe-configure-target-libada:
 @if gcc-bootstrap
-configure-target-boehm-gc: stage_current
+configure-target-libada: stage_current
 @endif gcc-bootstrap
-@if target-boehm-gc
-maybe-configure-target-boehm-gc: configure-target-boehm-gc
-configure-target-boehm-gc: 
+@if target-libada
+maybe-configure-target-libada: configure-target-libada
+configure-target-libada: 
        @: $(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 libada..."; \
+       $(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; \
          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)/libada/Makefile; \
+           mv $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; \
+         mv $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo Configuring in $(TARGET_SUBDIR)/boehm-gc; \
-       cd "$(TARGET_SUBDIR)/boehm-gc" || exit 1; \
+       test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libada; \
+       cd "$(TARGET_SUBDIR)/libada" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/boehm-gc/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libada/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/boehm-gc"; \
-       libsrcdir="$$s/boehm-gc"; \
+       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-boehm-gc
+@endif target-libada
 
 
 
 
 
-.PHONY: all-target-boehm-gc maybe-all-target-boehm-gc
-maybe-all-target-boehm-gc:
+.PHONY: all-target-libada maybe-all-target-libada
+maybe-all-target-libada:
 @if gcc-bootstrap
-all-target-boehm-gc: stage_current
+all-target-libada: 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-libada
+TARGET-target-libada=all
+maybe-all-target-libada: all-target-libada
+all-target-libada: configure-target-libada
        @: $(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
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libada && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libada))
+@endif target-libada
 
 
 
 
 
-.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-libada maybe-check-target-libada
+maybe-check-target-libada:
+@if target-libada
+maybe-check-target-libada: check-target-libada
 
-check-target-boehm-gc:
+check-target-libada:
        @: $(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)/libada && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
-@endif target-boehm-gc
+@endif target-libada
 
-.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-libada maybe-install-target-libada
+maybe-install-target-libada:
+@if target-libada
+maybe-install-target-libada: install-target-libada
 
-install-target-boehm-gc: installdirs
+install-target-libada: 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)/libada && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-boehm-gc
+@endif target-libada
+
+.PHONY: install-strip-target-libada maybe-install-strip-target-libada
+maybe-install-strip-target-libada:
+@if target-libada
+maybe-install-strip-target-libada: install-strip-target-libada
+
+install-strip-target-libada: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libada && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libada
 
 # 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-libada info-target-libada
+maybe-info-target-libada:
+@if target-libada
+maybe-info-target-libada: info-target-libada
 
-info-target-boehm-gc: \
-    configure-target-boehm-gc 
+info-target-libada: \
+    configure-target-libada 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/libada && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48466,25 +46965,25 @@ info-target-boehm-gc: \
                   info) \
          || exit 1
 
-@endif target-boehm-gc
+@endif target-libada
 
-.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-libada dvi-target-libada
+maybe-dvi-target-libada:
+@if target-libada
+maybe-dvi-target-libada: dvi-target-libada
 
-dvi-target-boehm-gc: \
-    configure-target-boehm-gc 
+dvi-target-libada: \
+    configure-target-libada 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/libada && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48492,25 +46991,25 @@ dvi-target-boehm-gc: \
                   dvi) \
          || exit 1
 
-@endif target-boehm-gc
+@endif target-libada
 
-.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-libada pdf-target-libada
+maybe-pdf-target-libada:
+@if target-libada
+maybe-pdf-target-libada: pdf-target-libada
 
-pdf-target-boehm-gc: \
-    configure-target-boehm-gc 
+pdf-target-libada: \
+    configure-target-libada 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/libada && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48518,25 +47017,25 @@ pdf-target-boehm-gc: \
                   pdf) \
          || exit 1
 
-@endif target-boehm-gc
+@endif target-libada
 
-.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-libada html-target-libada
+maybe-html-target-libada:
+@if target-libada
+maybe-html-target-libada: html-target-libada
 
-html-target-boehm-gc: \
-    configure-target-boehm-gc 
+html-target-libada: \
+    configure-target-libada 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/libada && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48544,25 +47043,25 @@ html-target-boehm-gc: \
                   html) \
          || exit 1
 
-@endif target-boehm-gc
+@endif target-libada
 
-.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-libada TAGS-target-libada
+maybe-TAGS-target-libada:
+@if target-libada
+maybe-TAGS-target-libada: TAGS-target-libada
 
-TAGS-target-boehm-gc: \
-    configure-target-boehm-gc 
+TAGS-target-libada: \
+    configure-target-libada 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/libada && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48570,26 +47069,26 @@ TAGS-target-boehm-gc: \
                   TAGS) \
          || exit 1
 
-@endif target-boehm-gc
+@endif target-libada
 
-.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-libada install-info-target-libada
+maybe-install-info-target-libada:
+@if target-libada
+maybe-install-info-target-libada: install-info-target-libada
 
-install-info-target-boehm-gc: \
-    configure-target-boehm-gc \
-    info-target-boehm-gc 
+install-info-target-libada: \
+    configure-target-libada \
+    info-target-libada 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/libada && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48597,26 +47096,26 @@ install-info-target-boehm-gc: \
                   install-info) \
          || exit 1
 
-@endif target-boehm-gc
+@endif target-libada
 
-.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-libada install-pdf-target-libada
+maybe-install-pdf-target-libada:
+@if target-libada
+maybe-install-pdf-target-libada: install-pdf-target-libada
 
-install-pdf-target-boehm-gc: \
-    configure-target-boehm-gc \
-    pdf-target-boehm-gc 
+install-pdf-target-libada: \
+    configure-target-libada \
+    pdf-target-libada 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/libada && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48624,26 +47123,26 @@ install-pdf-target-boehm-gc: \
                   install-pdf) \
          || exit 1
 
-@endif target-boehm-gc
+@endif target-libada
 
-.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-libada install-html-target-libada
+maybe-install-html-target-libada:
+@if target-libada
+maybe-install-html-target-libada: install-html-target-libada
 
-install-html-target-boehm-gc: \
-    configure-target-boehm-gc \
-    html-target-boehm-gc 
+install-html-target-libada: \
+    configure-target-libada \
+    html-target-libada 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/libada && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48651,25 +47150,25 @@ install-html-target-boehm-gc: \
                   install-html) \
          || exit 1
 
-@endif target-boehm-gc
+@endif target-libada
 
-.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-libada installcheck-target-libada
+maybe-installcheck-target-libada:
+@if target-libada
+maybe-installcheck-target-libada: installcheck-target-libada
 
-installcheck-target-boehm-gc: \
-    configure-target-boehm-gc 
+installcheck-target-libada: \
+    configure-target-libada 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/libada && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48677,24 +47176,24 @@ installcheck-target-boehm-gc: \
                   installcheck) \
          || exit 1
 
-@endif target-boehm-gc
+@endif target-libada
 
-.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-libada mostlyclean-target-libada
+maybe-mostlyclean-target-libada:
+@if target-libada
+maybe-mostlyclean-target-libada: mostlyclean-target-libada
 
-mostlyclean-target-boehm-gc: 
+mostlyclean-target-libada: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/libada && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48702,24 +47201,24 @@ mostlyclean-target-boehm-gc:
                   mostlyclean) \
          || exit 1
 
-@endif target-boehm-gc
+@endif target-libada
 
-.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-libada clean-target-libada
+maybe-clean-target-libada:
+@if target-libada
+maybe-clean-target-libada: clean-target-libada
 
-clean-target-boehm-gc: 
+clean-target-libada: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/libada && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48727,24 +47226,24 @@ clean-target-boehm-gc:
                   clean) \
          || exit 1
 
-@endif target-boehm-gc
+@endif target-libada
 
-.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-libada distclean-target-libada
+maybe-distclean-target-libada:
+@if target-libada
+maybe-distclean-target-libada: distclean-target-libada
 
-distclean-target-boehm-gc: 
+distclean-target-libada: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/libada && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48752,24 +47251,24 @@ distclean-target-boehm-gc:
                   distclean) \
          || exit 1
 
-@endif target-boehm-gc
+@endif target-libada
 
-.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-libada maintainer-clean-target-libada
+maybe-maintainer-clean-target-libada:
+@if target-libada
+maybe-maintainer-clean-target-libada: maintainer-clean-target-libada
 
-maintainer-clean-target-boehm-gc: 
+maintainer-clean-target-libada: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
+       (cd $(TARGET_SUBDIR)/libada && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48777,572 +47276,670 @@ maintainer-clean-target-boehm-gc:
                   maintainer-clean) \
          || exit 1
 
-@endif target-boehm-gc
+@endif target-libada
 
 
 
 
 
-.PHONY: configure-target-qthreads maybe-configure-target-qthreads
-maybe-configure-target-qthreads:
+.PHONY: configure-target-libgomp maybe-configure-target-libgomp
+maybe-configure-target-libgomp:
 @if gcc-bootstrap
-configure-target-qthreads: stage_current
+configure-target-libgomp: stage_current
 @endif gcc-bootstrap
-@if target-qthreads
-maybe-configure-target-qthreads: configure-target-qthreads
-configure-target-qthreads: 
-       @: $(MAKE); $(unstage)
+@if target-libgomp
+maybe-configure-target-libgomp: configure-target-libgomp
+configure-target-libgomp: 
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for qthreads..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/qthreads/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/qthreads/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/qthreads/multilib.tmp $(TARGET_SUBDIR)/qthreads/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/qthreads/multilib.tmp; \
+       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; \
+       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; \
          else \
-           rm -f $(TARGET_SUBDIR)/qthreads/Makefile; \
-           mv $(TARGET_SUBDIR)/qthreads/multilib.tmp $(TARGET_SUBDIR)/qthreads/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \
+           mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/qthreads/multilib.tmp $(TARGET_SUBDIR)/qthreads/multilib.out; \
+         mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/qthreads/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo Configuring in $(TARGET_SUBDIR)/qthreads; \
-       cd "$(TARGET_SUBDIR)/qthreads" || exit 1; \
+       test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libgomp; \
+       cd "$(TARGET_SUBDIR)/libgomp" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/qthreads/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/qthreads"; \
-       libsrcdir="$$s/qthreads"; \
+       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-qthreads
-
-
+@endif target-libgomp
 
 
 
-.PHONY: all-target-qthreads maybe-all-target-qthreads
-maybe-all-target-qthreads:
-@if gcc-bootstrap
-all-target-qthreads: stage_current
-@endif gcc-bootstrap
-@if target-qthreads
-TARGET-target-qthreads=all
-maybe-all-target-qthreads: all-target-qthreads
-all-target-qthreads: configure-target-qthreads
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage1-target-libgomp maybe-configure-stage1-target-libgomp
+maybe-configure-stage1-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-configure-stage1-target-libgomp: configure-stage1-target-libgomp
+configure-stage1-target-libgomp:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp
        @r=`${PWD_COMMAND}`; export r; \
        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; \
+       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; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \
+           mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-qthreads))
-@endif target-qthreads
-
-
-
-
-
-.PHONY: check-target-qthreads maybe-check-target-qthreads
-maybe-check-target-qthreads:
-@if target-qthreads
-maybe-check-target-qthreads: check-target-qthreads
-
-check-target-qthreads:
-       @: $(MAKE); $(unstage)
+       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; \
+       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; \
+       module_srcdir=libgomp; \
+       $(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-libgomp-bootstrap
+
+.PHONY: configure-stage2-target-libgomp maybe-configure-stage2-target-libgomp
+maybe-configure-stage2-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-configure-stage2-target-libgomp: configure-stage2-target-libgomp
+configure-stage2-target-libgomp:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp
        @r=`${PWD_COMMAND}`; export r; \
        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; \
+       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; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \
+           mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-qthreads
-
-.PHONY: install-target-qthreads maybe-install-target-qthreads
-maybe-install-target-qthreads:
-@if target-qthreads
-maybe-install-target-qthreads: install-target-qthreads
-
-install-target-qthreads: installdirs
-       @: $(MAKE); $(unstage)
+        \
+       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; \
+       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; \
+       module_srcdir=libgomp; \
+       $(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-libgomp-bootstrap
+
+.PHONY: configure-stage3-target-libgomp maybe-configure-stage3-target-libgomp
+maybe-configure-stage3-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-configure-stage3-target-libgomp: configure-stage3-target-libgomp
+configure-stage3-target-libgomp:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp
        @r=`${PWD_COMMAND}`; export r; \
        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; \
+       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; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \
+           mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-qthreads
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-target-qthreads info-target-qthreads
-maybe-info-target-qthreads:
-@if target-qthreads
-maybe-info-target-qthreads: info-target-qthreads
-
-info-target-qthreads: \
-    configure-target-qthreads 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/qthreads" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(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-qthreads
-
-.PHONY: maybe-dvi-target-qthreads dvi-target-qthreads
-maybe-dvi-target-qthreads:
-@if target-qthreads
-maybe-dvi-target-qthreads: dvi-target-qthreads
-
-dvi-target-qthreads: \
-    configure-target-qthreads 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/qthreads" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(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-qthreads
-
-.PHONY: maybe-pdf-target-qthreads pdf-target-qthreads
-maybe-pdf-target-qthreads:
-@if target-qthreads
-maybe-pdf-target-qthreads: pdf-target-qthreads
-
-pdf-target-qthreads: \
-    configure-target-qthreads 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/qthreads" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(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-qthreads
-
-.PHONY: maybe-html-target-qthreads html-target-qthreads
-maybe-html-target-qthreads:
-@if target-qthreads
-maybe-html-target-qthreads: html-target-qthreads
-
-html-target-qthreads: \
-    configure-target-qthreads 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/qthreads" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(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-qthreads
-
-.PHONY: maybe-TAGS-target-qthreads TAGS-target-qthreads
-maybe-TAGS-target-qthreads:
-@if target-qthreads
-maybe-TAGS-target-qthreads: TAGS-target-qthreads
-
-TAGS-target-qthreads: \
-    configure-target-qthreads 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
+        \
+       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; \
+       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; \
+       module_srcdir=libgomp; \
+       $(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-libgomp-bootstrap
+
+.PHONY: configure-stage4-target-libgomp maybe-configure-stage4-target-libgomp
+maybe-configure-stage4-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-configure-stage4-target-libgomp: configure-stage4-target-libgomp
+configure-stage4-target-libgomp:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp
+       @r=`${PWD_COMMAND}`; export r; \
        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; \
+       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; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \
+           mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/qthreads" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(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-qthreads
-
-.PHONY: maybe-install-info-target-qthreads install-info-target-qthreads
-maybe-install-info-target-qthreads:
-@if target-qthreads
-maybe-install-info-target-qthreads: install-info-target-qthreads
-
-install-info-target-qthreads: \
-    configure-target-qthreads \
-    info-target-qthreads 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
+        \
+       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; \
+       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; \
+       module_srcdir=libgomp; \
+       $(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-libgomp-bootstrap
+
+.PHONY: configure-stageprofile-target-libgomp maybe-configure-stageprofile-target-libgomp
+maybe-configure-stageprofile-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-configure-stageprofile-target-libgomp: configure-stageprofile-target-libgomp
+configure-stageprofile-target-libgomp:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp
+       @r=`${PWD_COMMAND}`; export r; \
        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; \
+       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; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \
+           mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/qthreads" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(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-qthreads
-
-.PHONY: maybe-install-pdf-target-qthreads install-pdf-target-qthreads
-maybe-install-pdf-target-qthreads:
-@if target-qthreads
-maybe-install-pdf-target-qthreads: install-pdf-target-qthreads
-
-install-pdf-target-qthreads: \
-    configure-target-qthreads \
-    pdf-target-qthreads 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
+        \
+       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; \
+       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; \
+       module_srcdir=libgomp; \
+       $(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-libgomp-bootstrap
+
+.PHONY: configure-stagefeedback-target-libgomp maybe-configure-stagefeedback-target-libgomp
+maybe-configure-stagefeedback-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-configure-stagefeedback-target-libgomp: configure-stagefeedback-target-libgomp
+configure-stagefeedback-target-libgomp:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp
+       @r=`${PWD_COMMAND}`; export r; \
        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; \
+       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; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \
+           mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-pdf in $(TARGET_SUBDIR)/qthreads" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(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-qthreads
+        \
+       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; \
+       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; \
+       module_srcdir=libgomp; \
+       $(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-libgomp-bootstrap
 
-.PHONY: maybe-install-html-target-qthreads install-html-target-qthreads
-maybe-install-html-target-qthreads:
-@if target-qthreads
-maybe-install-html-target-qthreads: install-html-target-qthreads
 
-install-html-target-qthreads: \
-    configure-target-qthreads \
-    html-target-qthreads 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/qthreads/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)/qthreads" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(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-qthreads
 
-.PHONY: maybe-installcheck-target-qthreads installcheck-target-qthreads
-maybe-installcheck-target-qthreads:
-@if target-qthreads
-maybe-installcheck-target-qthreads: installcheck-target-qthreads
 
-installcheck-target-qthreads: \
-    configure-target-qthreads 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-target-libgomp maybe-all-target-libgomp
+maybe-all-target-libgomp:
+@if gcc-bootstrap
+all-target-libgomp: stage_current
+@endif gcc-bootstrap
+@if target-libgomp
+TARGET-target-libgomp=all
+maybe-all-target-libgomp: all-target-libgomp
+all-target-libgomp: configure-target-libgomp
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/qthreads" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(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
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libgomp && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libgomp))
+@endif target-libgomp
 
-@endif target-qthreads
 
-.PHONY: maybe-mostlyclean-target-qthreads mostlyclean-target-qthreads
-maybe-mostlyclean-target-qthreads:
-@if target-qthreads
-maybe-mostlyclean-target-qthreads: mostlyclean-target-qthreads
 
-mostlyclean-target-qthreads: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stage1-target-libgomp maybe-all-stage1-target-libgomp
+.PHONY: clean-stage1-target-libgomp maybe-clean-stage1-target-libgomp
+maybe-all-stage1-target-libgomp:
+maybe-clean-stage1-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-all-stage1-target-libgomp: all-stage1-target-libgomp
+all-stage1: all-stage1-target-libgomp
+TARGET-stage1-target-libgomp = $(TARGET-target-libgomp)
+all-stage1-target-libgomp: configure-stage1-target-libgomp
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/qthreads" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(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-qthreads
-
-.PHONY: maybe-clean-target-qthreads clean-target-qthreads
-maybe-clean-target-qthreads:
-@if target-qthreads
-maybe-clean-target-qthreads: clean-target-qthreads
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       cd $(TARGET_SUBDIR)/libgomp && \
+        \
+       $(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-libgomp)
 
-clean-target-qthreads: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
+maybe-clean-stage1-target-libgomp: clean-stage1-target-libgomp
+clean-stage1: clean-stage1-target-libgomp
+clean-stage1-target-libgomp:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage1-libgomp/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libgomp && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
+         clean
+@endif target-libgomp-bootstrap
+
+
+.PHONY: all-stage2-target-libgomp maybe-all-stage2-target-libgomp
+.PHONY: clean-stage2-target-libgomp maybe-clean-stage2-target-libgomp
+maybe-all-stage2-target-libgomp:
+maybe-clean-stage2-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-all-stage2-target-libgomp: all-stage2-target-libgomp
+all-stage2: all-stage2-target-libgomp
+TARGET-stage2-target-libgomp = $(TARGET-target-libgomp)
+all-stage2-target-libgomp: configure-stage2-target-libgomp
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/qthreads" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(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-qthreads
-
-.PHONY: maybe-distclean-target-qthreads distclean-target-qthreads
-maybe-distclean-target-qthreads:
-@if target-qthreads
-maybe-distclean-target-qthreads: distclean-target-qthreads
-
-distclean-target-qthreads: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
+         \
+       cd $(TARGET_SUBDIR)/libgomp && \
+        \
+       $(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-libgomp)
+
+maybe-clean-stage2-target-libgomp: clean-stage2-target-libgomp
+clean-stage2: clean-stage2-target-libgomp
+clean-stage2-target-libgomp:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage2-libgomp/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libgomp && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libgomp-bootstrap
+
+
+.PHONY: all-stage3-target-libgomp maybe-all-stage3-target-libgomp
+.PHONY: clean-stage3-target-libgomp maybe-clean-stage3-target-libgomp
+maybe-all-stage3-target-libgomp:
+maybe-clean-stage3-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-all-stage3-target-libgomp: all-stage3-target-libgomp
+all-stage3: all-stage3-target-libgomp
+TARGET-stage3-target-libgomp = $(TARGET-target-libgomp)
+all-stage3-target-libgomp: configure-stage3-target-libgomp
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/qthreads" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(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-qthreads
-
-.PHONY: maybe-maintainer-clean-target-qthreads maintainer-clean-target-qthreads
-maybe-maintainer-clean-target-qthreads:
-@if target-qthreads
-maybe-maintainer-clean-target-qthreads: maintainer-clean-target-qthreads
-
-maintainer-clean-target-qthreads: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
+         \
+       cd $(TARGET_SUBDIR)/libgomp && \
+        \
+       $(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-libgomp)
+
+maybe-clean-stage3-target-libgomp: clean-stage3-target-libgomp
+clean-stage3: clean-stage3-target-libgomp
+clean-stage3-target-libgomp:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage3-libgomp/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libgomp && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libgomp-bootstrap
+
+
+.PHONY: all-stage4-target-libgomp maybe-all-stage4-target-libgomp
+.PHONY: clean-stage4-target-libgomp maybe-clean-stage4-target-libgomp
+maybe-all-stage4-target-libgomp:
+maybe-clean-stage4-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-all-stage4-target-libgomp: all-stage4-target-libgomp
+all-stage4: all-stage4-target-libgomp
+TARGET-stage4-target-libgomp = $(TARGET-target-libgomp)
+all-stage4-target-libgomp: configure-stage4-target-libgomp
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/qthreads" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(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-qthreads
-
-
-
-
-
-.PHONY: configure-target-rda maybe-configure-target-rda
-maybe-configure-target-rda:
-@if gcc-bootstrap
-configure-target-rda: stage_current
-@endif gcc-bootstrap
-@if target-rda
-maybe-configure-target-rda: configure-target-rda
-configure-target-rda: 
-       @: $(MAKE); $(unstage)
+         \
+       cd $(TARGET_SUBDIR)/libgomp && \
+        \
+       $(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-libgomp)
+
+maybe-clean-stage4-target-libgomp: clean-stage4-target-libgomp
+clean-stage4: clean-stage4-target-libgomp
+clean-stage4-target-libgomp:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage4-libgomp/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libgomp && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libgomp-bootstrap
+
+
+.PHONY: all-stageprofile-target-libgomp maybe-all-stageprofile-target-libgomp
+.PHONY: clean-stageprofile-target-libgomp maybe-clean-stageprofile-target-libgomp
+maybe-all-stageprofile-target-libgomp:
+maybe-clean-stageprofile-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-all-stageprofile-target-libgomp: all-stageprofile-target-libgomp
+all-stageprofile: all-stageprofile-target-libgomp
+TARGET-stageprofile-target-libgomp = $(TARGET-target-libgomp)
+all-stageprofile-target-libgomp: configure-stageprofile-target-libgomp
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
        @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 ; \
-       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; \
-         else \
-           rm -f $(TARGET_SUBDIR)/rda/Makefile; \
-           mv $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; \
-         fi; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       $(NORMAL_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libgomp && \
+        \
+       $(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-libgomp)
+
+maybe-clean-stageprofile-target-libgomp: clean-stageprofile-target-libgomp
+clean-stageprofile: clean-stageprofile-target-libgomp
+clean-stageprofile-target-libgomp:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
        else \
-         mv $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; \
+         [ -f $(TARGET_SUBDIR)/stageprofile-libgomp/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
+       cd $(TARGET_SUBDIR)/libgomp && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libgomp-bootstrap
+
+
+.PHONY: all-stagefeedback-target-libgomp maybe-all-stagefeedback-target-libgomp
+.PHONY: clean-stagefeedback-target-libgomp maybe-clean-stagefeedback-target-libgomp
+maybe-all-stagefeedback-target-libgomp:
+maybe-clean-stagefeedback-target-libgomp:
+@if target-libgomp-bootstrap
+maybe-all-stagefeedback-target-libgomp: all-stagefeedback-target-libgomp
+all-stagefeedback: all-stagefeedback-target-libgomp
+TARGET-stagefeedback-target-libgomp = $(TARGET-target-libgomp)
+all-stagefeedback-target-libgomp: configure-stagefeedback-target-libgomp
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo Configuring in $(TARGET_SUBDIR)/rda; \
-       cd "$(TARGET_SUBDIR)/rda" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/rda/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/rda"; \
-       libsrcdir="$$s/rda"; \
-       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-rda
+         \
+       cd $(TARGET_SUBDIR)/libgomp && \
+        \
+       $(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-libgomp)
+
+maybe-clean-stagefeedback-target-libgomp: clean-stagefeedback-target-libgomp
+clean-stagefeedback: clean-stagefeedback-target-libgomp
+clean-stagefeedback-target-libgomp:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stagefeedback-libgomp/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libgomp && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)   clean
+@endif target-libgomp-bootstrap
 
 
 
 
 
-.PHONY: all-target-rda maybe-all-target-rda
-maybe-all-target-rda:
-@if gcc-bootstrap
-all-target-rda: stage_current
-@endif gcc-bootstrap
-@if target-rda
-TARGET-target-rda=all
-maybe-all-target-rda: all-target-rda
-all-target-rda: configure-target-rda
+
+.PHONY: check-target-libgomp maybe-check-target-libgomp
+maybe-check-target-libgomp:
+@if target-libgomp
+maybe-check-target-libgomp: check-target-libgomp
+
+check-target-libgomp:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/rda && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-rda))
-@endif target-rda
-
-
-
+       (cd $(TARGET_SUBDIR)/libgomp && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
+@endif target-libgomp
 
-.PHONY: check-target-rda maybe-check-target-rda
-maybe-check-target-rda:
-@if target-rda
-maybe-check-target-rda: check-target-rda
+.PHONY: install-target-libgomp maybe-install-target-libgomp
+maybe-install-target-libgomp:
+@if target-libgomp
+maybe-install-target-libgomp: install-target-libgomp
 
-check-target-rda:
+install-target-libgomp: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/rda && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+       (cd $(TARGET_SUBDIR)/libgomp && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-rda
+@endif target-libgomp
 
-.PHONY: install-target-rda maybe-install-target-rda
-maybe-install-target-rda:
-@if target-rda
-maybe-install-target-rda: install-target-rda
+.PHONY: install-strip-target-libgomp maybe-install-strip-target-libgomp
+maybe-install-strip-target-libgomp:
+@if target-libgomp
+maybe-install-strip-target-libgomp: install-strip-target-libgomp
 
-install-target-rda: installdirs
+install-strip-target-libgomp: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/rda && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+       (cd $(TARGET_SUBDIR)/libgomp && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif target-rda
+@endif target-libgomp
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-target-rda info-target-rda
-maybe-info-target-rda:
-@if target-rda
-maybe-info-target-rda: info-target-rda
+.PHONY: maybe-info-target-libgomp info-target-libgomp
+maybe-info-target-libgomp:
+@if target-libgomp
+maybe-info-target-libgomp: info-target-libgomp
 
-info-target-rda: \
-    configure-target-rda 
+info-target-libgomp: \
+    configure-target-libgomp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/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)/rda" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/rda && \
+       (cd $(TARGET_SUBDIR)/libgomp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49350,25 +47947,25 @@ info-target-rda: \
                   info) \
          || exit 1
 
-@endif target-rda
+@endif target-libgomp
 
-.PHONY: maybe-dvi-target-rda dvi-target-rda
-maybe-dvi-target-rda:
-@if target-rda
-maybe-dvi-target-rda: dvi-target-rda
+.PHONY: maybe-dvi-target-libgomp dvi-target-libgomp
+maybe-dvi-target-libgomp:
+@if target-libgomp
+maybe-dvi-target-libgomp: dvi-target-libgomp
 
-dvi-target-rda: \
-    configure-target-rda 
+dvi-target-libgomp: \
+    configure-target-libgomp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/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)/rda" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/rda && \
+       (cd $(TARGET_SUBDIR)/libgomp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49376,25 +47973,25 @@ dvi-target-rda: \
                   dvi) \
          || exit 1
 
-@endif target-rda
+@endif target-libgomp
 
-.PHONY: maybe-pdf-target-rda pdf-target-rda
-maybe-pdf-target-rda:
-@if target-rda
-maybe-pdf-target-rda: pdf-target-rda
+.PHONY: maybe-pdf-target-libgomp pdf-target-libgomp
+maybe-pdf-target-libgomp:
+@if target-libgomp
+maybe-pdf-target-libgomp: pdf-target-libgomp
 
-pdf-target-rda: \
-    configure-target-rda 
+pdf-target-libgomp: \
+    configure-target-libgomp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/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)/rda" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/rda && \
+       (cd $(TARGET_SUBDIR)/libgomp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49402,25 +47999,25 @@ pdf-target-rda: \
                   pdf) \
          || exit 1
 
-@endif target-rda
+@endif target-libgomp
 
-.PHONY: maybe-html-target-rda html-target-rda
-maybe-html-target-rda:
-@if target-rda
-maybe-html-target-rda: html-target-rda
+.PHONY: maybe-html-target-libgomp html-target-libgomp
+maybe-html-target-libgomp:
+@if target-libgomp
+maybe-html-target-libgomp: html-target-libgomp
 
-html-target-rda: \
-    configure-target-rda 
+html-target-libgomp: \
+    configure-target-libgomp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/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)/rda" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/rda && \
+       (cd $(TARGET_SUBDIR)/libgomp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49428,25 +48025,25 @@ html-target-rda: \
                   html) \
          || exit 1
 
-@endif target-rda
+@endif target-libgomp
 
-.PHONY: maybe-TAGS-target-rda TAGS-target-rda
-maybe-TAGS-target-rda:
-@if target-rda
-maybe-TAGS-target-rda: TAGS-target-rda
+.PHONY: maybe-TAGS-target-libgomp TAGS-target-libgomp
+maybe-TAGS-target-libgomp:
+@if target-libgomp
+maybe-TAGS-target-libgomp: TAGS-target-libgomp
 
-TAGS-target-rda: \
-    configure-target-rda 
+TAGS-target-libgomp: \
+    configure-target-libgomp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/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)/rda" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/rda && \
+       (cd $(TARGET_SUBDIR)/libgomp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49454,26 +48051,26 @@ TAGS-target-rda: \
                   TAGS) \
          || exit 1
 
-@endif target-rda
+@endif target-libgomp
 
-.PHONY: maybe-install-info-target-rda install-info-target-rda
-maybe-install-info-target-rda:
-@if target-rda
-maybe-install-info-target-rda: install-info-target-rda
+.PHONY: maybe-install-info-target-libgomp install-info-target-libgomp
+maybe-install-info-target-libgomp:
+@if target-libgomp
+maybe-install-info-target-libgomp: install-info-target-libgomp
 
-install-info-target-rda: \
-    configure-target-rda \
-    info-target-rda 
+install-info-target-libgomp: \
+    configure-target-libgomp \
+    info-target-libgomp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/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)/rda" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/rda && \
+       (cd $(TARGET_SUBDIR)/libgomp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49481,26 +48078,26 @@ install-info-target-rda: \
                   install-info) \
          || exit 1
 
-@endif target-rda
+@endif target-libgomp
 
-.PHONY: maybe-install-pdf-target-rda install-pdf-target-rda
-maybe-install-pdf-target-rda:
-@if target-rda
-maybe-install-pdf-target-rda: install-pdf-target-rda
+.PHONY: maybe-install-pdf-target-libgomp install-pdf-target-libgomp
+maybe-install-pdf-target-libgomp:
+@if target-libgomp
+maybe-install-pdf-target-libgomp: install-pdf-target-libgomp
 
-install-pdf-target-rda: \
-    configure-target-rda \
-    pdf-target-rda 
+install-pdf-target-libgomp: \
+    configure-target-libgomp \
+    pdf-target-libgomp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/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)/rda" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/rda && \
+       (cd $(TARGET_SUBDIR)/libgomp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49508,26 +48105,26 @@ install-pdf-target-rda: \
                   install-pdf) \
          || exit 1
 
-@endif target-rda
+@endif target-libgomp
 
-.PHONY: maybe-install-html-target-rda install-html-target-rda
-maybe-install-html-target-rda:
-@if target-rda
-maybe-install-html-target-rda: install-html-target-rda
+.PHONY: maybe-install-html-target-libgomp install-html-target-libgomp
+maybe-install-html-target-libgomp:
+@if target-libgomp
+maybe-install-html-target-libgomp: install-html-target-libgomp
 
-install-html-target-rda: \
-    configure-target-rda \
-    html-target-rda 
+install-html-target-libgomp: \
+    configure-target-libgomp \
+    html-target-libgomp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/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)/rda" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/rda && \
+       (cd $(TARGET_SUBDIR)/libgomp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49535,25 +48132,25 @@ install-html-target-rda: \
                   install-html) \
          || exit 1
 
-@endif target-rda
+@endif target-libgomp
 
-.PHONY: maybe-installcheck-target-rda installcheck-target-rda
-maybe-installcheck-target-rda:
-@if target-rda
-maybe-installcheck-target-rda: installcheck-target-rda
+.PHONY: maybe-installcheck-target-libgomp installcheck-target-libgomp
+maybe-installcheck-target-libgomp:
+@if target-libgomp
+maybe-installcheck-target-libgomp: installcheck-target-libgomp
 
-installcheck-target-rda: \
-    configure-target-rda 
+installcheck-target-libgomp: \
+    configure-target-libgomp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/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)/rda" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/rda && \
+       (cd $(TARGET_SUBDIR)/libgomp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49561,24 +48158,24 @@ installcheck-target-rda: \
                   installcheck) \
          || exit 1
 
-@endif target-rda
+@endif target-libgomp
 
-.PHONY: maybe-mostlyclean-target-rda mostlyclean-target-rda
-maybe-mostlyclean-target-rda:
-@if target-rda
-maybe-mostlyclean-target-rda: mostlyclean-target-rda
+.PHONY: maybe-mostlyclean-target-libgomp mostlyclean-target-libgomp
+maybe-mostlyclean-target-libgomp:
+@if target-libgomp
+maybe-mostlyclean-target-libgomp: mostlyclean-target-libgomp
 
-mostlyclean-target-rda: 
+mostlyclean-target-libgomp: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/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)/rda" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/rda && \
+       (cd $(TARGET_SUBDIR)/libgomp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49586,24 +48183,24 @@ mostlyclean-target-rda:
                   mostlyclean) \
          || exit 1
 
-@endif target-rda
+@endif target-libgomp
 
-.PHONY: maybe-clean-target-rda clean-target-rda
-maybe-clean-target-rda:
-@if target-rda
-maybe-clean-target-rda: clean-target-rda
+.PHONY: maybe-clean-target-libgomp clean-target-libgomp
+maybe-clean-target-libgomp:
+@if target-libgomp
+maybe-clean-target-libgomp: clean-target-libgomp
 
-clean-target-rda: 
+clean-target-libgomp: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/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)/rda" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/rda && \
+       (cd $(TARGET_SUBDIR)/libgomp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49611,24 +48208,24 @@ clean-target-rda:
                   clean) \
          || exit 1
 
-@endif target-rda
+@endif target-libgomp
 
-.PHONY: maybe-distclean-target-rda distclean-target-rda
-maybe-distclean-target-rda:
-@if target-rda
-maybe-distclean-target-rda: distclean-target-rda
+.PHONY: maybe-distclean-target-libgomp distclean-target-libgomp
+maybe-distclean-target-libgomp:
+@if target-libgomp
+maybe-distclean-target-libgomp: distclean-target-libgomp
 
-distclean-target-rda: 
+distclean-target-libgomp: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/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)/rda" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/rda && \
+       (cd $(TARGET_SUBDIR)/libgomp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49636,24 +48233,24 @@ distclean-target-rda:
                   distclean) \
          || exit 1
 
-@endif target-rda
+@endif target-libgomp
 
-.PHONY: maybe-maintainer-clean-target-rda maintainer-clean-target-rda
-maybe-maintainer-clean-target-rda:
-@if target-rda
-maybe-maintainer-clean-target-rda: maintainer-clean-target-rda
+.PHONY: maybe-maintainer-clean-target-libgomp maintainer-clean-target-libgomp
+maybe-maintainer-clean-target-libgomp:
+@if target-libgomp
+maybe-maintainer-clean-target-libgomp: maintainer-clean-target-libgomp
 
-maintainer-clean-target-rda: 
+maintainer-clean-target-libgomp: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/rda/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)/rda" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/rda && \
+       (cd $(TARGET_SUBDIR)/libgomp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49661,130 +48258,146 @@ maintainer-clean-target-rda:
                   maintainer-clean) \
          || exit 1
 
-@endif target-rda
+@endif target-libgomp
 
 
 
 
 
-.PHONY: configure-target-libada maybe-configure-target-libada
-maybe-configure-target-libada:
+.PHONY: configure-target-libitm maybe-configure-target-libitm
+maybe-configure-target-libitm:
 @if gcc-bootstrap
-configure-target-libada: stage_current
+configure-target-libitm: stage_current
 @endif gcc-bootstrap
-@if target-libada
-maybe-configure-target-libada: configure-target-libada
-configure-target-libada: 
+@if target-libitm
+maybe-configure-target-libitm: configure-target-libitm
+configure-target-libitm: 
        @: $(MAKE); $(unstage)
        @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 ; \
-       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; \
+       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; \
+       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; \
          else \
-           rm -f $(TARGET_SUBDIR)/libada/Makefile; \
-           mv $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libitm/Makefile; \
+           mv $(TARGET_SUBDIR)/libitm/multilib.tmp $(TARGET_SUBDIR)/libitm/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; \
+         mv $(TARGET_SUBDIR)/libitm/multilib.tmp $(TARGET_SUBDIR)/libitm/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo Configuring in $(TARGET_SUBDIR)/libada; \
-       cd "$(TARGET_SUBDIR)/libada" || exit 1; \
+       test ! -f $(TARGET_SUBDIR)/libitm/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libitm; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libitm; \
+       cd "$(TARGET_SUBDIR)/libitm" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libada/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libitm/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libada"; \
-       libsrcdir="$$s/libada"; \
+       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-libada
+@endif target-libitm
 
 
 
 
 
-.PHONY: all-target-libada maybe-all-target-libada
-maybe-all-target-libada:
+.PHONY: all-target-libitm maybe-all-target-libitm
+maybe-all-target-libitm:
 @if gcc-bootstrap
-all-target-libada: stage_current
+all-target-libitm: stage_current
 @endif gcc-bootstrap
-@if target-libada
-TARGET-target-libada=all
-maybe-all-target-libada: all-target-libada
-all-target-libada: configure-target-libada
+@if target-libitm
+TARGET-target-libitm=all
+maybe-all-target-libitm: all-target-libitm
+all-target-libitm: configure-target-libitm
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libada && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libada))
-@endif target-libada
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libitm && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libitm))
+@endif target-libitm
 
 
 
 
 
-.PHONY: check-target-libada maybe-check-target-libada
-maybe-check-target-libada:
-@if target-libada
-maybe-check-target-libada: check-target-libada
+.PHONY: check-target-libitm maybe-check-target-libitm
+maybe-check-target-libitm:
+@if target-libitm
+maybe-check-target-libitm: check-target-libitm
 
-check-target-libada:
+check-target-libitm:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libada && \
+       (cd $(TARGET_SUBDIR)/libitm && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
-@endif target-libada
+@endif target-libitm
 
-.PHONY: install-target-libada maybe-install-target-libada
-maybe-install-target-libada:
-@if target-libada
-maybe-install-target-libada: install-target-libada
+.PHONY: install-target-libitm maybe-install-target-libitm
+maybe-install-target-libitm:
+@if target-libitm
+maybe-install-target-libitm: install-target-libitm
 
-install-target-libada: installdirs
+install-target-libitm: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libada && \
+       (cd $(TARGET_SUBDIR)/libitm && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-libada
+@endif target-libitm
+
+.PHONY: install-strip-target-libitm maybe-install-strip-target-libitm
+maybe-install-strip-target-libitm:
+@if target-libitm
+maybe-install-strip-target-libitm: install-strip-target-libitm
+
+install-strip-target-libitm: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libitm && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libitm
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-target-libada info-target-libada
-maybe-info-target-libada:
-@if target-libada
-maybe-info-target-libada: info-target-libada
+.PHONY: maybe-info-target-libitm info-target-libitm
+maybe-info-target-libitm:
+@if target-libitm
+maybe-info-target-libitm: info-target-libitm
 
-info-target-libada: \
-    configure-target-libada 
+info-target-libitm: \
+    configure-target-libitm 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/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)/libada" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libada && \
+       (cd $(TARGET_SUBDIR)/libitm && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49792,25 +48405,25 @@ info-target-libada: \
                   info) \
          || exit 1
 
-@endif target-libada
+@endif target-libitm
 
-.PHONY: maybe-dvi-target-libada dvi-target-libada
-maybe-dvi-target-libada:
-@if target-libada
-maybe-dvi-target-libada: dvi-target-libada
+.PHONY: maybe-dvi-target-libitm dvi-target-libitm
+maybe-dvi-target-libitm:
+@if target-libitm
+maybe-dvi-target-libitm: dvi-target-libitm
 
-dvi-target-libada: \
-    configure-target-libada 
+dvi-target-libitm: \
+    configure-target-libitm 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/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)/libada" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libada && \
+       (cd $(TARGET_SUBDIR)/libitm && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49818,25 +48431,25 @@ dvi-target-libada: \
                   dvi) \
          || exit 1
 
-@endif target-libada
+@endif target-libitm
 
-.PHONY: maybe-pdf-target-libada pdf-target-libada
-maybe-pdf-target-libada:
-@if target-libada
-maybe-pdf-target-libada: pdf-target-libada
+.PHONY: maybe-pdf-target-libitm pdf-target-libitm
+maybe-pdf-target-libitm:
+@if target-libitm
+maybe-pdf-target-libitm: pdf-target-libitm
 
-pdf-target-libada: \
-    configure-target-libada 
+pdf-target-libitm: \
+    configure-target-libitm 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/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)/libada" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libada && \
+       (cd $(TARGET_SUBDIR)/libitm && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49844,25 +48457,25 @@ pdf-target-libada: \
                   pdf) \
          || exit 1
 
-@endif target-libada
+@endif target-libitm
 
-.PHONY: maybe-html-target-libada html-target-libada
-maybe-html-target-libada:
-@if target-libada
-maybe-html-target-libada: html-target-libada
+.PHONY: maybe-html-target-libitm html-target-libitm
+maybe-html-target-libitm:
+@if target-libitm
+maybe-html-target-libitm: html-target-libitm
 
-html-target-libada: \
-    configure-target-libada 
+html-target-libitm: \
+    configure-target-libitm 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/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)/libada" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libada && \
+       (cd $(TARGET_SUBDIR)/libitm && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49870,25 +48483,25 @@ html-target-libada: \
                   html) \
          || exit 1
 
-@endif target-libada
+@endif target-libitm
 
-.PHONY: maybe-TAGS-target-libada TAGS-target-libada
-maybe-TAGS-target-libada:
-@if target-libada
-maybe-TAGS-target-libada: TAGS-target-libada
+.PHONY: maybe-TAGS-target-libitm TAGS-target-libitm
+maybe-TAGS-target-libitm:
+@if target-libitm
+maybe-TAGS-target-libitm: TAGS-target-libitm
 
-TAGS-target-libada: \
-    configure-target-libada 
+TAGS-target-libitm: \
+    configure-target-libitm 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/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)/libada" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libada && \
+       (cd $(TARGET_SUBDIR)/libitm && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49896,26 +48509,26 @@ TAGS-target-libada: \
                   TAGS) \
          || exit 1
 
-@endif target-libada
+@endif target-libitm
 
-.PHONY: maybe-install-info-target-libada install-info-target-libada
-maybe-install-info-target-libada:
-@if target-libada
-maybe-install-info-target-libada: install-info-target-libada
+.PHONY: maybe-install-info-target-libitm install-info-target-libitm
+maybe-install-info-target-libitm:
+@if target-libitm
+maybe-install-info-target-libitm: install-info-target-libitm
 
-install-info-target-libada: \
-    configure-target-libada \
-    info-target-libada 
+install-info-target-libitm: \
+    configure-target-libitm \
+    info-target-libitm 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/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)/libada" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libada && \
+       (cd $(TARGET_SUBDIR)/libitm && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49923,26 +48536,26 @@ install-info-target-libada: \
                   install-info) \
          || exit 1
 
-@endif target-libada
+@endif target-libitm
 
-.PHONY: maybe-install-pdf-target-libada install-pdf-target-libada
-maybe-install-pdf-target-libada:
-@if target-libada
-maybe-install-pdf-target-libada: install-pdf-target-libada
+.PHONY: maybe-install-pdf-target-libitm install-pdf-target-libitm
+maybe-install-pdf-target-libitm:
+@if target-libitm
+maybe-install-pdf-target-libitm: install-pdf-target-libitm
 
-install-pdf-target-libada: \
-    configure-target-libada \
-    pdf-target-libada 
+install-pdf-target-libitm: \
+    configure-target-libitm \
+    pdf-target-libitm 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/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)/libada" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libada && \
+       (cd $(TARGET_SUBDIR)/libitm && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49950,26 +48563,26 @@ install-pdf-target-libada: \
                   install-pdf) \
          || exit 1
 
-@endif target-libada
+@endif target-libitm
 
-.PHONY: maybe-install-html-target-libada install-html-target-libada
-maybe-install-html-target-libada:
-@if target-libada
-maybe-install-html-target-libada: install-html-target-libada
+.PHONY: maybe-install-html-target-libitm install-html-target-libitm
+maybe-install-html-target-libitm:
+@if target-libitm
+maybe-install-html-target-libitm: install-html-target-libitm
 
-install-html-target-libada: \
-    configure-target-libada \
-    html-target-libada 
+install-html-target-libitm: \
+    configure-target-libitm \
+    html-target-libitm 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/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)/libada" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libada && \
+       (cd $(TARGET_SUBDIR)/libitm && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49977,25 +48590,25 @@ install-html-target-libada: \
                   install-html) \
          || exit 1
 
-@endif target-libada
+@endif target-libitm
 
-.PHONY: maybe-installcheck-target-libada installcheck-target-libada
-maybe-installcheck-target-libada:
-@if target-libada
-maybe-installcheck-target-libada: installcheck-target-libada
+.PHONY: maybe-installcheck-target-libitm installcheck-target-libitm
+maybe-installcheck-target-libitm:
+@if target-libitm
+maybe-installcheck-target-libitm: installcheck-target-libitm
 
-installcheck-target-libada: \
-    configure-target-libada 
+installcheck-target-libitm: \
+    configure-target-libitm 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/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)/libada" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libada && \
+       (cd $(TARGET_SUBDIR)/libitm && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50003,24 +48616,24 @@ installcheck-target-libada: \
                   installcheck) \
          || exit 1
 
-@endif target-libada
+@endif target-libitm
 
-.PHONY: maybe-mostlyclean-target-libada mostlyclean-target-libada
-maybe-mostlyclean-target-libada:
-@if target-libada
-maybe-mostlyclean-target-libada: mostlyclean-target-libada
+.PHONY: maybe-mostlyclean-target-libitm mostlyclean-target-libitm
+maybe-mostlyclean-target-libitm:
+@if target-libitm
+maybe-mostlyclean-target-libitm: mostlyclean-target-libitm
 
-mostlyclean-target-libada: 
+mostlyclean-target-libitm: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/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)/libada" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libada && \
+       (cd $(TARGET_SUBDIR)/libitm && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50028,24 +48641,24 @@ mostlyclean-target-libada:
                   mostlyclean) \
          || exit 1
 
-@endif target-libada
+@endif target-libitm
 
-.PHONY: maybe-clean-target-libada clean-target-libada
-maybe-clean-target-libada:
-@if target-libada
-maybe-clean-target-libada: clean-target-libada
+.PHONY: maybe-clean-target-libitm clean-target-libitm
+maybe-clean-target-libitm:
+@if target-libitm
+maybe-clean-target-libitm: clean-target-libitm
 
-clean-target-libada: 
+clean-target-libitm: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/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)/libada" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libada && \
+       (cd $(TARGET_SUBDIR)/libitm && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50053,24 +48666,24 @@ clean-target-libada:
                   clean) \
          || exit 1
 
-@endif target-libada
+@endif target-libitm
 
-.PHONY: maybe-distclean-target-libada distclean-target-libada
-maybe-distclean-target-libada:
-@if target-libada
-maybe-distclean-target-libada: distclean-target-libada
+.PHONY: maybe-distclean-target-libitm distclean-target-libitm
+maybe-distclean-target-libitm:
+@if target-libitm
+maybe-distclean-target-libitm: distclean-target-libitm
 
-distclean-target-libada: 
+distclean-target-libitm: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/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)/libada" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libada && \
+       (cd $(TARGET_SUBDIR)/libitm && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50078,24 +48691,24 @@ distclean-target-libada:
                   distclean) \
          || exit 1
 
-@endif target-libada
+@endif target-libitm
 
-.PHONY: maybe-maintainer-clean-target-libada maintainer-clean-target-libada
-maybe-maintainer-clean-target-libada:
-@if target-libada
-maybe-maintainer-clean-target-libada: maintainer-clean-target-libada
+.PHONY: maybe-maintainer-clean-target-libitm maintainer-clean-target-libitm
+maybe-maintainer-clean-target-libitm:
+@if target-libitm
+maybe-maintainer-clean-target-libitm: maintainer-clean-target-libitm
 
-maintainer-clean-target-libada: 
+maintainer-clean-target-libitm: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libada/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)/libada" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libada && \
+       (cd $(TARGET_SUBDIR)/libitm && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50103,130 +48716,146 @@ maintainer-clean-target-libada:
                   maintainer-clean) \
          || exit 1
 
-@endif target-libada
+@endif target-libitm
 
 
 
 
 
-.PHONY: configure-target-libgomp maybe-configure-target-libgomp
-maybe-configure-target-libgomp:
+.PHONY: configure-target-libatomic maybe-configure-target-libatomic
+maybe-configure-target-libatomic:
 @if gcc-bootstrap
-configure-target-libgomp: stage_current
+configure-target-libatomic: stage_current
 @endif gcc-bootstrap
-@if target-libgomp
-maybe-configure-target-libgomp: configure-target-libgomp
-configure-target-libgomp: 
+@if target-libatomic
+maybe-configure-target-libatomic: configure-target-libatomic
+configure-target-libatomic: 
        @: $(MAKE); $(unstage)
        @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 ; \
-       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; \
+       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; \
+       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; \
          else \
-           rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \
-           mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libatomic/Makefile; \
+           mv $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
+         mv $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo Configuring in $(TARGET_SUBDIR)/libgomp; \
-       cd "$(TARGET_SUBDIR)/libgomp" || exit 1; \
+       test ! -f $(TARGET_SUBDIR)/libatomic/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/libatomic; \
+       cd "$(TARGET_SUBDIR)/libatomic" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libatomic/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgomp"; \
-       libsrcdir="$$s/libgomp"; \
+       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-libgomp
+@endif target-libatomic
 
 
 
 
 
-.PHONY: all-target-libgomp maybe-all-target-libgomp
-maybe-all-target-libgomp:
+.PHONY: all-target-libatomic maybe-all-target-libatomic
+maybe-all-target-libatomic:
 @if gcc-bootstrap
-all-target-libgomp: stage_current
+all-target-libatomic: stage_current
 @endif gcc-bootstrap
-@if target-libgomp
-TARGET-target-libgomp=all
-maybe-all-target-libgomp: all-target-libgomp
-all-target-libgomp: configure-target-libgomp
+@if target-libatomic
+TARGET-target-libatomic=all
+maybe-all-target-libatomic: all-target-libatomic
+all-target-libatomic: configure-target-libatomic
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libgomp && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libgomp))
-@endif target-libgomp
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/libatomic && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+               $(TARGET-target-libatomic))
+@endif target-libatomic
 
 
 
 
 
-.PHONY: check-target-libgomp maybe-check-target-libgomp
-maybe-check-target-libgomp:
-@if target-libgomp
-maybe-check-target-libgomp: check-target-libgomp
+.PHONY: check-target-libatomic maybe-check-target-libatomic
+maybe-check-target-libatomic:
+@if target-libatomic
+maybe-check-target-libatomic: check-target-libatomic
 
-check-target-libgomp:
+check-target-libatomic:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libgomp && \
+       (cd $(TARGET_SUBDIR)/libatomic && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
-@endif target-libgomp
+@endif target-libatomic
 
-.PHONY: install-target-libgomp maybe-install-target-libgomp
-maybe-install-target-libgomp:
-@if target-libgomp
-maybe-install-target-libgomp: install-target-libgomp
+.PHONY: install-target-libatomic maybe-install-target-libatomic
+maybe-install-target-libatomic:
+@if target-libatomic
+maybe-install-target-libatomic: install-target-libatomic
 
-install-target-libgomp: installdirs
+install-target-libatomic: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libgomp && \
+       (cd $(TARGET_SUBDIR)/libatomic && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-libgomp
+@endif target-libatomic
+
+.PHONY: install-strip-target-libatomic maybe-install-strip-target-libatomic
+maybe-install-strip-target-libatomic:
+@if target-libatomic
+maybe-install-strip-target-libatomic: install-strip-target-libatomic
+
+install-strip-target-libatomic: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libatomic && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libatomic
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-target-libgomp info-target-libgomp
-maybe-info-target-libgomp:
-@if target-libgomp
-maybe-info-target-libgomp: info-target-libgomp
+.PHONY: maybe-info-target-libatomic info-target-libatomic
+maybe-info-target-libatomic:
+@if target-libatomic
+maybe-info-target-libatomic: info-target-libatomic
 
-info-target-libgomp: \
-    configure-target-libgomp 
+info-target-libatomic: \
+    configure-target-libatomic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/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)/libgomp" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgomp && \
+       (cd $(TARGET_SUBDIR)/libatomic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50234,25 +48863,25 @@ info-target-libgomp: \
                   info) \
          || exit 1
 
-@endif target-libgomp
+@endif target-libatomic
 
-.PHONY: maybe-dvi-target-libgomp dvi-target-libgomp
-maybe-dvi-target-libgomp:
-@if target-libgomp
-maybe-dvi-target-libgomp: dvi-target-libgomp
+.PHONY: maybe-dvi-target-libatomic dvi-target-libatomic
+maybe-dvi-target-libatomic:
+@if target-libatomic
+maybe-dvi-target-libatomic: dvi-target-libatomic
 
-dvi-target-libgomp: \
-    configure-target-libgomp 
+dvi-target-libatomic: \
+    configure-target-libatomic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/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)/libgomp" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgomp && \
+       (cd $(TARGET_SUBDIR)/libatomic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50260,25 +48889,25 @@ dvi-target-libgomp: \
                   dvi) \
          || exit 1
 
-@endif target-libgomp
+@endif target-libatomic
 
-.PHONY: maybe-pdf-target-libgomp pdf-target-libgomp
-maybe-pdf-target-libgomp:
-@if target-libgomp
-maybe-pdf-target-libgomp: pdf-target-libgomp
+.PHONY: maybe-pdf-target-libatomic pdf-target-libatomic
+maybe-pdf-target-libatomic:
+@if target-libatomic
+maybe-pdf-target-libatomic: pdf-target-libatomic
 
-pdf-target-libgomp: \
-    configure-target-libgomp 
+pdf-target-libatomic: \
+    configure-target-libatomic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/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)/libgomp" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgomp && \
+       (cd $(TARGET_SUBDIR)/libatomic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50286,25 +48915,25 @@ pdf-target-libgomp: \
                   pdf) \
          || exit 1
 
-@endif target-libgomp
+@endif target-libatomic
 
-.PHONY: maybe-html-target-libgomp html-target-libgomp
-maybe-html-target-libgomp:
-@if target-libgomp
-maybe-html-target-libgomp: html-target-libgomp
+.PHONY: maybe-html-target-libatomic html-target-libatomic
+maybe-html-target-libatomic:
+@if target-libatomic
+maybe-html-target-libatomic: html-target-libatomic
 
-html-target-libgomp: \
-    configure-target-libgomp 
+html-target-libatomic: \
+    configure-target-libatomic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/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)/libgomp" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgomp && \
+       (cd $(TARGET_SUBDIR)/libatomic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50312,25 +48941,25 @@ html-target-libgomp: \
                   html) \
          || exit 1
 
-@endif target-libgomp
+@endif target-libatomic
 
-.PHONY: maybe-TAGS-target-libgomp TAGS-target-libgomp
-maybe-TAGS-target-libgomp:
-@if target-libgomp
-maybe-TAGS-target-libgomp: TAGS-target-libgomp
+.PHONY: maybe-TAGS-target-libatomic TAGS-target-libatomic
+maybe-TAGS-target-libatomic:
+@if target-libatomic
+maybe-TAGS-target-libatomic: TAGS-target-libatomic
 
-TAGS-target-libgomp: \
-    configure-target-libgomp 
+TAGS-target-libatomic: \
+    configure-target-libatomic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/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)/libgomp" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgomp && \
+       (cd $(TARGET_SUBDIR)/libatomic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50338,26 +48967,26 @@ TAGS-target-libgomp: \
                   TAGS) \
          || exit 1
 
-@endif target-libgomp
+@endif target-libatomic
 
-.PHONY: maybe-install-info-target-libgomp install-info-target-libgomp
-maybe-install-info-target-libgomp:
-@if target-libgomp
-maybe-install-info-target-libgomp: install-info-target-libgomp
+.PHONY: maybe-install-info-target-libatomic install-info-target-libatomic
+maybe-install-info-target-libatomic:
+@if target-libatomic
+maybe-install-info-target-libatomic: install-info-target-libatomic
 
-install-info-target-libgomp: \
-    configure-target-libgomp \
-    info-target-libgomp 
+install-info-target-libatomic: \
+    configure-target-libatomic \
+    info-target-libatomic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/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)/libgomp" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgomp && \
+       (cd $(TARGET_SUBDIR)/libatomic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50365,26 +48994,26 @@ install-info-target-libgomp: \
                   install-info) \
          || exit 1
 
-@endif target-libgomp
+@endif target-libatomic
 
-.PHONY: maybe-install-pdf-target-libgomp install-pdf-target-libgomp
-maybe-install-pdf-target-libgomp:
-@if target-libgomp
-maybe-install-pdf-target-libgomp: install-pdf-target-libgomp
+.PHONY: maybe-install-pdf-target-libatomic install-pdf-target-libatomic
+maybe-install-pdf-target-libatomic:
+@if target-libatomic
+maybe-install-pdf-target-libatomic: install-pdf-target-libatomic
 
-install-pdf-target-libgomp: \
-    configure-target-libgomp \
-    pdf-target-libgomp 
+install-pdf-target-libatomic: \
+    configure-target-libatomic \
+    pdf-target-libatomic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/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)/libgomp" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgomp && \
+       (cd $(TARGET_SUBDIR)/libatomic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50392,26 +49021,26 @@ install-pdf-target-libgomp: \
                   install-pdf) \
          || exit 1
 
-@endif target-libgomp
+@endif target-libatomic
 
-.PHONY: maybe-install-html-target-libgomp install-html-target-libgomp
-maybe-install-html-target-libgomp:
-@if target-libgomp
-maybe-install-html-target-libgomp: install-html-target-libgomp
+.PHONY: maybe-install-html-target-libatomic install-html-target-libatomic
+maybe-install-html-target-libatomic:
+@if target-libatomic
+maybe-install-html-target-libatomic: install-html-target-libatomic
 
-install-html-target-libgomp: \
-    configure-target-libgomp \
-    html-target-libgomp 
+install-html-target-libatomic: \
+    configure-target-libatomic \
+    html-target-libatomic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/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)/libgomp" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgomp && \
+       (cd $(TARGET_SUBDIR)/libatomic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50419,25 +49048,25 @@ install-html-target-libgomp: \
                   install-html) \
          || exit 1
 
-@endif target-libgomp
+@endif target-libatomic
 
-.PHONY: maybe-installcheck-target-libgomp installcheck-target-libgomp
-maybe-installcheck-target-libgomp:
-@if target-libgomp
-maybe-installcheck-target-libgomp: installcheck-target-libgomp
+.PHONY: maybe-installcheck-target-libatomic installcheck-target-libatomic
+maybe-installcheck-target-libatomic:
+@if target-libatomic
+maybe-installcheck-target-libatomic: installcheck-target-libatomic
 
-installcheck-target-libgomp: \
-    configure-target-libgomp 
+installcheck-target-libatomic: \
+    configure-target-libatomic 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/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)/libgomp" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgomp && \
+       (cd $(TARGET_SUBDIR)/libatomic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50445,24 +49074,24 @@ installcheck-target-libgomp: \
                   installcheck) \
          || exit 1
 
-@endif target-libgomp
+@endif target-libatomic
 
-.PHONY: maybe-mostlyclean-target-libgomp mostlyclean-target-libgomp
-maybe-mostlyclean-target-libgomp:
-@if target-libgomp
-maybe-mostlyclean-target-libgomp: mostlyclean-target-libgomp
+.PHONY: maybe-mostlyclean-target-libatomic mostlyclean-target-libatomic
+maybe-mostlyclean-target-libatomic:
+@if target-libatomic
+maybe-mostlyclean-target-libatomic: mostlyclean-target-libatomic
 
-mostlyclean-target-libgomp: 
+mostlyclean-target-libatomic: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/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)/libgomp" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgomp && \
+       (cd $(TARGET_SUBDIR)/libatomic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50470,24 +49099,24 @@ mostlyclean-target-libgomp:
                   mostlyclean) \
          || exit 1
 
-@endif target-libgomp
+@endif target-libatomic
 
-.PHONY: maybe-clean-target-libgomp clean-target-libgomp
-maybe-clean-target-libgomp:
-@if target-libgomp
-maybe-clean-target-libgomp: clean-target-libgomp
+.PHONY: maybe-clean-target-libatomic clean-target-libatomic
+maybe-clean-target-libatomic:
+@if target-libatomic
+maybe-clean-target-libatomic: clean-target-libatomic
 
-clean-target-libgomp: 
+clean-target-libatomic: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/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)/libgomp" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgomp && \
+       (cd $(TARGET_SUBDIR)/libatomic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50495,24 +49124,24 @@ clean-target-libgomp:
                   clean) \
          || exit 1
 
-@endif target-libgomp
+@endif target-libatomic
 
-.PHONY: maybe-distclean-target-libgomp distclean-target-libgomp
-maybe-distclean-target-libgomp:
-@if target-libgomp
-maybe-distclean-target-libgomp: distclean-target-libgomp
+.PHONY: maybe-distclean-target-libatomic distclean-target-libatomic
+maybe-distclean-target-libatomic:
+@if target-libatomic
+maybe-distclean-target-libatomic: distclean-target-libatomic
 
-distclean-target-libgomp: 
+distclean-target-libatomic: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/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)/libgomp" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgomp && \
+       (cd $(TARGET_SUBDIR)/libatomic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50520,24 +49149,24 @@ distclean-target-libgomp:
                   distclean) \
          || exit 1
 
-@endif target-libgomp
+@endif target-libatomic
 
-.PHONY: maybe-maintainer-clean-target-libgomp maintainer-clean-target-libgomp
-maybe-maintainer-clean-target-libgomp:
-@if target-libgomp
-maybe-maintainer-clean-target-libgomp: maintainer-clean-target-libgomp
+.PHONY: maybe-maintainer-clean-target-libatomic maintainer-clean-target-libatomic
+maybe-maintainer-clean-target-libatomic:
+@if target-libatomic
+maybe-maintainer-clean-target-libatomic: maintainer-clean-target-libatomic
 
-maintainer-clean-target-libgomp: 
+maintainer-clean-target-libatomic: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgomp/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)/libgomp" ; \
+       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; \
-       (cd $(TARGET_SUBDIR)/libgomp && \
+       (cd $(TARGET_SUBDIR)/libatomic && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50545,9 +49174,27 @@ maintainer-clean-target-libgomp:
                   maintainer-clean) \
          || exit 1
 
+@endif target-libatomic
+
+
+
+@if target-libgomp
+.PHONY: check-target-libgomp-c++
+check-target-libgomp-c++:
+       $(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) c++.exp" check-target-libgomp
+
+.PHONY: check-target-libgomp-fortran
+check-target-libgomp-fortran:
+       $(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) fortran.exp" check-target-libgomp
+
 @endif target-libgomp
 
+@if target-libitm
+.PHONY: check-target-libitm-c++
+check-target-libitm-c++:
+       $(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) c++.exp" check-target-libitm
 
+@endif target-libitm
 
 # ----------
 # GCC module
@@ -50562,45 +49209,80 @@ 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
 
 @if gcc
-.PHONY: check-gcc-c++
+
+.PHONY: check-gcc-c check-c
+check-gcc-c:
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-gcc);
+check-c: check-gcc-c
+
+.PHONY: check-gcc-c++ check-c++
 check-gcc-c++:
-       @if [ -f ./gcc/Makefile ] ; then \
-         r=`${PWD_COMMAND}`; export r; \
-         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-         $(HOST_EXPORTS) \
-         (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
-       else \
-         true; \
-       fi
+       r=`${PWD_COMMAND}`; export r; \
+       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-libitm-c++ check-target-libgomp-c++
+
+.PHONY: check-gcc-fortran check-fortran
+check-gcc-fortran:
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-fortran);
+check-fortran: check-gcc-fortran check-target-libquadmath check-target-libgfortran check-target-libgomp-fortran
+
+.PHONY: check-gcc-ada check-ada
+check-gcc-ada:
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-ada);
+check-ada: check-gcc-ada check-target-libada
+
+.PHONY: check-gcc-objc check-objc
+check-gcc-objc:
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-objc);
+check-objc: check-gcc-objc check-target-libobjc
+
+.PHONY: check-gcc-obj-c++ check-obj-c++
+check-gcc-obj-c++:
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-obj-c++);
+check-obj-c++: check-gcc-obj-c++
+
+.PHONY: check-gcc-go check-go
+check-gcc-go:
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-go);
+check-go: check-gcc-go check-target-libgo
 
-.PHONY: check-c++
-check-c++: check-target-libstdc++-v3 check-gcc-c++
 
-# Install the gcc headers files, but not the fixed include files,
-# which Cygnus is not allowed to distribute.  This rule is very
-# dependent on the workings of the gcc Makefile.in.
-.PHONY: gcc-no-fixedincludes
-gcc-no-fixedincludes:
+# The gcc part of install-no-fixedincludes, which relies on an intimate
+# knowledge of how a number of gcc internal targets (inter)operate.  Delegate.
+.PHONY: gcc-install-no-fixedincludes
+gcc-install-no-fixedincludes:
        @if [ -f ./gcc/Makefile ]; then \
-         rm -rf gcc/tmp-include; \
-         mv gcc/include gcc/tmp-include 2>/dev/null; \
-         mkdir gcc/include; \
-         cp $(srcdir)/gcc/gsyslimits.h gcc/include/syslimits.h; \
-         touch gcc/stmp-fixinc gcc/include/fixed; \
-         rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
          r=`${PWD_COMMAND}`; export r; \
-         s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
          $(HOST_EXPORTS) \
-         (cd ./gcc && \
-          $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
-         rm -rf gcc/include; \
-         mv gcc/tmp-include gcc/include 2>/dev/null; \
+         (cd ./gcc \
+          && $(MAKE) $(GCC_FLAGS_TO_PASS) install-no-fixedincludes); \
        else true; fi
 @endif gcc
 
@@ -50659,156 +49341,246 @@ 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
+@endif mpc
+@if isl
+       @cd $(HOST_SUBDIR); [ -d stage1-isl ] || \
+         mkdir stage1-isl; \
+       mv stage1-isl isl
+@endif isl
+@if libelf
+       @cd $(HOST_SUBDIR); [ -d stage1-libelf ] || \
+         mkdir stage1-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
+@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
+@endif lto-plugin
+@if libctf
+       @cd $(HOST_SUBDIR); [ -d stage1-libctf ] || \
+         mkdir stage1-libctf; \
+       mv stage1-libctf libctf
+@endif libctf
        @[ -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; \
+       fi
+@endif mpc
+@if 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  ; \
+       @if test -d $(HOST_SUBDIR)/gold; then \
+         cd $(HOST_SUBDIR); mv gold stage1-gold; \
        fi
 @endif gold
 @if intl
-       @if test -d $(HOST_SUBDIR)/intl ; then \
-         cd $(HOST_SUBDIR); mv intl stage1-intl  ; \
+       @if test -d $(HOST_SUBDIR)/intl; then \
+         cd $(HOST_SUBDIR); mv intl stage1-intl; \
        fi
 @endif intl
 @if ld
-       @if test -d $(HOST_SUBDIR)/ld ; then \
-         cd $(HOST_SUBDIR); mv ld stage1-ld  ; \
+       @if test -d $(HOST_SUBDIR)/ld; then \
+         cd $(HOST_SUBDIR); mv ld stage1-ld; \
        fi
 @endif ld
+@if libbacktrace
+       @if test -d $(HOST_SUBDIR)/libbacktrace; then \
+         cd $(HOST_SUBDIR); mv libbacktrace stage1-libbacktrace; \
+       fi
+@endif libbacktrace
 @if libcpp
-       @if test -d $(HOST_SUBDIR)/libcpp ; then \
-         cd $(HOST_SUBDIR); mv libcpp stage1-libcpp  ; \
+       @if test -d $(HOST_SUBDIR)/libcpp; then \
+         cd $(HOST_SUBDIR); mv libcpp stage1-libcpp; \
        fi
 @endif libcpp
 @if libdecnumber
-       @if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-         cd $(HOST_SUBDIR); mv libdecnumber stage1-libdecnumber  ; \
+       @if test -d $(HOST_SUBDIR)/libdecnumber; then \
+         cd $(HOST_SUBDIR); mv libdecnumber stage1-libdecnumber; \
        fi
 @endif libdecnumber
 @if libiberty
-       @if test -d $(HOST_SUBDIR)/libiberty ; then \
-         cd $(HOST_SUBDIR); mv libiberty stage1-libiberty  ; \
+       @if test -d $(HOST_SUBDIR)/libiberty; then \
+         cd $(HOST_SUBDIR); mv libiberty stage1-libiberty; \
        fi
 @endif libiberty
+@if libiberty-linker-plugin
+       @if test -d $(HOST_SUBDIR)/libiberty-linker-plugin; then \
+         cd $(HOST_SUBDIR); mv libiberty-linker-plugin stage1-libiberty-linker-plugin; \
+       fi
+@endif libiberty-linker-plugin
+@if libiconv
+       @if test -d $(HOST_SUBDIR)/libiconv; then \
+         cd $(HOST_SUBDIR); mv libiconv stage1-libiconv; \
+       fi
+@endif libiconv
 @if zlib
-       @if test -d $(HOST_SUBDIR)/zlib ; then \
-         cd $(HOST_SUBDIR); mv zlib stage1-zlib  ; \
+       @if test -d $(HOST_SUBDIR)/zlib; then \
+         cd $(HOST_SUBDIR); mv zlib stage1-zlib; \
        fi
 @endif zlib
-       @if test -d $(TARGET_SUBDIR) ; then \
-         mv $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR)  ; \
+@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 libctf
+       @if test -d $(HOST_SUBDIR)/libctf; then \
+         cd $(HOST_SUBDIR); mv libctf stage1-libctf; \
+       fi
+@endif libctf
+       @if test -d $(TARGET_SUBDIR); then \
+         mv $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR); \
        fi
        rm -f stage_current
 
@@ -50819,8 +49591,8 @@ stage1-end::
 stage1-bubble:: 
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       if test -f stage1-lean  ; then \
-         echo Skipping rebuild of stage1 ; \
+       if test -f stage1-lean ; then \
+         echo Skipping rebuild of stage1; \
        else \
          $(MAKE) stage1-start; \
          $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1; \
@@ -50852,186 +49624,294 @@ distclean-stage1::
 
 stage2-start::
        @: $(MAKE); $(stage); \
-       echo stage2 > stage_current ; \
+       echo stage2 > stage_current; \
        echo stage2 > stage_last; \
        $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
 @if bfd
        @cd $(HOST_SUBDIR); [ -d stage2-bfd ] || \
          mkdir stage2-bfd; \
-       mv stage2-bfd bfd  ; \
+       mv stage2-bfd bfd; \
        mv stage1-bfd prev-bfd || test -f stage1-lean 
 @endif bfd
 @if opcodes
        @cd $(HOST_SUBDIR); [ -d stage2-opcodes ] || \
          mkdir stage2-opcodes; \
-       mv stage2-opcodes opcodes  ; \
+       mv stage2-opcodes opcodes; \
        mv stage1-opcodes prev-opcodes || test -f stage1-lean 
 @endif opcodes
 @if binutils
        @cd $(HOST_SUBDIR); [ -d stage2-binutils ] || \
          mkdir stage2-binutils; \
-       mv stage2-binutils binutils  ; \
+       mv stage2-binutils binutils; \
        mv stage1-binutils prev-binutils || test -f stage1-lean 
 @endif binutils
+@if fixincludes
+       @cd $(HOST_SUBDIR); [ -d stage2-fixincludes ] || \
+         mkdir stage2-fixincludes; \
+       mv stage2-fixincludes fixincludes; \
+       mv stage1-fixincludes prev-fixincludes || test -f stage1-lean 
+@endif fixincludes
 @if gas
        @cd $(HOST_SUBDIR); [ -d stage2-gas ] || \
          mkdir stage2-gas; \
-       mv stage2-gas gas  ; \
+       mv stage2-gas gas; \
        mv stage1-gas prev-gas || test -f stage1-lean 
 @endif gas
 @if gcc
        @cd $(HOST_SUBDIR); [ -d stage2-gcc ] || \
          mkdir stage2-gcc; \
-       mv stage2-gcc gcc  ; \
+       mv stage2-gcc gcc; \
        mv stage1-gcc prev-gcc || test -f stage1-lean 
 @endif gcc
 @if gmp
        @cd $(HOST_SUBDIR); [ -d stage2-gmp ] || \
          mkdir stage2-gmp; \
-       mv stage2-gmp gmp  ; \
+       mv stage2-gmp gmp; \
        mv stage1-gmp prev-gmp || test -f stage1-lean 
 @endif gmp
 @if mpfr
        @cd $(HOST_SUBDIR); [ -d stage2-mpfr ] || \
          mkdir stage2-mpfr; \
-       mv stage2-mpfr mpfr  ; \
+       mv stage2-mpfr mpfr; \
        mv stage1-mpfr prev-mpfr || test -f stage1-lean 
 @endif mpfr
+@if mpc
+       @cd $(HOST_SUBDIR); [ -d stage2-mpc ] || \
+         mkdir stage2-mpc; \
+       mv stage2-mpc mpc; \
+       mv stage1-mpc prev-mpc || test -f stage1-lean 
+@endif mpc
+@if isl
+       @cd $(HOST_SUBDIR); [ -d stage2-isl ] || \
+         mkdir stage2-isl; \
+       mv stage2-isl isl; \
+       mv stage1-isl prev-isl || test -f stage1-lean 
+@endif isl
+@if libelf
+       @cd $(HOST_SUBDIR); [ -d stage2-libelf ] || \
+         mkdir stage2-libelf; \
+       mv stage2-libelf libelf; \
+       mv stage1-libelf prev-libelf || test -f stage1-lean 
+@endif libelf
 @if gold
        @cd $(HOST_SUBDIR); [ -d stage2-gold ] || \
          mkdir stage2-gold; \
-       mv stage2-gold gold  ; \
+       mv stage2-gold gold; \
        mv stage1-gold prev-gold || test -f stage1-lean 
 @endif gold
 @if intl
        @cd $(HOST_SUBDIR); [ -d stage2-intl ] || \
          mkdir stage2-intl; \
-       mv stage2-intl intl  ; \
+       mv stage2-intl intl; \
        mv stage1-intl prev-intl || test -f stage1-lean 
 @endif intl
 @if ld
        @cd $(HOST_SUBDIR); [ -d stage2-ld ] || \
          mkdir stage2-ld; \
-       mv stage2-ld ld  ; \
+       mv stage2-ld ld; \
        mv stage1-ld prev-ld || test -f stage1-lean 
 @endif ld
+@if libbacktrace
+       @cd $(HOST_SUBDIR); [ -d stage2-libbacktrace ] || \
+         mkdir stage2-libbacktrace; \
+       mv stage2-libbacktrace libbacktrace; \
+       mv stage1-libbacktrace prev-libbacktrace || test -f stage1-lean 
+@endif libbacktrace
 @if libcpp
        @cd $(HOST_SUBDIR); [ -d stage2-libcpp ] || \
          mkdir stage2-libcpp; \
-       mv stage2-libcpp libcpp  ; \
+       mv stage2-libcpp libcpp; \
        mv stage1-libcpp prev-libcpp || test -f stage1-lean 
 @endif libcpp
 @if libdecnumber
        @cd $(HOST_SUBDIR); [ -d stage2-libdecnumber ] || \
          mkdir stage2-libdecnumber; \
-       mv stage2-libdecnumber libdecnumber  ; \
+       mv stage2-libdecnumber libdecnumber; \
        mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean 
 @endif libdecnumber
 @if libiberty
        @cd $(HOST_SUBDIR); [ -d stage2-libiberty ] || \
          mkdir stage2-libiberty; \
-       mv stage2-libiberty libiberty  ; \
+       mv stage2-libiberty libiberty; \
        mv stage1-libiberty prev-libiberty || test -f stage1-lean 
 @endif libiberty
+@if libiberty-linker-plugin
+       @cd $(HOST_SUBDIR); [ -d stage2-libiberty-linker-plugin ] || \
+         mkdir stage2-libiberty-linker-plugin; \
+       mv stage2-libiberty-linker-plugin libiberty-linker-plugin; \
+       mv stage1-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage1-lean 
+@endif libiberty-linker-plugin
+@if libiconv
+       @cd $(HOST_SUBDIR); [ -d stage2-libiconv ] || \
+         mkdir stage2-libiconv; \
+       mv stage2-libiconv libiconv; \
+       mv stage1-libiconv prev-libiconv || test -f stage1-lean 
+@endif libiconv
 @if zlib
        @cd $(HOST_SUBDIR); [ -d stage2-zlib ] || \
          mkdir stage2-zlib; \
-       mv stage2-zlib zlib  ; \
+       mv stage2-zlib zlib; \
        mv stage1-zlib prev-zlib || test -f stage1-lean 
 @endif zlib
+@if lto-plugin
+       @cd $(HOST_SUBDIR); [ -d stage2-lto-plugin ] || \
+         mkdir stage2-lto-plugin; \
+       mv stage2-lto-plugin lto-plugin; \
+       mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean 
+@endif lto-plugin
+@if libctf
+       @cd $(HOST_SUBDIR); [ -d stage2-libctf ] || \
+         mkdir stage2-libctf; \
+       mv stage2-libctf libctf; \
+       mv stage1-libctf prev-libctf || test -f stage1-lean 
+@endif libctf
        @[ -d stage2-$(TARGET_SUBDIR) ] || \
          mkdir stage2-$(TARGET_SUBDIR); \
-       mv stage2-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
+       mv stage2-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
        mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean 
 
 stage2-end:: 
 @if bfd
-       @if test -d $(HOST_SUBDIR)/bfd ; then \
-         cd $(HOST_SUBDIR); mv bfd stage2-bfd ; \
-         mv prev-bfd stage1-bfd ; :  ; \
+       @if test -d $(HOST_SUBDIR)/bfd; then \
+         cd $(HOST_SUBDIR); mv bfd stage2-bfd; \
+         mv prev-bfd stage1-bfd; : ; \
        fi
 @endif bfd
 @if opcodes
-       @if test -d $(HOST_SUBDIR)/opcodes ; then \
-         cd $(HOST_SUBDIR); mv opcodes stage2-opcodes ; \
-         mv prev-opcodes stage1-opcodes ; :  ; \
+       @if test -d $(HOST_SUBDIR)/opcodes; then \
+         cd $(HOST_SUBDIR); mv opcodes stage2-opcodes; \
+         mv prev-opcodes stage1-opcodes; : ; \
        fi
 @endif opcodes
 @if binutils
-       @if test -d $(HOST_SUBDIR)/binutils ; then \
-         cd $(HOST_SUBDIR); mv binutils stage2-binutils ; \
-         mv prev-binutils stage1-binutils ; :  ; \
+       @if test -d $(HOST_SUBDIR)/binutils; then \
+         cd $(HOST_SUBDIR); mv binutils stage2-binutils; \
+         mv prev-binutils stage1-binutils; : ; \
        fi
 @endif binutils
+@if fixincludes
+       @if test -d $(HOST_SUBDIR)/fixincludes; then \
+         cd $(HOST_SUBDIR); mv fixincludes stage2-fixincludes; \
+         mv prev-fixincludes stage1-fixincludes; : ; \
+       fi
+@endif fixincludes
 @if gas
-       @if test -d $(HOST_SUBDIR)/gas ; then \
-         cd $(HOST_SUBDIR); mv gas stage2-gas ; \
-         mv prev-gas stage1-gas ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gas; then \
+         cd $(HOST_SUBDIR); mv gas stage2-gas; \
+         mv prev-gas stage1-gas; : ; \
        fi
 @endif gas
 @if gcc
-       @if test -d $(HOST_SUBDIR)/gcc ; then \
-         cd $(HOST_SUBDIR); mv gcc stage2-gcc ; \
-         mv prev-gcc stage1-gcc ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gcc; then \
+         cd $(HOST_SUBDIR); mv gcc stage2-gcc; \
+         mv prev-gcc stage1-gcc; : ; \
        fi
 @endif gcc
 @if gmp
-       @if test -d $(HOST_SUBDIR)/gmp ; then \
-         cd $(HOST_SUBDIR); mv gmp stage2-gmp ; \
-         mv prev-gmp stage1-gmp ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gmp; then \
+         cd $(HOST_SUBDIR); mv gmp stage2-gmp; \
+         mv prev-gmp stage1-gmp; : ; \
        fi
 @endif gmp
 @if mpfr
-       @if test -d $(HOST_SUBDIR)/mpfr ; then \
-         cd $(HOST_SUBDIR); mv mpfr stage2-mpfr ; \
-         mv prev-mpfr stage1-mpfr ; :  ; \
+       @if test -d $(HOST_SUBDIR)/mpfr; then \
+         cd $(HOST_SUBDIR); mv mpfr stage2-mpfr; \
+         mv prev-mpfr stage1-mpfr; : ; \
        fi
 @endif mpfr
+@if mpc
+       @if test -d $(HOST_SUBDIR)/mpc; then \
+         cd $(HOST_SUBDIR); mv mpc stage2-mpc; \
+         mv prev-mpc stage1-mpc; : ; \
+       fi
+@endif mpc
+@if isl
+       @if test -d $(HOST_SUBDIR)/isl; then \
+         cd $(HOST_SUBDIR); mv isl stage2-isl; \
+         mv prev-isl stage1-isl; : ; \
+       fi
+@endif isl
+@if libelf
+       @if test -d $(HOST_SUBDIR)/libelf; then \
+         cd $(HOST_SUBDIR); mv libelf stage2-libelf; \
+         mv prev-libelf stage1-libelf; : ; \
+       fi
+@endif libelf
 @if gold
-       @if test -d $(HOST_SUBDIR)/gold ; then \
-         cd $(HOST_SUBDIR); mv gold stage2-gold ; \
-         mv prev-gold stage1-gold ; :  ; \
+       @if test -d $(HOST_SUBDIR)/gold; then \
+         cd $(HOST_SUBDIR); mv gold stage2-gold; \
+         mv prev-gold stage1-gold; : ; \
        fi
 @endif gold
 @if intl
-       @if test -d $(HOST_SUBDIR)/intl ; then \
-         cd $(HOST_SUBDIR); mv intl stage2-intl ; \
-         mv prev-intl stage1-intl ; :  ; \
+       @if test -d $(HOST_SUBDIR)/intl; then \
+         cd $(HOST_SUBDIR); mv intl stage2-intl; \
+         mv prev-intl stage1-intl; : ; \
        fi
 @endif intl
 @if ld
-       @if test -d $(HOST_SUBDIR)/ld ; then \
-         cd $(HOST_SUBDIR); mv ld stage2-ld ; \
-         mv prev-ld stage1-ld ; :  ; \
+       @if test -d $(HOST_SUBDIR)/ld; then \
+         cd $(HOST_SUBDIR); mv ld stage2-ld; \
+         mv prev-ld stage1-ld; : ; \
        fi
 @endif ld
+@if libbacktrace
+       @if test -d $(HOST_SUBDIR)/libbacktrace; then \
+         cd $(HOST_SUBDIR); mv libbacktrace stage2-libbacktrace; \
+         mv prev-libbacktrace stage1-libbacktrace; : ; \
+       fi
+@endif libbacktrace
 @if libcpp
-       @if test -d $(HOST_SUBDIR)/libcpp ; then \
-         cd $(HOST_SUBDIR); mv libcpp stage2-libcpp ; \
-         mv prev-libcpp stage1-libcpp ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libcpp; then \
+         cd $(HOST_SUBDIR); mv libcpp stage2-libcpp; \
+         mv prev-libcpp stage1-libcpp; : ; \
        fi
 @endif libcpp
 @if libdecnumber
-       @if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-         cd $(HOST_SUBDIR); mv libdecnumber stage2-libdecnumber ; \
-         mv prev-libdecnumber stage1-libdecnumber ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libdecnumber; then \
+         cd $(HOST_SUBDIR); mv libdecnumber stage2-libdecnumber; \
+         mv prev-libdecnumber stage1-libdecnumber; : ; \
        fi
 @endif libdecnumber
 @if libiberty
-       @if test -d $(HOST_SUBDIR)/libiberty ; then \
-         cd $(HOST_SUBDIR); mv libiberty stage2-libiberty ; \
-         mv prev-libiberty stage1-libiberty ; :  ; \
+       @if test -d $(HOST_SUBDIR)/libiberty; then \
+         cd $(HOST_SUBDIR); mv libiberty stage2-libiberty; \
+         mv prev-libiberty stage1-libiberty; : ; \
        fi
 @endif libiberty
+@if libiberty-linker-plugin
+       @if test -d $(HOST_SUBDIR)/libiberty-linker-plugin; then \
+         cd $(HOST_SUBDIR); mv libiberty-linker-plugin stage2-libiberty-linker-plugin; \
+         mv prev-libiberty-linker-plugin stage1-libiberty-linker-plugin; : ; \
+       fi
+@endif libiberty-linker-plugin
+@if libiconv
+       @if test -d $(HOST_SUBDIR)/libiconv; then \
+         cd $(HOST_SUBDIR); mv libiconv stage2-libiconv; \
+         mv prev-libiconv stage1-libiconv; : ; \
+       fi
+@endif libiconv
 @if zlib
-       @if test -d $(HOST_SUBDIR)/zlib ; then \
-         cd $(HOST_SUBDIR); mv zlib stage2-zlib ; \
-         mv prev-zlib stage1-zlib ; :  ; \
+       @if test -d $(HOST_SUBDIR)/zlib; then \
+         cd $(HOST_SUBDIR); mv zlib stage2-zlib; \
+         mv prev-zlib stage1-zlib; : ; \
        fi
 @endif zlib
-       @if test -d $(TARGET_SUBDIR) ; then \
-         mv $(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR)  ; \
-         mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; :  ; \
+@if lto-plugin
+       @if test -d $(HOST_SUBDIR)/lto-plugin; then \
+         cd $(HOST_SUBDIR); mv lto-plugin stage2-lto-plugin; \
+         mv prev-lto-plugin stage1-lto-plugin; : ; \
+       fi
+@endif lto-plugin
+@if libctf
+       @if test -d $(HOST_SUBDIR)/libctf; then \
+         cd $(HOST_SUBDIR); mv libctf stage2-libctf; \
+         mv prev-libctf stage1-libctf; : ; \
+       fi
+@endif libctf
+       @if test -d $(TARGET_SUBDIR); then \
+         mv $(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR); \
+         mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR); : ; \
        fi
        rm -f stage_current
 
@@ -51042,8 +49922,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; \
@@ -51067,6 +49947,7 @@ bootstrap2:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
        $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 
 bootstrap2-lean:
@@ -51077,6 +49958,7 @@ bootstrap2-lean:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
        $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 
 
@@ -51092,434 +49974,298 @@ distclean-stage2::
 @endif gcc-bootstrap
 
 
-.PHONY: stageb2g0-start stageb2g0-end
-
-stageb2g0-start::
-       @: $(MAKE); $(stage); \
-       echo stageb2g0 > stage_current ; \
-       echo stageb2g0 > stage_last; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
-@if bfd
-       @cd $(HOST_SUBDIR); [ -d stageb2g0-bfd ] || \
-         mkdir stageb2g0-bfd; \
-       mv stageb2g0-bfd bfd  ; \
-       mv stage1-bfd prev-bfd || test -f stage1-lean 
-@endif bfd
-@if opcodes
-       @cd $(HOST_SUBDIR); [ -d stageb2g0-opcodes ] || \
-         mkdir stageb2g0-opcodes; \
-       mv stageb2g0-opcodes opcodes  ; \
-       mv stage1-opcodes prev-opcodes || test -f stage1-lean 
-@endif opcodes
-@if binutils
-       @cd $(HOST_SUBDIR); [ -d stageb2g0-binutils ] || \
-         mkdir stageb2g0-binutils; \
-       mv stageb2g0-binutils binutils  ; \
-       mv stage1-binutils prev-binutils || test -f stage1-lean 
-@endif binutils
-@if gas
-       @cd $(HOST_SUBDIR); [ -d stageb2g0-gas ] || \
-         mkdir stageb2g0-gas; \
-       mv stageb2g0-gas gas  ; \
-       mv stage1-gas prev-gas || test -f stage1-lean 
-@endif gas
-@if gcc
-       @cd $(HOST_SUBDIR); [ -d stageb2g0-gcc ] || \
-         mkdir stageb2g0-gcc; \
-       mv stageb2g0-gcc gcc  ; \
-       mv stage1-gcc prev-gcc || test -f stage1-lean 
-@endif gcc
-@if gmp
-       @cd $(HOST_SUBDIR); [ -d stageb2g0-gmp ] || \
-         mkdir stageb2g0-gmp; \
-       mv stageb2g0-gmp gmp  ; \
-       mv stage1-gmp prev-gmp || test -f stage1-lean 
-@endif gmp
-@if mpfr
-       @cd $(HOST_SUBDIR); [ -d stageb2g0-mpfr ] || \
-         mkdir stageb2g0-mpfr; \
-       mv stageb2g0-mpfr mpfr  ; \
-       mv stage1-mpfr prev-mpfr || test -f stage1-lean 
-@endif mpfr
-@if gold
-       @cd $(HOST_SUBDIR); [ -d stageb2g0-gold ] || \
-         mkdir stageb2g0-gold; \
-       mv stageb2g0-gold gold  ; \
-       mv stage1-gold prev-gold || test -f stage1-lean 
-@endif gold
-@if intl
-       @cd $(HOST_SUBDIR); [ -d stageb2g0-intl ] || \
-         mkdir stageb2g0-intl; \
-       mv stageb2g0-intl intl  ; \
-       mv stage1-intl prev-intl || test -f stage1-lean 
-@endif intl
-@if ld
-       @cd $(HOST_SUBDIR); [ -d stageb2g0-ld ] || \
-         mkdir stageb2g0-ld; \
-       mv stageb2g0-ld ld  ; \
-       mv stage1-ld prev-ld || test -f stage1-lean 
-@endif ld
-@if libcpp
-       @cd $(HOST_SUBDIR); [ -d stageb2g0-libcpp ] || \
-         mkdir stageb2g0-libcpp; \
-       mv stageb2g0-libcpp libcpp  ; \
-       mv stage1-libcpp prev-libcpp || test -f stage1-lean 
-@endif libcpp
-@if libdecnumber
-       @cd $(HOST_SUBDIR); [ -d stageb2g0-libdecnumber ] || \
-         mkdir stageb2g0-libdecnumber; \
-       mv stageb2g0-libdecnumber libdecnumber  ; \
-       mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean 
-@endif libdecnumber
-@if libiberty
-       @cd $(HOST_SUBDIR); [ -d stageb2g0-libiberty ] || \
-         mkdir stageb2g0-libiberty; \
-       mv stageb2g0-libiberty libiberty  ; \
-       mv stage1-libiberty prev-libiberty || test -f stage1-lean 
-@endif libiberty
-@if zlib
-       @cd $(HOST_SUBDIR); [ -d stageb2g0-zlib ] || \
-         mkdir stageb2g0-zlib; \
-       mv stageb2g0-zlib zlib  ; \
-       mv stage1-zlib prev-zlib || test -f stage1-lean 
-@endif zlib
-       @[ -d stageb2g0-$(TARGET_SUBDIR) ] || \
-         mkdir stageb2g0-$(TARGET_SUBDIR); \
-       mv stageb2g0-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
-       mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean 
-
-stageb2g0-end:: 
-@if bfd
-       @if test -d $(HOST_SUBDIR)/bfd ; then \
-         cd $(HOST_SUBDIR); mv bfd stageb2g0-bfd ; \
-         mv prev-bfd stage1-bfd ; :  ; \
-       fi
-@endif bfd
-@if opcodes
-       @if test -d $(HOST_SUBDIR)/opcodes ; then \
-         cd $(HOST_SUBDIR); mv opcodes stageb2g0-opcodes ; \
-         mv prev-opcodes stage1-opcodes ; :  ; \
-       fi
-@endif opcodes
-@if binutils
-       @if test -d $(HOST_SUBDIR)/binutils ; then \
-         cd $(HOST_SUBDIR); mv binutils stageb2g0-binutils ; \
-         mv prev-binutils stage1-binutils ; :  ; \
-       fi
-@endif binutils
-@if gas
-       @if test -d $(HOST_SUBDIR)/gas ; then \
-         cd $(HOST_SUBDIR); mv gas stageb2g0-gas ; \
-         mv prev-gas stage1-gas ; :  ; \
-       fi
-@endif gas
-@if gcc
-       @if test -d $(HOST_SUBDIR)/gcc ; then \
-         cd $(HOST_SUBDIR); mv gcc stageb2g0-gcc ; \
-         mv prev-gcc stage1-gcc ; :  ; \
-       fi
-@endif gcc
-@if gmp
-       @if test -d $(HOST_SUBDIR)/gmp ; then \
-         cd $(HOST_SUBDIR); mv gmp stageb2g0-gmp ; \
-         mv prev-gmp stage1-gmp ; :  ; \
-       fi
-@endif gmp
-@if mpfr
-       @if test -d $(HOST_SUBDIR)/mpfr ; then \
-         cd $(HOST_SUBDIR); mv mpfr stageb2g0-mpfr ; \
-         mv prev-mpfr stage1-mpfr ; :  ; \
-       fi
-@endif mpfr
-@if gold
-       @if test -d $(HOST_SUBDIR)/gold ; then \
-         cd $(HOST_SUBDIR); mv gold stageb2g0-gold ; \
-         mv prev-gold stage1-gold ; :  ; \
-       fi
-@endif gold
-@if intl
-       @if test -d $(HOST_SUBDIR)/intl ; then \
-         cd $(HOST_SUBDIR); mv intl stageb2g0-intl ; \
-         mv prev-intl stage1-intl ; :  ; \
-       fi
-@endif intl
-@if ld
-       @if test -d $(HOST_SUBDIR)/ld ; then \
-         cd $(HOST_SUBDIR); mv ld stageb2g0-ld ; \
-         mv prev-ld stage1-ld ; :  ; \
-       fi
-@endif ld
-@if libcpp
-       @if test -d $(HOST_SUBDIR)/libcpp ; then \
-         cd $(HOST_SUBDIR); mv libcpp stageb2g0-libcpp ; \
-         mv prev-libcpp stage1-libcpp ; :  ; \
-       fi
-@endif libcpp
-@if libdecnumber
-       @if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-         cd $(HOST_SUBDIR); mv libdecnumber stageb2g0-libdecnumber ; \
-         mv prev-libdecnumber stage1-libdecnumber ; :  ; \
-       fi
-@endif libdecnumber
-@if libiberty
-       @if test -d $(HOST_SUBDIR)/libiberty ; then \
-         cd $(HOST_SUBDIR); mv libiberty stageb2g0-libiberty ; \
-         mv prev-libiberty stage1-libiberty ; :  ; \
-       fi
-@endif libiberty
-@if zlib
-       @if test -d $(HOST_SUBDIR)/zlib ; then \
-         cd $(HOST_SUBDIR); mv zlib stageb2g0-zlib ; \
-         mv prev-zlib stage1-zlib ; :  ; \
-       fi
-@endif zlib
-       @if test -d $(TARGET_SUBDIR) ; then \
-         mv $(TARGET_SUBDIR) stageb2g0-$(TARGET_SUBDIR)  ; \
-         mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; :  ; \
-       fi
-       rm -f stage_current
-
-# Bubble a bug fix through all the stages up to stage b2g0.  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured either.
-.PHONY: stageb2g0-bubble
-stageb2g0-bubble:: stage1-bubble
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       if test -f stageb2g0-lean || test -f stage1-lean  ; then \
-         echo Skipping rebuild of stageb2g0 ; \
-       else \
-         $(MAKE) stageb2g0-start; \
-         $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageb2g0; \
-       fi
-
-.PHONY: all-stageb2g0 clean-stageb2g0
-do-clean: clean-stageb2g0
-
-# FIXME: Will not need to be conditional when toplevel bootstrap is the
-# only possibility, but now it conflicts with no-bootstrap rules
-@if gcc-bootstrap
-
-
-
-.PHONY: bootstrap2-debug bootstrap2-debug-lean
-bootstrap2-debug:
-       echo stageb2g0 > stage_final
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) stageb2g0-bubble
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-bootstrap2-debug-lean:
-       echo stageb2g0 > stage_final
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stageb2g0-bubble
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-
-# Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stage1:: distclean-stageb2g0 
-.PHONY: distclean-stageb2g0
-distclean-stageb2g0::
-       @: $(MAKE); $(stage)
-       @test "`cat stage_last`" != stageb2g0 || rm -f stage_last
-       rm -rf stageb2g0-* 
-
-
-@endif gcc-bootstrap
-
-
 .PHONY: stage3-start stage3-end
 
 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 stage2-mpc prev-mpc || test -f stage2-lean 
+@endif mpc
+@if isl
+       @cd $(HOST_SUBDIR); [ -d stage3-isl ] || \
+         mkdir stage3-isl; \
+       mv stage3-isl isl; \
+       mv stage2-isl prev-isl || test -f stage2-lean 
+@endif isl
+@if libelf
+       @cd $(HOST_SUBDIR); [ -d stage3-libelf ] || \
+         mkdir stage3-libelf; \
+       mv stage3-libelf libelf; \
+       mv stage2-libelf prev-libelf || test -f stage2-lean 
+@endif libelf
 @if gold
        @cd $(HOST_SUBDIR); [ -d stage3-gold ] || \
          mkdir stage3-gold; \
-       mv stage3-gold gold  ; \
+       mv 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 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 stage2-lto-plugin prev-lto-plugin || test -f stage2-lean 
+@endif lto-plugin
+@if libctf
+       @cd $(HOST_SUBDIR); [ -d stage3-libctf ] || \
+         mkdir stage3-libctf; \
+       mv stage3-libctf libctf; \
+       mv stage2-libctf prev-libctf || test -f stage2-lean 
+@endif libctf
        @[ -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; : ; \
+       fi
+@endif mpc
+@if isl
+       @if test -d $(HOST_SUBDIR)/isl; then \
+         cd $(HOST_SUBDIR); mv isl stage3-isl; \
+         mv prev-isl stage2-isl; : ; \
+       fi
+@endif isl
+@if libelf
+       @if test -d $(HOST_SUBDIR)/libelf; then \
+         cd $(HOST_SUBDIR); mv libelf stage3-libelf; \
+         mv prev-libelf stage2-libelf; : ; \
+       fi
+@endif libelf
 @if gold
-       @if test -d $(HOST_SUBDIR)/gold ; then \
-         cd $(HOST_SUBDIR); mv gold stage3-gold ; \
-         mv prev-gold stage2-gold ; :  ; \
+       @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; : ; \
+       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 test -d $(TARGET_SUBDIR) ; then \
-         mv $(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR)  ; \
-         mv prev-$(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR) ; :  ; \
+@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; : ; \
+       fi
+@endif lto-plugin
+@if libctf
+       @if test -d $(HOST_SUBDIR)/libctf; then \
+         cd $(HOST_SUBDIR); mv libctf stage3-libctf; \
+         mv prev-libctf stage2-libctf; : ; \
+       fi
+@endif libctf
+       @if test -d $(TARGET_SUBDIR); then \
+         mv $(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR); \
+         mv prev-$(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR); : ; \
        fi
        rm -f stage_current
 
@@ -51530,13 +50276,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
@@ -51553,34 +50299,35 @@ 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 ; \
-       cd stage3-gcc; \
-       files=`find . -name "*$(objext)" -print` ; \
-       cd .. ; \
-       for file in $${files} ; do \
-         f1=$$r/stage2-gcc/$$file; f2=$$r/stage3-gcc/$$file; \
+       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 \
+         f1=$$r/stage2-$$file; f2=$$r/stage3-$$file; \
+         if test ! -f $$f1; then continue; fi; \
          $(do-compare) > /dev/null 2>&1; \
          if test $$? -eq 1; then \
            case $$file in \
-             ./cc*-checksum$(objext) | ./libgcc/* ) \
+             @compare_exclusions@) \
                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-*; \
@@ -51598,6 +50345,7 @@ bootstrap:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
        $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 
 bootstrap-lean:
@@ -51608,6 +50356,7 @@ bootstrap-lean:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
        $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 
 
@@ -51629,304 +50378,7 @@ cleanstrap: do-distclean local-clean
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-@endif gcc-bootstrap
-
-
-.PHONY: stageb3g2-start stageb3g2-end
-
-stageb3g2-start::
-       @: $(MAKE); $(stage); \
-       echo stageb3g2 > stage_current ; \
-       echo stageb3g2 > stage_last; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
-@if bfd
-       @cd $(HOST_SUBDIR); [ -d stageb3g2-bfd ] || \
-         mkdir stageb3g2-bfd; \
-       mv stageb3g2-bfd bfd  ; \
-       mv stageb2g0-bfd prev-bfd || test -f stageb2g0-lean 
-@endif bfd
-@if opcodes
-       @cd $(HOST_SUBDIR); [ -d stageb3g2-opcodes ] || \
-         mkdir stageb3g2-opcodes; \
-       mv stageb3g2-opcodes opcodes  ; \
-       mv stageb2g0-opcodes prev-opcodes || test -f stageb2g0-lean 
-@endif opcodes
-@if binutils
-       @cd $(HOST_SUBDIR); [ -d stageb3g2-binutils ] || \
-         mkdir stageb3g2-binutils; \
-       mv stageb3g2-binutils binutils  ; \
-       mv stageb2g0-binutils prev-binutils || test -f stageb2g0-lean 
-@endif binutils
-@if gas
-       @cd $(HOST_SUBDIR); [ -d stageb3g2-gas ] || \
-         mkdir stageb3g2-gas; \
-       mv stageb3g2-gas gas  ; \
-       mv stageb2g0-gas prev-gas || test -f stageb2g0-lean 
-@endif gas
-@if gcc
-       @cd $(HOST_SUBDIR); [ -d stageb3g2-gcc ] || \
-         mkdir stageb3g2-gcc; \
-       mv stageb3g2-gcc gcc  ; \
-       mv stageb2g0-gcc prev-gcc || test -f stageb2g0-lean 
-@endif gcc
-@if gmp
-       @cd $(HOST_SUBDIR); [ -d stageb3g2-gmp ] || \
-         mkdir stageb3g2-gmp; \
-       mv stageb3g2-gmp gmp  ; \
-       mv stageb2g0-gmp prev-gmp || test -f stageb2g0-lean 
-@endif gmp
-@if mpfr
-       @cd $(HOST_SUBDIR); [ -d stageb3g2-mpfr ] || \
-         mkdir stageb3g2-mpfr; \
-       mv stageb3g2-mpfr mpfr  ; \
-       mv stageb2g0-mpfr prev-mpfr || test -f stageb2g0-lean 
-@endif mpfr
-@if gold
-       @cd $(HOST_SUBDIR); [ -d stageb3g2-gold ] || \
-         mkdir stageb3g2-gold; \
-       mv stageb3g2-gold gold  ; \
-       mv stageb2g0-gold prev-gold || test -f stageb2g0-lean 
-@endif gold
-@if intl
-       @cd $(HOST_SUBDIR); [ -d stageb3g2-intl ] || \
-         mkdir stageb3g2-intl; \
-       mv stageb3g2-intl intl  ; \
-       mv stageb2g0-intl prev-intl || test -f stageb2g0-lean 
-@endif intl
-@if ld
-       @cd $(HOST_SUBDIR); [ -d stageb3g2-ld ] || \
-         mkdir stageb3g2-ld; \
-       mv stageb3g2-ld ld  ; \
-       mv stageb2g0-ld prev-ld || test -f stageb2g0-lean 
-@endif ld
-@if libcpp
-       @cd $(HOST_SUBDIR); [ -d stageb3g2-libcpp ] || \
-         mkdir stageb3g2-libcpp; \
-       mv stageb3g2-libcpp libcpp  ; \
-       mv stageb2g0-libcpp prev-libcpp || test -f stageb2g0-lean 
-@endif libcpp
-@if libdecnumber
-       @cd $(HOST_SUBDIR); [ -d stageb3g2-libdecnumber ] || \
-         mkdir stageb3g2-libdecnumber; \
-       mv stageb3g2-libdecnumber libdecnumber  ; \
-       mv stageb2g0-libdecnumber prev-libdecnumber || test -f stageb2g0-lean 
-@endif libdecnumber
-@if libiberty
-       @cd $(HOST_SUBDIR); [ -d stageb3g2-libiberty ] || \
-         mkdir stageb3g2-libiberty; \
-       mv stageb3g2-libiberty libiberty  ; \
-       mv stageb2g0-libiberty prev-libiberty || test -f stageb2g0-lean 
-@endif libiberty
-@if zlib
-       @cd $(HOST_SUBDIR); [ -d stageb3g2-zlib ] || \
-         mkdir stageb3g2-zlib; \
-       mv stageb3g2-zlib zlib  ; \
-       mv stageb2g0-zlib prev-zlib || test -f stageb2g0-lean 
-@endif zlib
-       @[ -d stageb3g2-$(TARGET_SUBDIR) ] || \
-         mkdir stageb3g2-$(TARGET_SUBDIR); \
-       mv stageb3g2-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
-       mv stageb2g0-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stageb2g0-lean 
-
-stageb3g2-end:: 
-@if bfd
-       @if test -d $(HOST_SUBDIR)/bfd ; then \
-         cd $(HOST_SUBDIR); mv bfd stageb3g2-bfd ; \
-         mv prev-bfd stageb2g0-bfd ; :  ; \
-       fi
-@endif bfd
-@if opcodes
-       @if test -d $(HOST_SUBDIR)/opcodes ; then \
-         cd $(HOST_SUBDIR); mv opcodes stageb3g2-opcodes ; \
-         mv prev-opcodes stageb2g0-opcodes ; :  ; \
-       fi
-@endif opcodes
-@if binutils
-       @if test -d $(HOST_SUBDIR)/binutils ; then \
-         cd $(HOST_SUBDIR); mv binutils stageb3g2-binutils ; \
-         mv prev-binutils stageb2g0-binutils ; :  ; \
-       fi
-@endif binutils
-@if gas
-       @if test -d $(HOST_SUBDIR)/gas ; then \
-         cd $(HOST_SUBDIR); mv gas stageb3g2-gas ; \
-         mv prev-gas stageb2g0-gas ; :  ; \
-       fi
-@endif gas
-@if gcc
-       @if test -d $(HOST_SUBDIR)/gcc ; then \
-         cd $(HOST_SUBDIR); mv gcc stageb3g2-gcc ; \
-         mv prev-gcc stageb2g0-gcc ; :  ; \
-       fi
-@endif gcc
-@if gmp
-       @if test -d $(HOST_SUBDIR)/gmp ; then \
-         cd $(HOST_SUBDIR); mv gmp stageb3g2-gmp ; \
-         mv prev-gmp stageb2g0-gmp ; :  ; \
-       fi
-@endif gmp
-@if mpfr
-       @if test -d $(HOST_SUBDIR)/mpfr ; then \
-         cd $(HOST_SUBDIR); mv mpfr stageb3g2-mpfr ; \
-         mv prev-mpfr stageb2g0-mpfr ; :  ; \
-       fi
-@endif mpfr
-@if gold
-       @if test -d $(HOST_SUBDIR)/gold ; then \
-         cd $(HOST_SUBDIR); mv gold stageb3g2-gold ; \
-         mv prev-gold stageb2g0-gold ; :  ; \
-       fi
-@endif gold
-@if intl
-       @if test -d $(HOST_SUBDIR)/intl ; then \
-         cd $(HOST_SUBDIR); mv intl stageb3g2-intl ; \
-         mv prev-intl stageb2g0-intl ; :  ; \
-       fi
-@endif intl
-@if ld
-       @if test -d $(HOST_SUBDIR)/ld ; then \
-         cd $(HOST_SUBDIR); mv ld stageb3g2-ld ; \
-         mv prev-ld stageb2g0-ld ; :  ; \
-       fi
-@endif ld
-@if libcpp
-       @if test -d $(HOST_SUBDIR)/libcpp ; then \
-         cd $(HOST_SUBDIR); mv libcpp stageb3g2-libcpp ; \
-         mv prev-libcpp stageb2g0-libcpp ; :  ; \
-       fi
-@endif libcpp
-@if libdecnumber
-       @if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-         cd $(HOST_SUBDIR); mv libdecnumber stageb3g2-libdecnumber ; \
-         mv prev-libdecnumber stageb2g0-libdecnumber ; :  ; \
-       fi
-@endif libdecnumber
-@if libiberty
-       @if test -d $(HOST_SUBDIR)/libiberty ; then \
-         cd $(HOST_SUBDIR); mv libiberty stageb3g2-libiberty ; \
-         mv prev-libiberty stageb2g0-libiberty ; :  ; \
-       fi
-@endif libiberty
-@if zlib
-       @if test -d $(HOST_SUBDIR)/zlib ; then \
-         cd $(HOST_SUBDIR); mv zlib stageb3g2-zlib ; \
-         mv prev-zlib stageb2g0-zlib ; :  ; \
-       fi
-@endif zlib
-       @if test -d $(TARGET_SUBDIR) ; then \
-         mv $(TARGET_SUBDIR) stageb3g2-$(TARGET_SUBDIR)  ; \
-         mv prev-$(TARGET_SUBDIR) stageb2g0-$(TARGET_SUBDIR) ; :  ; \
-       fi
-       rm -f stage_current
-
-# Bubble a bug fix through all the stages up to stage b3g2.  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured either.
-.PHONY: stageb3g2-bubble
-stageb3g2-bubble:: stageb2g0-bubble
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       if test -f stageb3g2-lean || test -f stageb2g0-lean  ; then \
-         echo Skipping rebuild of stageb3g2 ; \
-       else \
-         $(MAKE) stageb3g2-start; \
-         if $(LEAN); then \
-           rm -rf stage1-* ; \
-           $(STAMP) stage1-lean ; \
-         fi; \
-         $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageb3g2; \
-       fi
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare-debug
-
-.PHONY: all-stageb3g2 clean-stageb3g2
-do-clean: clean-stageb3g2
-
-# 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
-
-compare-debug:
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       if test -f stageb2g0-lean; then \
-         echo Cannot compare object files as stage b2g0 was deleted. ; \
-         exit 0 ; \
-       fi; \
-       : $(MAKE); $(stage); \
-       rm -f .bad_compare ; \
-       echo Comparing stages b2g0 and b3g2 ; \
-       cd stageb3g2-gcc; \
-       files=`find . -name "*$(objext)" -print` ; \
-       cd .. ; \
-       for file in $${files} ; do \
-         f1=$$r/stageb2g0-gcc/$$file; f2=$$r/stageb3g2-gcc/$$file; \
-         $(do-compare-debug) > /dev/null 2>&1; \
-         if test $$? -eq 1; then \
-           case $$file in \
-             ./cc*-checksum$(objext) | ./libgcc/* ) \
-               echo warning: $$file differs ;; \
-             *) \
-               echo $$file differs >> .bad_compare ;; \
-           esac ; \
-         fi ; \
-       done ; \
-       if [ -f .bad_compare ]; then \
-         echo "Bootstrap comparison failure!"; \
-         cat .bad_compare; \
-         exit 1; \
-       else \
-         echo Comparison successful.; \
-       fi ; \
-       $(STAMP) compare-debug
-       if $(LEAN); then \
-         rm -rf stageb2g0-*; \
-         $(STAMP) stageb2g0-lean; \
-       fi
-
-
-
-.PHONY: bootstrap-debug bootstrap-debug-lean
-bootstrap-debug:
-       echo stageb3g2 > stage_final
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) stageb3g2-bubble
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-bootstrap-debug-lean:
-       echo stageb3g2 > stage_final
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stageb3g2-bubble
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-
-# Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stageb2g0:: distclean-stageb3g2 
-.PHONY: distclean-stageb3g2
-distclean-stageb3g2::
-       @: $(MAKE); $(stage)
-       @test "`cat stage_last`" != stageb3g2 || rm -f stage_last
-       rm -rf stageb3g2-* compare-debug 
-
-
-.PHONY: cleanstrap-debug
-cleanstrap-debug: do-distclean local-clean
-       echo stageb3g2 > stage_final
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(MAKE) $(RECURSE_FLAGS_TO_PASS) stageb3g2-bubble
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
        $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 
 @endif gcc-bootstrap
@@ -51936,186 +50388,294 @@ cleanstrap-debug: 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 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 stage3-isl prev-isl || test -f stage3-lean 
+@endif isl
+@if libelf
+       @cd $(HOST_SUBDIR); [ -d stage4-libelf ] || \
+         mkdir stage4-libelf; \
+       mv stage4-libelf libelf; \
+       mv 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 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 stage3-lto-plugin prev-lto-plugin || test -f stage3-lean 
+@endif lto-plugin
+@if libctf
+       @cd $(HOST_SUBDIR); [ -d stage4-libctf ] || \
+         mkdir stage4-libctf; \
+       mv stage4-libctf libctf; \
+       mv stage3-libctf prev-libctf || test -f stage3-lean 
+@endif libctf
        @[ -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; : ; \
+       fi
+@endif mpc
+@if isl
+       @if test -d $(HOST_SUBDIR)/isl; then \
+         cd $(HOST_SUBDIR); mv isl stage4-isl; \
+         mv prev-isl stage3-isl; : ; \
+       fi
+@endif isl
+@if 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; : ; \
+       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 test -d $(TARGET_SUBDIR) ; then \
-         mv $(TARGET_SUBDIR) stage4-$(TARGET_SUBDIR)  ; \
-         mv prev-$(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR) ; :  ; \
+@if lto-plugin
+       @if test -d $(HOST_SUBDIR)/lto-plugin; then \
+         cd $(HOST_SUBDIR); mv lto-plugin stage4-lto-plugin; \
+         mv prev-lto-plugin stage3-lto-plugin; : ; \
+       fi
+@endif lto-plugin
+@if libctf
+       @if test -d $(HOST_SUBDIR)/libctf; then \
+         cd $(HOST_SUBDIR); mv libctf stage4-libctf; \
+         mv prev-libctf stage3-libctf; : ; \
+       fi
+@endif libctf
+       @if test -d $(TARGET_SUBDIR); then \
+         mv $(TARGET_SUBDIR) stage4-$(TARGET_SUBDIR); \
+         mv prev-$(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR); : ; \
        fi
        rm -f stage_current
 
@@ -52126,13 +50686,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
@@ -52149,34 +50709,35 @@ 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 ; \
-       cd stage4-gcc; \
-       files=`find . -name "*$(objext)" -print` ; \
-       cd .. ; \
-       for file in $${files} ; do \
-         f1=$$r/stage3-gcc/$$file; f2=$$r/stage4-gcc/$$file; \
+       rm -f .bad_compare; \
+       echo Comparing stages 3 and 4; \
+        sed=`echo stage4 | sed 's,^stage,,;s,.,.,g'`; \
+       files=`find stage4-* -name "*$(objext)" -print | \
+                sed -n s,^stage$$sed-,,p`; \
+       for file in $${files}; do \
+         f1=$$r/stage3-$$file; f2=$$r/stage4-$$file; \
+         if test ! -f $$f1; then continue; fi; \
          $(do-compare3) > /dev/null 2>&1; \
          if test $$? -eq 1; then \
            case $$file in \
-             ./cc*-checksum$(objext) | ./libgcc/* ) \
+             @compare_exclusions@) \
                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-*; \
@@ -52194,6 +50755,7 @@ bootstrap4:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
        $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 
 bootstrap4-lean:
@@ -52204,6 +50766,7 @@ bootstrap4-lean:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
        $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 
 
@@ -52223,186 +50786,294 @@ 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 stage1-mpc prev-mpc || test -f stage1-lean 
+@endif mpc
+@if isl
+       @cd $(HOST_SUBDIR); [ -d stageprofile-isl ] || \
+         mkdir stageprofile-isl; \
+       mv stageprofile-isl isl; \
+       mv stage1-isl prev-isl || test -f stage1-lean 
+@endif isl
+@if libelf
+       @cd $(HOST_SUBDIR); [ -d stageprofile-libelf ] || \
+         mkdir stageprofile-libelf; \
+       mv stageprofile-libelf libelf; \
+       mv stage1-libelf prev-libelf || test -f stage1-lean 
+@endif libelf
 @if gold
        @cd $(HOST_SUBDIR); [ -d stageprofile-gold ] || \
          mkdir stageprofile-gold; \
-       mv stageprofile-gold gold  ; \
+       mv 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 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 stage1-lto-plugin prev-lto-plugin || test -f stage1-lean 
+@endif lto-plugin
+@if libctf
+       @cd $(HOST_SUBDIR); [ -d stageprofile-libctf ] || \
+         mkdir stageprofile-libctf; \
+       mv stageprofile-libctf libctf; \
+       mv stage1-libctf prev-libctf || test -f stage1-lean 
+@endif libctf
        @[ -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; : ; \
+       fi
+@endif mpc
+@if isl
+       @if test -d $(HOST_SUBDIR)/isl; then \
+         cd $(HOST_SUBDIR); mv isl stageprofile-isl; \
+         mv prev-isl stage1-isl; : ; \
+       fi
+@endif isl
+@if libelf
+       @if test -d $(HOST_SUBDIR)/libelf; then \
+         cd $(HOST_SUBDIR); mv libelf stageprofile-libelf; \
+         mv prev-libelf stage1-libelf; : ; \
+       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; : ; \
+       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 test -d $(TARGET_SUBDIR) ; then \
-         mv $(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR)  ; \
-         mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; :  ; \
+@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; : ; \
+       fi
+@endif lto-plugin
+@if libctf
+       @if test -d $(HOST_SUBDIR)/libctf; then \
+         cd $(HOST_SUBDIR); mv libctf stageprofile-libctf; \
+         mv prev-libctf stage1-libctf; : ; \
+       fi
+@endif libctf
+       @if test -d $(TARGET_SUBDIR); then \
+         mv $(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR); \
+         mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR); : ; \
        fi
        rm -f stage_current
 
@@ -52413,8 +51084,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; \
@@ -52446,186 +51117,294 @@ 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 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 stageprofile-isl prev-isl || test -f stageprofile-lean 
+@endif isl
+@if libelf
+       @cd $(HOST_SUBDIR); [ -d stagefeedback-libelf ] || \
+         mkdir stagefeedback-libelf; \
+       mv stagefeedback-libelf libelf; \
+       mv 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 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 stageprofile-lto-plugin prev-lto-plugin || test -f stageprofile-lean 
+@endif lto-plugin
+@if libctf
+       @cd $(HOST_SUBDIR); [ -d stagefeedback-libctf ] || \
+         mkdir stagefeedback-libctf; \
+       mv stagefeedback-libctf libctf; \
+       mv stageprofile-libctf prev-libctf || test -f stageprofile-lean 
+@endif libctf
        @[ -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; : ; \
+       fi
+@endif mpc
+@if isl
+       @if test -d $(HOST_SUBDIR)/isl; then \
+         cd $(HOST_SUBDIR); mv isl stagefeedback-isl; \
+         mv prev-isl stageprofile-isl; : ; \
+       fi
+@endif isl
+@if libelf
+       @if test -d $(HOST_SUBDIR)/libelf; then \
+         cd $(HOST_SUBDIR); mv libelf stagefeedback-libelf; \
+         mv prev-libelf stageprofile-libelf; : ; \
+       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; : ; \
+       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 test -d $(TARGET_SUBDIR) ; then \
-         mv $(TARGET_SUBDIR) stagefeedback-$(TARGET_SUBDIR)  ; \
-         mv prev-$(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR) ; :  ; \
+@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; : ; \
+       fi
+@endif lto-plugin
+@if libctf
+       @if test -d $(HOST_SUBDIR)/libctf; then \
+         cd $(HOST_SUBDIR); mv libctf stagefeedback-libctf; \
+         mv prev-libctf stageprofile-libctf; : ; \
+       fi
+@endif libctf
+       @if test -d $(TARGET_SUBDIR); then \
+         mv $(TARGET_SUBDIR) stagefeedback-$(TARGET_SUBDIR); \
+         mv prev-$(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR); : ; \
        fi
        rm -f stage_current
 
@@ -52636,8 +51415,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; \
@@ -52661,6 +51440,7 @@ profiledbootstrap:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 
 profiledbootstrap-lean:
@@ -52671,6 +51451,7 @@ profiledbootstrap-lean:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 
 
@@ -52694,10 +51475,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
@@ -52706,6 +51487,8 @@ do-distclean: distclean-stage1
 # Provide a GCC build when we're building target libraries.  This does
 # not work as a dependency, just as the minimum necessary to avoid errors.
 stage_last:
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble
 
 # Same as unstage, but not phony and defaulting to stage1-start.  We place
@@ -52716,7 +51499,7 @@ stage_current:
 .PHONY: restrap
 restrap::
        @: $(MAKE); $(stage)
-       rm -rf stage1-$(TARGET_SUBDIR) stage2-* stageb2g0-* stage3-* stageb3g2-* stage4-* stageprofile-* stagefeedback-* 
+       rm -rf stage1-$(TARGET_SUBDIR) stage2-* stage3-* stage4-* stageprofile-* stagefeedback-*
 restrap:: all
 @endif gcc-bootstrap
 
@@ -52726,58 +51509,87 @@ restrap:: all
 
 # Generic dependencies for target modules on host stuff, especially gcc
 @if gcc-bootstrap
-configure-target-libstdc++-v3: stage_last
-configure-target-libmudflap: stage_last
+configure-stage1-target-libstdc++-v3: maybe-all-stage1-gcc
+configure-stage2-target-libstdc++-v3: maybe-all-stage2-gcc
+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-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
 configure-stage2-target-libgcc: maybe-all-stage2-gcc
-configure-stageb2g0-target-libgcc: maybe-all-stageb2g0-gcc
 configure-stage3-target-libgcc: maybe-all-stage3-gcc
-configure-stageb3g2-target-libgcc: maybe-all-stageb3g2-gcc
 configure-stage4-target-libgcc: maybe-all-stage4-gcc
 configure-stageprofile-target-libgcc: maybe-all-stageprofile-gcc
 configure-stagefeedback-target-libgcc: maybe-all-stagefeedback-gcc
+configure-target-libbacktrace: stage_last
+configure-target-libquadmath: stage_last
 configure-target-libgfortran: stage_last
 configure-target-libobjc: stage_last
+configure-target-libgo: stage_last
 configure-target-libtermcap: stage_last
 configure-target-winsup: stage_last
 configure-target-libgloss: stage_last
-configure-target-libiberty: stage_last
-configure-target-gperf: stage_last
-configure-target-examples: 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-qthreads: stage_last
 configure-target-rda: stage_last
 configure-target-libada: stage_last
-configure-target-libgomp: stage_last
+configure-stage1-target-libgomp: maybe-all-stage1-gcc
+configure-stage2-target-libgomp: maybe-all-stage2-gcc
+configure-stage3-target-libgomp: maybe-all-stage3-gcc
+configure-stage4-target-libgomp: maybe-all-stage4-gcc
+configure-stageprofile-target-libgomp: maybe-all-stageprofile-gcc
+configure-stagefeedback-target-libgomp: maybe-all-stagefeedback-gcc
+configure-target-libitm: stage_last
+configure-target-libatomic: stage_last
 @endif gcc-bootstrap
 
 @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
+configure-target-libbacktrace: maybe-all-gcc
+configure-target-libquadmath: maybe-all-gcc
 configure-target-libgfortran: maybe-all-gcc
 configure-target-libobjc: maybe-all-gcc
+configure-target-libgo: maybe-all-gcc
 configure-target-libtermcap: maybe-all-gcc
 configure-target-winsup: maybe-all-gcc
 configure-target-libgloss: maybe-all-gcc
-configure-target-libiberty: maybe-all-gcc
-configure-target-gperf: maybe-all-gcc
-configure-target-examples: 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-qthreads: maybe-all-gcc
 configure-target-rda: maybe-all-gcc
 configure-target-libada: maybe-all-gcc
 configure-target-libgomp: maybe-all-gcc
+configure-target-libitm: maybe-all-gcc
+configure-target-libatomic: maybe-all-gcc
 @endif gcc-no-bootstrap
 
 
@@ -52799,637 +51611,684 @@ configure-target-libgomp: maybe-all-gcc
 # prebootstrap dependencies, prebootstrap modules are gathered in
 # a hash table.
 all-build-bison: maybe-all-build-texinfo
-all-build-byacc: maybe-all-build-texinfo
 all-build-flex: maybe-all-build-texinfo
 all-build-flex: maybe-all-build-bison
-all-build-flex: maybe-all-build-byacc
 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
 configure-stage2-gcc: maybe-configure-stage2-intl
-configure-stageb2g0-gcc: maybe-configure-stageb2g0-intl
 configure-stage3-gcc: maybe-configure-stage3-intl
-configure-stageb3g2-gcc: maybe-configure-stageb3g2-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
+configure-stage2-gcc: maybe-all-stage2-lto-plugin
+configure-stage3-gcc: maybe-all-stage3-lto-plugin
+configure-stage4-gcc: maybe-all-stage4-lto-plugin
+configure-stageprofile-gcc: maybe-all-stageprofile-lto-plugin
+configure-stagefeedback-gcc: maybe-all-stagefeedback-lto-plugin
 configure-gcc: maybe-all-binutils
-
 configure-stage1-gcc: maybe-all-stage1-binutils
 configure-stage2-gcc: maybe-all-stage2-binutils
-configure-stageb2g0-gcc: maybe-all-stageb2g0-binutils
 configure-stage3-gcc: maybe-all-stage3-binutils
-configure-stageb3g2-gcc: maybe-all-stageb3g2-binutils
 configure-stage4-gcc: maybe-all-stage4-binutils
 configure-stageprofile-gcc: maybe-all-stageprofile-binutils
 configure-stagefeedback-gcc: maybe-all-stagefeedback-binutils
 configure-gcc: maybe-all-gas
-
 configure-stage1-gcc: maybe-all-stage1-gas
 configure-stage2-gcc: maybe-all-stage2-gas
-configure-stageb2g0-gcc: maybe-all-stageb2g0-gas
 configure-stage3-gcc: maybe-all-stage3-gas
-configure-stageb3g2-gcc: maybe-all-stageb3g2-gas
 configure-stage4-gcc: maybe-all-stage4-gas
 configure-stageprofile-gcc: maybe-all-stageprofile-gas
 configure-stagefeedback-gcc: maybe-all-stagefeedback-gas
 configure-gcc: maybe-all-ld
-
 configure-stage1-gcc: maybe-all-stage1-ld
 configure-stage2-gcc: maybe-all-stage2-ld
-configure-stageb2g0-gcc: maybe-all-stageb2g0-ld
 configure-stage3-gcc: maybe-all-stage3-ld
-configure-stageb3g2-gcc: maybe-all-stageb3g2-ld
 configure-stage4-gcc: maybe-all-stage4-ld
 configure-stageprofile-gcc: maybe-all-stageprofile-ld
 configure-stagefeedback-gcc: maybe-all-stagefeedback-ld
 configure-gcc: maybe-all-gold
-
 configure-stage1-gcc: maybe-all-stage1-gold
 configure-stage2-gcc: maybe-all-stage2-gold
-configure-stageb2g0-gcc: maybe-all-stageb2g0-gold
 configure-stage3-gcc: maybe-all-stage3-gold
-configure-stageb3g2-gcc: maybe-all-stageb3g2-gold
 configure-stage4-gcc: maybe-all-stage4-gold
 configure-stageprofile-gcc: maybe-all-stageprofile-gold
 configure-stagefeedback-gcc: maybe-all-stagefeedback-gold
+configure-gcc: maybe-all-libelf
+configure-stage1-gcc: maybe-all-stage1-libelf
+configure-stage2-gcc: maybe-all-stage2-libelf
+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
 all-stage2-gcc: all-stage2-libiberty
-all-stageb2g0-gcc: all-stageb2g0-libiberty
 all-stage3-gcc: all-stage3-libiberty
-all-stageb3g2-gcc: all-stageb3g2-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-stageb2g0-gcc: maybe-all-stageb2g0-gmp
-all-stage3-gcc: maybe-all-stage3-gmp
-all-stageb3g2-gcc: maybe-all-stageb3g2-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
 all-stage2-gcc: maybe-all-stage2-intl
-all-stageb2g0-gcc: maybe-all-stageb2g0-intl
 all-stage3-gcc: maybe-all-stage3-intl
-all-stageb3g2-gcc: maybe-all-stageb3g2-intl
 all-stage4-gcc: maybe-all-stage4-intl
 all-stageprofile-gcc: maybe-all-stageprofile-intl
 all-stagefeedback-gcc: maybe-all-stagefeedback-intl
 all-gcc: maybe-all-mpfr
-
 all-stage1-gcc: maybe-all-stage1-mpfr
 all-stage2-gcc: maybe-all-stage2-mpfr
-all-stageb2g0-gcc: maybe-all-stageb2g0-mpfr
 all-stage3-gcc: maybe-all-stage3-mpfr
-all-stageb3g2-gcc: maybe-all-stageb3g2-mpfr
 all-stage4-gcc: maybe-all-stage4-mpfr
 all-stageprofile-gcc: maybe-all-stageprofile-mpfr
 all-stagefeedback-gcc: maybe-all-stagefeedback-mpfr
+all-gcc: maybe-all-mpc
+all-stage1-gcc: maybe-all-stage1-mpc
+all-stage2-gcc: maybe-all-stage2-mpc
+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-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
 all-stage2-gcc: maybe-all-build-texinfo
-all-stageb2g0-gcc: maybe-all-build-texinfo
 all-stage3-gcc: maybe-all-build-texinfo
-all-stageb3g2-gcc: maybe-all-build-texinfo
 all-stage4-gcc: maybe-all-build-texinfo
 all-stageprofile-gcc: maybe-all-build-texinfo
 all-stagefeedback-gcc: maybe-all-build-texinfo
 all-gcc: maybe-all-build-bison
-
 all-stage1-gcc: maybe-all-build-bison
 all-stage2-gcc: maybe-all-build-bison
-all-stageb2g0-gcc: maybe-all-build-bison
 all-stage3-gcc: maybe-all-build-bison
-all-stageb3g2-gcc: maybe-all-build-bison
 all-stage4-gcc: maybe-all-build-bison
 all-stageprofile-gcc: maybe-all-build-bison
 all-stagefeedback-gcc: maybe-all-build-bison
-all-gcc: maybe-all-build-byacc
-
-all-stage1-gcc: maybe-all-build-byacc
-all-stage2-gcc: maybe-all-build-byacc
-all-stageb2g0-gcc: maybe-all-build-byacc
-all-stage3-gcc: maybe-all-build-byacc
-all-stageb3g2-gcc: maybe-all-build-byacc
-all-stage4-gcc: maybe-all-build-byacc
-all-stageprofile-gcc: maybe-all-build-byacc
-all-stagefeedback-gcc: maybe-all-build-byacc
 all-gcc: maybe-all-build-flex
-
 all-stage1-gcc: maybe-all-build-flex
 all-stage2-gcc: maybe-all-build-flex
-all-stageb2g0-gcc: maybe-all-build-flex
 all-stage3-gcc: maybe-all-build-flex
-all-stageb3g2-gcc: maybe-all-build-flex
 all-stage4-gcc: maybe-all-build-flex
 all-stageprofile-gcc: maybe-all-build-flex
 all-stagefeedback-gcc: maybe-all-build-flex
 all-gcc: maybe-all-build-libiberty
-
 all-stage1-gcc: maybe-all-build-libiberty
 all-stage2-gcc: maybe-all-build-libiberty
-all-stageb2g0-gcc: maybe-all-build-libiberty
 all-stage3-gcc: maybe-all-build-libiberty
-all-stageb3g2-gcc: maybe-all-build-libiberty
 all-stage4-gcc: maybe-all-build-libiberty
 all-stageprofile-gcc: maybe-all-build-libiberty
 all-stagefeedback-gcc: maybe-all-build-libiberty
 all-gcc: maybe-all-build-fixincludes
-
 all-stage1-gcc: maybe-all-build-fixincludes
 all-stage2-gcc: maybe-all-build-fixincludes
-all-stageb2g0-gcc: maybe-all-build-fixincludes
 all-stage3-gcc: maybe-all-build-fixincludes
-all-stageb3g2-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
 all-stage2-gcc: maybe-all-stage2-zlib
-all-stageb2g0-gcc: maybe-all-stageb2g0-zlib
 all-stage3-gcc: maybe-all-stage3-zlib
-all-stageb3g2-gcc: maybe-all-stageb3g2-zlib
 all-stage4-gcc: maybe-all-stage4-zlib
 all-stageprofile-gcc: maybe-all-stageprofile-zlib
 all-stagefeedback-gcc: maybe-all-stagefeedback-zlib
+all-gcc: all-libbacktrace
+all-stage1-gcc: all-stage1-libbacktrace
+all-stage2-gcc: all-stage2-libbacktrace
+all-stage3-gcc: all-stage3-libbacktrace
+all-stage4-gcc: all-stage4-libbacktrace
+all-stageprofile-gcc: all-stageprofile-libbacktrace
+all-stagefeedback-gcc: all-stagefeedback-libbacktrace
 all-gcc: all-libcpp
-
 all-stage1-gcc: all-stage1-libcpp
 all-stage2-gcc: all-stage2-libcpp
-all-stageb2g0-gcc: all-stageb2g0-libcpp
 all-stage3-gcc: all-stage3-libcpp
-all-stageb3g2-gcc: all-stageb3g2-libcpp
 all-stage4-gcc: all-stage4-libcpp
 all-stageprofile-gcc: all-stageprofile-libcpp
 all-stagefeedback-gcc: all-stagefeedback-libcpp
 all-gcc: all-libdecnumber
-
 all-stage1-gcc: all-stage1-libdecnumber
 all-stage2-gcc: all-stage2-libdecnumber
-all-stageb2g0-gcc: all-stageb2g0-libdecnumber
 all-stage3-gcc: all-stage3-libdecnumber
-all-stageb3g2-gcc: all-stageb3g2-libdecnumber
 all-stage4-gcc: all-stage4-libdecnumber
 all-stageprofile-gcc: all-stageprofile-libdecnumber
 all-stagefeedback-gcc: all-stagefeedback-libdecnumber
 all-gcc: maybe-all-libiberty
-
 all-stage1-gcc: maybe-all-stage1-libiberty
 all-stage2-gcc: maybe-all-stage2-libiberty
-all-stageb2g0-gcc: maybe-all-stageb2g0-libiberty
 all-stage3-gcc: maybe-all-stage3-libiberty
-all-stageb3g2-gcc: maybe-all-stageb3g2-libiberty
 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
+all-stage2-gcc: maybe-all-stage2-lto-plugin
+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
+info-stage2-gcc: maybe-all-build-libiberty
+info-stage3-gcc: maybe-all-build-libiberty
+info-stage4-gcc: maybe-all-build-libiberty
+info-stageprofile-gcc: maybe-all-build-libiberty
+info-stagefeedback-gcc: maybe-all-build-libiberty
+dvi-gcc: maybe-all-build-libiberty
+dvi-stage1-gcc: maybe-all-build-libiberty
+dvi-stage2-gcc: maybe-all-build-libiberty
+dvi-stage3-gcc: maybe-all-build-libiberty
+dvi-stage4-gcc: maybe-all-build-libiberty
+dvi-stageprofile-gcc: maybe-all-build-libiberty
+dvi-stagefeedback-gcc: maybe-all-build-libiberty
+pdf-gcc: maybe-all-build-libiberty
+pdf-stage1-gcc: maybe-all-build-libiberty
+pdf-stage2-gcc: maybe-all-build-libiberty
+pdf-stage3-gcc: maybe-all-build-libiberty
+pdf-stage4-gcc: maybe-all-build-libiberty
+pdf-stageprofile-gcc: maybe-all-build-libiberty
+pdf-stagefeedback-gcc: maybe-all-build-libiberty
+html-gcc: maybe-all-build-libiberty
+html-stage1-gcc: maybe-all-build-libiberty
+html-stage2-gcc: maybe-all-build-libiberty
+html-stage3-gcc: maybe-all-build-libiberty
+html-stage4-gcc: maybe-all-build-libiberty
+html-stageprofile-gcc: maybe-all-build-libiberty
+html-stagefeedback-gcc: maybe-all-build-libiberty
 install-gcc: maybe-install-fixincludes
+install-gcc: maybe-install-lto-plugin
+install-strip-gcc: maybe-install-strip-fixincludes
+install-strip-gcc: maybe-install-strip-lto-plugin
 configure-libcpp: configure-libiberty
-
 configure-stage1-libcpp: configure-stage1-libiberty
 configure-stage2-libcpp: configure-stage2-libiberty
-configure-stageb2g0-libcpp: configure-stageb2g0-libiberty
 configure-stage3-libcpp: configure-stage3-libiberty
-configure-stageb3g2-libcpp: configure-stageb3g2-libiberty
 configure-stage4-libcpp: configure-stage4-libiberty
 configure-stageprofile-libcpp: configure-stageprofile-libiberty
 configure-stagefeedback-libcpp: configure-stagefeedback-libiberty
 configure-libcpp: maybe-configure-intl
-
 configure-stage1-libcpp: maybe-configure-stage1-intl
 configure-stage2-libcpp: maybe-configure-stage2-intl
-configure-stageb2g0-libcpp: maybe-configure-stageb2g0-intl
 configure-stage3-libcpp: maybe-configure-stage3-intl
-configure-stageb3g2-libcpp: maybe-configure-stageb3g2-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
 all-stage2-libcpp: all-stage2-libiberty
-all-stageb2g0-libcpp: all-stageb2g0-libiberty
 all-stage3-libcpp: all-stage3-libiberty
-all-stageb3g2-libcpp: all-stageb3g2-libiberty
 all-stage4-libcpp: all-stage4-libiberty
 all-stageprofile-libcpp: all-stageprofile-libiberty
 all-stagefeedback-libcpp: all-stagefeedback-libiberty
 all-libcpp: maybe-all-intl
-
 all-stage1-libcpp: maybe-all-stage1-intl
 all-stage2-libcpp: maybe-all-stage2-intl
-all-stageb2g0-libcpp: maybe-all-stageb2g0-intl
 all-stage3-libcpp: maybe-all-stage3-intl
-all-stageb3g2-libcpp: maybe-all-stageb3g2-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-lto-plugin: maybe-all-libiberty
+all-stage1-lto-plugin: maybe-all-stage1-libiberty
+all-stage2-lto-plugin: maybe-all-stage2-libiberty
+all-stage3-lto-plugin: maybe-all-stage3-libiberty
+all-stage4-lto-plugin: maybe-all-stage4-libiberty
+all-stageprofile-lto-plugin: maybe-all-stageprofile-libiberty
+all-stagefeedback-lto-plugin: maybe-all-stagefeedback-libiberty
+all-lto-plugin: maybe-all-libiberty-linker-plugin
+all-stage1-lto-plugin: maybe-all-stage1-libiberty-linker-plugin
+all-stage2-lto-plugin: maybe-all-stage2-libiberty-linker-plugin
+all-stage3-lto-plugin: maybe-all-stage3-libiberty-linker-plugin
+all-stage4-lto-plugin: maybe-all-stage4-libiberty-linker-plugin
+all-stageprofile-lto-plugin: maybe-all-stageprofile-libiberty-linker-plugin
+all-stagefeedback-lto-plugin: maybe-all-stagefeedback-libiberty-linker-plugin
+all-gotools: maybe-all-target-libgo
+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
 configure-stage2-mpfr: maybe-all-stage2-gmp
-configure-stageb2g0-mpfr: maybe-all-stageb2g0-gmp
 configure-stage3-mpfr: maybe-all-stage3-gmp
-configure-stageb3g2-mpfr: maybe-all-stageb3g2-gmp
 configure-stage4-mpfr: maybe-all-stage4-gmp
 configure-stageprofile-mpfr: maybe-all-stageprofile-gmp
 configure-stagefeedback-mpfr: maybe-all-stagefeedback-gmp
-configure-gdb: maybe-all-intl
+configure-mpc: maybe-all-mpfr
+configure-stage1-mpc: maybe-all-stage1-mpfr
+configure-stage2-mpc: maybe-all-stage2-mpfr
+configure-stage3-mpc: maybe-all-stage3-mpfr
+configure-stage4-mpc: maybe-all-stage4-mpfr
+configure-stageprofile-mpc: maybe-all-stageprofile-mpfr
+configure-stagefeedback-mpc: maybe-all-stagefeedback-mpfr
+configure-isl: maybe-all-gmp
+configure-stage1-isl: maybe-all-stage1-gmp
+configure-stage2-isl: maybe-all-stage2-gmp
+configure-stage3-isl: maybe-all-stage3-gmp
+configure-stage4-isl: maybe-all-stage4-gmp
+configure-stageprofile-isl: maybe-all-stageprofile-gmp
+configure-stagefeedback-isl: maybe-all-stagefeedback-gmp
+all-intl: maybe-all-libiconv
+all-stage1-intl: maybe-all-stage1-libiconv
+all-stage2-intl: maybe-all-stage2-libiconv
+all-stage3-intl: maybe-all-stage3-libiconv
+all-stage4-intl: maybe-all-stage4-libiconv
+all-stageprofile-intl: maybe-all-stageprofile-libiconv
+all-stagefeedback-intl: maybe-all-stagefeedback-libiconv
 configure-gdb: maybe-configure-sim
-configure-gdb: maybe-all-bfd
-all-gdb: maybe-all-libiberty
-all-gdb: maybe-all-opcodes
+configure-gdb: maybe-all-gnulib
+configure-gdb: maybe-all-gdbsupport
+all-gdb: maybe-all-gnulib
+all-gdb: maybe-all-gdbsupport
 all-gdb: maybe-all-readline
 all-gdb: maybe-all-build-bison
-all-gdb: maybe-all-build-byacc
 all-gdb: maybe-all-sim
-all-gdb: maybe-all-libdecnumber
+all-gdb: maybe-all-libtermcap
+configure-gdbserver: maybe-all-gnulib
+all-gdbserver: maybe-all-gnulib
 configure-libgui: maybe-configure-tcl
 configure-libgui: maybe-configure-tk
 all-libgui: maybe-all-tcl
 all-libgui: maybe-all-tk
 all-libgui: maybe-all-itcl
+configure-gdbsupport: maybe-configure-gnulib
+all-gdbsupport: maybe-all-gnulib
 configure-bfd: configure-libiberty
-
 configure-stage1-bfd: configure-stage1-libiberty
 configure-stage2-bfd: configure-stage2-libiberty
-configure-stageb2g0-bfd: configure-stageb2g0-libiberty
 configure-stage3-bfd: configure-stage3-libiberty
-configure-stageb3g2-bfd: configure-stageb3g2-libiberty
 configure-stage4-bfd: configure-stage4-libiberty
 configure-stageprofile-bfd: configure-stageprofile-libiberty
 configure-stagefeedback-bfd: configure-stagefeedback-libiberty
 configure-bfd: maybe-configure-intl
-
 configure-stage1-bfd: maybe-configure-stage1-intl
 configure-stage2-bfd: maybe-configure-stage2-intl
-configure-stageb2g0-bfd: maybe-configure-stageb2g0-intl
 configure-stage3-bfd: maybe-configure-stage3-intl
-configure-stageb3g2-bfd: maybe-configure-stageb3g2-intl
 configure-stage4-bfd: maybe-configure-stage4-intl
 configure-stageprofile-bfd: maybe-configure-stageprofile-intl
 configure-stagefeedback-bfd: maybe-configure-stagefeedback-intl
 all-bfd: maybe-all-libiberty
-
 all-stage1-bfd: maybe-all-stage1-libiberty
 all-stage2-bfd: maybe-all-stage2-libiberty
-all-stageb2g0-bfd: maybe-all-stageb2g0-libiberty
 all-stage3-bfd: maybe-all-stage3-libiberty
-all-stageb3g2-bfd: maybe-all-stageb3g2-libiberty
 all-stage4-bfd: maybe-all-stage4-libiberty
 all-stageprofile-bfd: maybe-all-stageprofile-libiberty
 all-stagefeedback-bfd: maybe-all-stagefeedback-libiberty
 all-bfd: maybe-all-intl
-
 all-stage1-bfd: maybe-all-stage1-intl
 all-stage2-bfd: maybe-all-stage2-intl
-all-stageb2g0-bfd: maybe-all-stageb2g0-intl
 all-stage3-bfd: maybe-all-stage3-intl
-all-stageb3g2-bfd: maybe-all-stageb3g2-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
+configure-stage2-opcodes: configure-stage2-libiberty
+configure-stage3-opcodes: configure-stage3-libiberty
+configure-stage4-opcodes: configure-stage4-libiberty
+configure-stageprofile-opcodes: configure-stageprofile-libiberty
+configure-stagefeedback-opcodes: configure-stagefeedback-libiberty
+all-opcodes: maybe-all-libiberty
+all-stage1-opcodes: maybe-all-stage1-libiberty
+all-stage2-opcodes: maybe-all-stage2-libiberty
+all-stage3-opcodes: maybe-all-stage3-libiberty
+all-stage4-opcodes: maybe-all-stage4-libiberty
+all-stageprofile-opcodes: maybe-all-stageprofile-libiberty
+all-stagefeedback-opcodes: maybe-all-stagefeedback-libiberty
 configure-binutils: maybe-configure-intl
-
 configure-stage1-binutils: maybe-configure-stage1-intl
 configure-stage2-binutils: maybe-configure-stage2-intl
-configure-stageb2g0-binutils: maybe-configure-stageb2g0-intl
 configure-stage3-binutils: maybe-configure-stage3-intl
-configure-stageb3g2-binutils: maybe-configure-stageb3g2-intl
 configure-stage4-binutils: maybe-configure-stage4-intl
 configure-stageprofile-binutils: maybe-configure-stageprofile-intl
 configure-stagefeedback-binutils: maybe-configure-stagefeedback-intl
 all-binutils: maybe-all-libiberty
-
 all-stage1-binutils: maybe-all-stage1-libiberty
 all-stage2-binutils: maybe-all-stage2-libiberty
-all-stageb2g0-binutils: maybe-all-stageb2g0-libiberty
 all-stage3-binutils: maybe-all-stage3-libiberty
-all-stageb3g2-binutils: maybe-all-stageb3g2-libiberty
 all-stage4-binutils: maybe-all-stage4-libiberty
 all-stageprofile-binutils: maybe-all-stageprofile-libiberty
 all-stagefeedback-binutils: maybe-all-stagefeedback-libiberty
 all-binutils: maybe-all-opcodes
-
 all-stage1-binutils: maybe-all-stage1-opcodes
 all-stage2-binutils: maybe-all-stage2-opcodes
-all-stageb2g0-binutils: maybe-all-stageb2g0-opcodes
 all-stage3-binutils: maybe-all-stage3-opcodes
-all-stageb3g2-binutils: maybe-all-stageb3g2-opcodes
 all-stage4-binutils: maybe-all-stage4-opcodes
 all-stageprofile-binutils: maybe-all-stageprofile-opcodes
 all-stagefeedback-binutils: maybe-all-stagefeedback-opcodes
 all-binutils: maybe-all-bfd
-
 all-stage1-binutils: maybe-all-stage1-bfd
 all-stage2-binutils: maybe-all-stage2-bfd
-all-stageb2g0-binutils: maybe-all-stageb2g0-bfd
 all-stage3-binutils: maybe-all-stage3-bfd
-all-stageb3g2-binutils: maybe-all-stageb3g2-bfd
 all-stage4-binutils: maybe-all-stage4-bfd
 all-stageprofile-binutils: maybe-all-stageprofile-bfd
 all-stagefeedback-binutils: maybe-all-stagefeedback-bfd
 all-binutils: maybe-all-build-flex
-
 all-stage1-binutils: maybe-all-build-flex
 all-stage2-binutils: maybe-all-build-flex
-all-stageb2g0-binutils: maybe-all-build-flex
 all-stage3-binutils: maybe-all-build-flex
-all-stageb3g2-binutils: maybe-all-build-flex
 all-stage4-binutils: maybe-all-build-flex
 all-stageprofile-binutils: maybe-all-build-flex
 all-stagefeedback-binutils: maybe-all-build-flex
 all-binutils: maybe-all-build-bison
-
 all-stage1-binutils: maybe-all-build-bison
 all-stage2-binutils: maybe-all-build-bison
-all-stageb2g0-binutils: maybe-all-build-bison
 all-stage3-binutils: maybe-all-build-bison
-all-stageb3g2-binutils: maybe-all-build-bison
 all-stage4-binutils: maybe-all-build-bison
 all-stageprofile-binutils: maybe-all-build-bison
 all-stagefeedback-binutils: maybe-all-build-bison
-all-binutils: maybe-all-build-byacc
-
-all-stage1-binutils: maybe-all-build-byacc
-all-stage2-binutils: maybe-all-build-byacc
-all-stageb2g0-binutils: maybe-all-build-byacc
-all-stage3-binutils: maybe-all-build-byacc
-all-stageb3g2-binutils: maybe-all-build-byacc
-all-stage4-binutils: maybe-all-build-byacc
-all-stageprofile-binutils: maybe-all-build-byacc
-all-stagefeedback-binutils: maybe-all-build-byacc
 all-binutils: maybe-all-intl
-
 all-stage1-binutils: maybe-all-stage1-intl
 all-stage2-binutils: maybe-all-stage2-intl
-all-stageb2g0-binutils: maybe-all-stageb2g0-intl
 all-stage3-binutils: maybe-all-stage3-intl
-all-stageb3g2-binutils: maybe-all-stageb3g2-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
+all-binutils: maybe-all-libctf
+all-stage1-binutils: maybe-all-stage1-libctf
+all-stage2-binutils: maybe-all-stage2-libctf
+all-stage3-binutils: maybe-all-stage3-libctf
+all-stage4-binutils: maybe-all-stage4-libctf
+all-stageprofile-binutils: maybe-all-stageprofile-libctf
+all-stagefeedback-binutils: maybe-all-stagefeedback-libctf
+all-ld: maybe-all-libctf
+all-stage1-ld: maybe-all-stage1-libctf
+all-stage2-ld: maybe-all-stage2-libctf
+all-stage3-ld: maybe-all-stage3-libctf
+all-stage4-ld: maybe-all-stage4-libctf
+all-stageprofile-ld: maybe-all-stageprofile-libctf
+all-stagefeedback-ld: maybe-all-stagefeedback-libctf
 install-binutils: maybe-install-opcodes
+install-strip-binutils: maybe-install-strip-opcodes
 install-opcodes: maybe-install-bfd
+install-strip-opcodes: maybe-install-strip-bfd
 configure-gas: maybe-configure-intl
-
 configure-stage1-gas: maybe-configure-stage1-intl
 configure-stage2-gas: maybe-configure-stage2-intl
-configure-stageb2g0-gas: maybe-configure-stageb2g0-intl
 configure-stage3-gas: maybe-configure-stage3-intl
-configure-stageb3g2-gas: maybe-configure-stageb3g2-intl
 configure-stage4-gas: maybe-configure-stage4-intl
 configure-stageprofile-gas: maybe-configure-stageprofile-intl
 configure-stagefeedback-gas: maybe-configure-stagefeedback-intl
 all-gas: maybe-all-libiberty
-
 all-stage1-gas: maybe-all-stage1-libiberty
 all-stage2-gas: maybe-all-stage2-libiberty
-all-stageb2g0-gas: maybe-all-stageb2g0-libiberty
 all-stage3-gas: maybe-all-stage3-libiberty
-all-stageb3g2-gas: maybe-all-stageb3g2-libiberty
 all-stage4-gas: maybe-all-stage4-libiberty
 all-stageprofile-gas: maybe-all-stageprofile-libiberty
 all-stagefeedback-gas: maybe-all-stagefeedback-libiberty
 all-gas: maybe-all-opcodes
-
 all-stage1-gas: maybe-all-stage1-opcodes
 all-stage2-gas: maybe-all-stage2-opcodes
-all-stageb2g0-gas: maybe-all-stageb2g0-opcodes
 all-stage3-gas: maybe-all-stage3-opcodes
-all-stageb3g2-gas: maybe-all-stageb3g2-opcodes
 all-stage4-gas: maybe-all-stage4-opcodes
 all-stageprofile-gas: maybe-all-stageprofile-opcodes
 all-stagefeedback-gas: maybe-all-stagefeedback-opcodes
 all-gas: maybe-all-bfd
-
 all-stage1-gas: maybe-all-stage1-bfd
 all-stage2-gas: maybe-all-stage2-bfd
-all-stageb2g0-gas: maybe-all-stageb2g0-bfd
 all-stage3-gas: maybe-all-stage3-bfd
-all-stageb3g2-gas: maybe-all-stageb3g2-bfd
 all-stage4-gas: maybe-all-stage4-bfd
 all-stageprofile-gas: maybe-all-stageprofile-bfd
 all-stagefeedback-gas: maybe-all-stagefeedback-bfd
 all-gas: maybe-all-intl
-
 all-stage1-gas: maybe-all-stage1-intl
 all-stage2-gas: maybe-all-stage2-intl
-all-stageb2g0-gas: maybe-all-stageb2g0-intl
 all-stage3-gas: maybe-all-stage3-intl
-all-stageb3g2-gas: maybe-all-stageb3g2-intl
 all-stage4-gas: maybe-all-stage4-intl
 all-stageprofile-gas: maybe-all-stageprofile-intl
 all-stagefeedback-gas: maybe-all-stagefeedback-intl
-configure-gprof: maybe-configure-intl
-all-gprof: maybe-all-libiberty
-all-gprof: maybe-all-bfd
-all-gprof: maybe-all-opcodes
-all-gprof: maybe-all-intl
 configure-ld: maybe-configure-intl
-
 configure-stage1-ld: maybe-configure-stage1-intl
 configure-stage2-ld: maybe-configure-stage2-intl
-configure-stageb2g0-ld: maybe-configure-stageb2g0-intl
 configure-stage3-ld: maybe-configure-stage3-intl
-configure-stageb3g2-ld: maybe-configure-stageb3g2-intl
 configure-stage4-ld: maybe-configure-stage4-intl
 configure-stageprofile-ld: maybe-configure-stageprofile-intl
 configure-stagefeedback-ld: maybe-configure-stagefeedback-intl
 all-ld: maybe-all-libiberty
-
 all-stage1-ld: maybe-all-stage1-libiberty
 all-stage2-ld: maybe-all-stage2-libiberty
-all-stageb2g0-ld: maybe-all-stageb2g0-libiberty
 all-stage3-ld: maybe-all-stage3-libiberty
-all-stageb3g2-ld: maybe-all-stageb3g2-libiberty
 all-stage4-ld: maybe-all-stage4-libiberty
 all-stageprofile-ld: maybe-all-stageprofile-libiberty
 all-stagefeedback-ld: maybe-all-stagefeedback-libiberty
 all-ld: maybe-all-bfd
-
 all-stage1-ld: maybe-all-stage1-bfd
 all-stage2-ld: maybe-all-stage2-bfd
-all-stageb2g0-ld: maybe-all-stageb2g0-bfd
 all-stage3-ld: maybe-all-stage3-bfd
-all-stageb3g2-ld: maybe-all-stageb3g2-bfd
 all-stage4-ld: maybe-all-stage4-bfd
 all-stageprofile-ld: maybe-all-stageprofile-bfd
 all-stagefeedback-ld: maybe-all-stagefeedback-bfd
 all-ld: maybe-all-opcodes
-
 all-stage1-ld: maybe-all-stage1-opcodes
 all-stage2-ld: maybe-all-stage2-opcodes
-all-stageb2g0-ld: maybe-all-stageb2g0-opcodes
 all-stage3-ld: maybe-all-stage3-opcodes
-all-stageb3g2-ld: maybe-all-stageb3g2-opcodes
 all-stage4-ld: maybe-all-stage4-opcodes
 all-stageprofile-ld: maybe-all-stageprofile-opcodes
 all-stagefeedback-ld: maybe-all-stagefeedback-opcodes
 all-ld: maybe-all-build-bison
-
 all-stage1-ld: maybe-all-build-bison
 all-stage2-ld: maybe-all-build-bison
-all-stageb2g0-ld: maybe-all-build-bison
 all-stage3-ld: maybe-all-build-bison
-all-stageb3g2-ld: maybe-all-build-bison
 all-stage4-ld: maybe-all-build-bison
 all-stageprofile-ld: maybe-all-build-bison
 all-stagefeedback-ld: maybe-all-build-bison
-all-ld: maybe-all-build-byacc
-
-all-stage1-ld: maybe-all-build-byacc
-all-stage2-ld: maybe-all-build-byacc
-all-stageb2g0-ld: maybe-all-build-byacc
-all-stage3-ld: maybe-all-build-byacc
-all-stageb3g2-ld: maybe-all-build-byacc
-all-stage4-ld: maybe-all-build-byacc
-all-stageprofile-ld: maybe-all-build-byacc
-all-stagefeedback-ld: maybe-all-build-byacc
 all-ld: maybe-all-build-flex
-
 all-stage1-ld: maybe-all-build-flex
 all-stage2-ld: maybe-all-build-flex
-all-stageb2g0-ld: maybe-all-build-flex
 all-stage3-ld: maybe-all-build-flex
-all-stageb3g2-ld: maybe-all-build-flex
 all-stage4-ld: maybe-all-build-flex
 all-stageprofile-ld: maybe-all-build-flex
 all-stagefeedback-ld: maybe-all-build-flex
 all-ld: maybe-all-intl
-
 all-stage1-ld: maybe-all-stage1-intl
 all-stage2-ld: maybe-all-stage2-intl
-all-stageb2g0-ld: maybe-all-stageb2g0-intl
 all-stage3-ld: maybe-all-stage3-intl
-all-stageb3g2-ld: maybe-all-stageb3g2-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
-
 configure-stage1-gold: maybe-configure-stage1-intl
 configure-stage2-gold: maybe-configure-stage2-intl
-configure-stageb2g0-gold: maybe-configure-stageb2g0-intl
 configure-stage3-gold: maybe-configure-stage3-intl
-configure-stageb3g2-gold: maybe-configure-stageb3g2-intl
 configure-stage4-gold: maybe-configure-stage4-intl
 configure-stageprofile-gold: maybe-configure-stageprofile-intl
 configure-stagefeedback-gold: maybe-configure-stagefeedback-intl
 all-gold: maybe-all-libiberty
-
 all-stage1-gold: maybe-all-stage1-libiberty
 all-stage2-gold: maybe-all-stage2-libiberty
-all-stageb2g0-gold: maybe-all-stageb2g0-libiberty
 all-stage3-gold: maybe-all-stage3-libiberty
-all-stageb3g2-gold: maybe-all-stageb3g2-libiberty
 all-stage4-gold: maybe-all-stage4-libiberty
 all-stageprofile-gold: maybe-all-stageprofile-libiberty
 all-stagefeedback-gold: maybe-all-stagefeedback-libiberty
 all-gold: maybe-all-intl
-
 all-stage1-gold: maybe-all-stage1-intl
 all-stage2-gold: maybe-all-stage2-intl
-all-stageb2g0-gold: maybe-all-stageb2g0-intl
 all-stage3-gold: maybe-all-stage3-intl
-all-stageb3g2-gold: maybe-all-stageb3g2-intl
 all-stage4-gold: maybe-all-stage4-intl
 all-stageprofile-gold: maybe-all-stageprofile-intl
 all-stagefeedback-gold: maybe-all-stagefeedback-intl
 all-gold: maybe-all-bfd
-
 all-stage1-gold: maybe-all-stage1-bfd
 all-stage2-gold: maybe-all-stage2-bfd
-all-stageb2g0-gold: maybe-all-stageb2g0-bfd
 all-stage3-gold: maybe-all-stage3-bfd
-all-stageb3g2-gold: maybe-all-stageb3g2-bfd
 all-stage4-gold: maybe-all-stage4-bfd
 all-stageprofile-gold: maybe-all-stageprofile-bfd
 all-stagefeedback-gold: maybe-all-stagefeedback-bfd
 all-gold: maybe-all-build-bison
-
 all-stage1-gold: maybe-all-build-bison
 all-stage2-gold: maybe-all-build-bison
-all-stageb2g0-gold: maybe-all-build-bison
 all-stage3-gold: maybe-all-build-bison
-all-stageb3g2-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-build-byacc
-
-all-stage1-gold: maybe-all-build-byacc
-all-stage2-gold: maybe-all-build-byacc
-all-stageb2g0-gold: maybe-all-build-byacc
-all-stage3-gold: maybe-all-build-byacc
-all-stageb3g2-gold: maybe-all-build-byacc
-all-stage4-gold: maybe-all-build-byacc
-all-stageprofile-gold: maybe-all-build-byacc
-all-stagefeedback-gold: maybe-all-build-byacc
+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
 check-stage2-gold: maybe-all-stage2-binutils
-check-stageb2g0-gold: maybe-all-stageb2g0-binutils
 check-stage3-gold: maybe-all-stage3-binutils
-check-stageb3g2-gold: maybe-all-stageb3g2-binutils
 check-stage4-gold: maybe-all-stage4-binutils
 check-stageprofile-gold: maybe-all-stageprofile-binutils
 check-stagefeedback-gold: maybe-all-stagefeedback-binutils
+check-gold: maybe-all-gas
+check-stage1-gold: maybe-all-stage1-gas
+check-stage2-gold: maybe-all-stage2-gas
+check-stage3-gold: maybe-all-stage3-gas
+check-stage4-gold: maybe-all-stage4-gas
+check-stageprofile-gold: maybe-all-stageprofile-gas
+check-stagefeedback-gold: maybe-all-stagefeedback-gas
 configure-opcodes: maybe-configure-intl
-
 configure-stage1-opcodes: maybe-configure-stage1-intl
 configure-stage2-opcodes: maybe-configure-stage2-intl
-configure-stageb2g0-opcodes: maybe-configure-stageb2g0-intl
 configure-stage3-opcodes: maybe-configure-stage3-intl
-configure-stageb3g2-opcodes: maybe-configure-stageb3g2-intl
 configure-stage4-opcodes: maybe-configure-stage4-intl
 configure-stageprofile-opcodes: maybe-configure-stageprofile-intl
 configure-stagefeedback-opcodes: maybe-configure-stagefeedback-intl
 all-opcodes: maybe-all-bfd
-
 all-stage1-opcodes: maybe-all-stage1-bfd
 all-stage2-opcodes: maybe-all-stage2-bfd
-all-stageb2g0-opcodes: maybe-all-stageb2g0-bfd
 all-stage3-opcodes: maybe-all-stage3-bfd
-all-stageb3g2-opcodes: maybe-all-stageb3g2-bfd
 all-stage4-opcodes: maybe-all-stage4-bfd
 all-stageprofile-opcodes: maybe-all-stageprofile-bfd
 all-stagefeedback-opcodes: maybe-all-stagefeedback-bfd
 all-opcodes: maybe-all-libiberty
-
 all-stage1-opcodes: maybe-all-stage1-libiberty
 all-stage2-opcodes: maybe-all-stage2-libiberty
-all-stageb2g0-opcodes: maybe-all-stageb2g0-libiberty
 all-stage3-opcodes: maybe-all-stage3-libiberty
-all-stageb3g2-opcodes: maybe-all-stageb3g2-libiberty
 all-stage4-opcodes: maybe-all-stage4-libiberty
 all-stageprofile-opcodes: maybe-all-stageprofile-libiberty
 all-stagefeedback-opcodes: maybe-all-stagefeedback-libiberty
 all-opcodes: maybe-all-intl
-
 all-stage1-opcodes: maybe-all-stage1-intl
 all-stage2-opcodes: maybe-all-stage2-intl
-all-stageb2g0-opcodes: maybe-all-stageb2g0-intl
 all-stage3-opcodes: maybe-all-stage3-intl
-all-stageb3g2-opcodes: maybe-all-stageb3g2-intl
 all-stage4-opcodes: maybe-all-stage4-intl
 all-stageprofile-opcodes: maybe-all-stageprofile-intl
 all-stagefeedback-opcodes: maybe-all-stagefeedback-intl
@@ -53445,153 +52304,298 @@ configure-itcl: maybe-configure-tk
 all-itcl: maybe-all-tcl
 all-itcl: maybe-all-tk
 install-itcl: maybe-install-tcl
+install-strip-itcl: maybe-install-strip-tcl
 configure-tk: maybe-configure-tcl
 all-tk: maybe-all-tcl
-all-sid: maybe-all-libiberty
-all-sid: maybe-all-bfd
-all-sid: maybe-all-opcodes
 all-sid: maybe-all-tcl
 all-sid: maybe-all-tk
 install-sid: maybe-install-tcl
+install-strip-sid: maybe-install-strip-tcl
 install-sid: maybe-install-tk
-configure-sim: maybe-configure-intl
-all-sim: maybe-all-intl
-all-sim: maybe-all-libiberty
-all-sim: maybe-all-bfd
-all-sim: maybe-all-opcodes
+install-strip-sid: maybe-install-strip-tk
 all-sim: maybe-all-readline
 all-sim: maybe-configure-gdb
-all-fastjar: maybe-all-zlib
 all-fastjar: maybe-all-build-texinfo
-all-fastjar: maybe-all-libiberty
-all-autoconf: maybe-all-m4
-all-autoconf: maybe-all-build-texinfo
-all-automake: maybe-all-m4
-all-automake: maybe-all-build-texinfo
-all-automake: maybe-all-autoconf
-all-bison: maybe-all-intl
+all-libctf: all-libiberty
+all-stage1-libctf: all-stage1-libiberty
+all-stage2-libctf: all-stage2-libiberty
+all-stage3-libctf: all-stage3-libiberty
+all-stage4-libctf: all-stage4-libiberty
+all-stageprofile-libctf: all-stageprofile-libiberty
+all-stagefeedback-libctf: all-stagefeedback-libiberty
+all-libctf: maybe-all-bfd
+all-stage1-libctf: maybe-all-stage1-bfd
+all-stage2-libctf: maybe-all-stage2-bfd
+all-stage3-libctf: maybe-all-stage3-bfd
+all-stage4-libctf: maybe-all-stage4-bfd
+all-stageprofile-libctf: maybe-all-stageprofile-bfd
+all-stagefeedback-libctf: maybe-all-stagefeedback-bfd
+all-libctf: maybe-all-zlib
+all-stage1-libctf: maybe-all-stage1-zlib
+all-stage2-libctf: maybe-all-stage2-zlib
+all-stage3-libctf: maybe-all-stage3-zlib
+all-stage4-libctf: maybe-all-stage4-zlib
+all-stageprofile-libctf: maybe-all-stageprofile-zlib
+all-stagefeedback-libctf: maybe-all-stagefeedback-zlib
+configure-libctf: maybe-all-bfd
+configure-stage1-libctf: maybe-all-stage1-bfd
+configure-stage2-libctf: maybe-all-stage2-bfd
+configure-stage3-libctf: maybe-all-stage3-bfd
+configure-stage4-libctf: maybe-all-stage4-bfd
+configure-stageprofile-libctf: maybe-all-stageprofile-bfd
+configure-stagefeedback-libctf: maybe-all-stagefeedback-bfd
+configure-libctf: maybe-all-intl
+configure-stage1-libctf: maybe-all-stage1-intl
+configure-stage2-libctf: maybe-all-stage2-intl
+configure-stage3-libctf: maybe-all-stage3-intl
+configure-stage4-libctf: maybe-all-stage4-intl
+configure-stageprofile-libctf: maybe-all-stageprofile-intl
+configure-stagefeedback-libctf: maybe-all-stagefeedback-intl
+configure-libctf: maybe-all-zlib
+configure-stage1-libctf: maybe-all-stage1-zlib
+configure-stage2-libctf: maybe-all-stage2-zlib
+configure-stage3-libctf: maybe-all-stage3-zlib
+configure-stage4-libctf: maybe-all-stage4-zlib
+configure-stageprofile-libctf: maybe-all-stageprofile-zlib
+configure-stagefeedback-libctf: maybe-all-stagefeedback-zlib
+configure-libctf: maybe-all-libiconv
+configure-stage1-libctf: maybe-all-stage1-libiconv
+configure-stage2-libctf: maybe-all-stage2-libiconv
+configure-stage3-libctf: maybe-all-stage3-libiconv
+configure-stage4-libctf: maybe-all-stage4-libiconv
+configure-stageprofile-libctf: maybe-all-stageprofile-libiconv
+configure-stagefeedback-libctf: maybe-all-stagefeedback-libiconv
 all-bison: maybe-all-build-texinfo
-all-diff: maybe-all-intl
-all-diff: maybe-all-build-texinfo
-all-fileutils: maybe-all-intl
-all-fileutils: maybe-all-build-texinfo
 all-flex: maybe-all-build-bison
-all-flex: maybe-all-build-byacc
-all-flex: maybe-all-intl
 all-flex: maybe-all-m4
 all-flex: maybe-all-build-texinfo
-all-gzip: maybe-all-intl
-all-gzip: maybe-all-zlib
-all-gzip: maybe-all-build-texinfo
-all-hello: maybe-all-intl
-all-hello: maybe-all-build-texinfo
-all-m4: maybe-all-intl
 all-m4: maybe-all-build-texinfo
-all-make: maybe-all-intl
-all-make: maybe-all-build-texinfo
-all-patch: maybe-all-build-texinfo
-all-make: maybe-all-build-texinfo
-all-prms: maybe-all-libiberty
-all-recode: maybe-all-build-texinfo
-all-sed: maybe-all-build-texinfo
-all-send-pr: maybe-all-prms
-all-tar: maybe-all-build-texinfo
-all-uudecode: maybe-all-build-texinfo
-configure-target-boehm-gc: maybe-configure-target-qthreads
 configure-target-fastjar: maybe-configure-target-zlib
 all-target-fastjar: maybe-all-target-zlib
-all-target-fastjar: maybe-all-target-libiberty
-configure-target-libjava: maybe-configure-target-zlib
-configure-target-libjava: maybe-configure-target-boehm-gc
-configure-target-libjava: maybe-configure-target-qthreads
-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-qthreads
-all-target-libjava: maybe-all-target-libffi
-configure-target-libobjc: maybe-configure-target-boehm-gc
-all-target-libobjc: maybe-all-target-libiberty
-all-target-libobjc: maybe-all-target-boehm-gc
-all-target-libstdc++-v3: maybe-all-target-libiberty
+configure-target-libgo: maybe-configure-target-libffi
+all-target-libgo: maybe-all-target-libbacktrace
+all-target-libgo: maybe-all-target-libffi
+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
+configure-stage2-target-libstdc++-v3: maybe-configure-stage2-target-libgomp
+configure-stage3-target-libstdc++-v3: maybe-configure-stage3-target-libgomp
+configure-stage4-target-libstdc++-v3: maybe-configure-stage4-target-libgomp
+configure-stageprofile-target-libstdc++-v3: maybe-configure-stageprofile-target-libgomp
+configure-stagefeedback-target-libstdc++-v3: maybe-configure-stagefeedback-target-libgomp
+configure-target-libsanitizer: maybe-all-target-libstdc++-v3
+configure-stage1-target-libsanitizer: maybe-all-stage1-target-libstdc++-v3
+configure-stage2-target-libsanitizer: maybe-all-stage2-target-libstdc++-v3
+configure-stage3-target-libsanitizer: maybe-all-stage3-target-libstdc++-v3
+configure-stage4-target-libsanitizer: maybe-all-stage4-target-libstdc++-v3
+configure-stageprofile-target-libsanitizer: maybe-all-stageprofile-target-libstdc++-v3
+configure-stagefeedback-target-libsanitizer: maybe-all-stagefeedback-target-libstdc++-v3
+configure-target-libvtv: maybe-all-target-libstdc++-v3
+configure-stage1-target-libvtv: maybe-all-stage1-target-libstdc++-v3
+configure-stage2-target-libvtv: maybe-all-stage2-target-libstdc++-v3
+configure-stage3-target-libvtv: maybe-all-stage3-target-libstdc++-v3
+configure-stage4-target-libvtv: maybe-all-stage4-target-libstdc++-v3
+configure-stageprofile-target-libvtv: maybe-all-stageprofile-target-libstdc++-v3
+configure-stagefeedback-target-libvtv: maybe-all-stagefeedback-target-libstdc++-v3
+all-target-libstdc++-v3: maybe-configure-target-libgomp
+all-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp
+all-stage2-target-libstdc++-v3: maybe-configure-stage2-target-libgomp
+all-stage3-target-libstdc++-v3: maybe-configure-stage3-target-libgomp
+all-stage4-target-libstdc++-v3: maybe-configure-stage4-target-libgomp
+all-stageprofile-target-libstdc++-v3: maybe-configure-stageprofile-target-libgomp
+all-stagefeedback-target-libstdc++-v3: maybe-configure-stagefeedback-target-libgomp
+install-target-libgo: maybe-install-target-libatomic
+install-target-libgfortran: maybe-install-target-libquadmath
+install-target-libgfortran: maybe-install-target-libgcc
+install-target-libsanitizer: maybe-install-target-libstdc++-v3
+install-target-libsanitizer: maybe-install-target-libgcc
+install-target-libvtv: maybe-install-target-libstdc++-v3
+install-target-libvtv: maybe-install-target-libgcc
+install-target-libcilkrts: maybe-install-target-libstdc++-v3
+install-target-libcilkrts: maybe-install-target-libgcc
+install-target-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-libiberty
 all-target-winsup: maybe-all-target-libtermcap
+configure-target-libgfortran: maybe-all-target-libquadmath
+configure-target-libgfortran: maybe-all-target-libbacktrace
 
 
+@if gcc-bootstrap
+configure-gnattools: stage_last
+configure-libcc1: stage_last
+configure-utils: stage_last
+configure-gdb: stage_last
+configure-gdbserver: stage_last
+configure-gdbsupport: stage_last
+configure-gprof: stage_last
+configure-sid: stage_last
+configure-sim: stage_last
+configure-fastjar: stage_last
+configure-bison: stage_last
+configure-flex: stage_last
+configure-m4: stage_last
+@endif gcc-bootstrap
+
+@unless gcc-bootstrap
+all-gnattools: maybe-all-target-libstdc++-v3
+configure-libcc1: maybe-configure-gcc
+all-libcc1: maybe-all-gcc
+all-utils: maybe-all-libiberty
+configure-gdb: maybe-all-intl
+configure-gdb: maybe-all-bfd
+configure-gdb: maybe-all-libiconv
+all-gdb: maybe-all-libiberty
+all-gdb: maybe-all-libiconv
+all-gdb: maybe-all-opcodes
+all-gdb: maybe-all-libdecnumber
+all-gdb: maybe-all-libctf
+all-gdbserver: maybe-all-libiberty
+configure-gdbsupport: maybe-configure-bfd
+all-gdbsupport: maybe-all-bfd
+configure-gprof: maybe-configure-intl
+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
+all-sid: maybe-all-libiberty
+all-sid: maybe-all-bfd
+all-sid: maybe-all-opcodes
+configure-sim: maybe-configure-intl
+all-sim: maybe-all-intl
+all-sim: maybe-all-libiberty
+all-sim: maybe-all-bfd
+all-sim: maybe-all-opcodes
+all-fastjar: maybe-all-zlib
+all-fastjar: maybe-all-libiberty
+all-bison: maybe-all-intl
+all-flex: maybe-all-intl
+all-m4: maybe-all-intl
+configure-target-libgo: maybe-all-target-libstdc++-v3
+configure-target-liboffloadmic: maybe-configure-target-libgomp
+all-target-liboffloadmic: maybe-all-target-libgomp
+configure-target-newlib: maybe-all-binutils
+configure-target-newlib: maybe-all-ld
+@endunless gcc-bootstrap
+
 # Dependencies for target modules on other target modules are
 # described by lang_env_dependencies; the defaults apply to anything
 # not mentioned there.
 
 
 @if gcc-bootstrap
+configure-stage1-target-libstdc++-v3: maybe-all-stage1-target-libgcc
+configure-stage2-target-libstdc++-v3: maybe-all-stage2-target-libgcc
+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
+configure-stage4-target-libgomp: maybe-all-stage4-target-libgcc
+configure-stageprofile-target-libgomp: maybe-all-stageprofile-target-libgcc
+configure-stagefeedback-target-libgomp: maybe-all-stagefeedback-target-libgcc
 @endif gcc-bootstrap
 
 @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
+configure-target-libquadmath: maybe-all-target-libgcc
 configure-target-libgfortran: maybe-all-target-libgcc
 configure-target-libobjc: maybe-all-target-libgcc
+configure-target-libgo: maybe-all-target-libgcc
 configure-target-libtermcap: maybe-all-target-libgcc
 configure-target-winsup: maybe-all-target-libgcc
 configure-target-libgloss: maybe-all-target-libgcc
-configure-target-libiberty: maybe-all-target-libgcc
-configure-target-gperf: maybe-all-target-libgcc
-configure-target-examples: 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-qthreads: 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
+configure-target-libitm: maybe-all-target-libgcc
+configure-target-libatomic: maybe-all-target-libgcc
 @endif gcc-no-bootstrap
 
 
 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
 
 
 
+configure-target-libbacktrace: maybe-all-target-newlib maybe-all-target-libgloss
+
+configure-target-libquadmath: maybe-all-target-newlib maybe-all-target-libgloss
+
 configure-target-libgfortran: maybe-all-target-newlib maybe-all-target-libgloss
 
 configure-target-libobjc: maybe-all-target-newlib maybe-all-target-libgloss
 
+configure-target-libgo: maybe-all-target-newlib maybe-all-target-libgloss
+
 configure-target-libtermcap: maybe-all-target-newlib maybe-all-target-libgloss
 
 configure-target-winsup: maybe-all-target-newlib maybe-all-target-libgloss
 
 
-
-configure-target-gperf: maybe-all-target-newlib maybe-all-target-libgloss
-configure-target-gperf: maybe-all-target-libstdc++-v3
-
-configure-target-examples: 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-qthreads: 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
 
 configure-target-libgomp: maybe-all-target-newlib maybe-all-target-libgloss
 
+configure-target-libitm: maybe-all-target-newlib maybe-all-target-libgloss
+configure-target-libitm: maybe-all-target-libstdc++-v3
+
+configure-target-libatomic: maybe-all-target-newlib maybe-all-target-libgloss
+
 
 CONFIGURE_GDB_TK = @CONFIGURE_GDB_TK@
 GDB_TK = @GDB_TK@
@@ -53624,7 +52628,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)
 
 # ------------------------------