configure.ac (build_tools): Remove build-byacc.

	* configure.ac (build_tools): Remove build-byacc.
	(host_libs): Remove mmalloc.
	(host_tools): Remove byacc make patch prms send-pr ash bash bzip2
	autoconf automake libtool diff rcs fileutils shellutils time
	textutils wdiff find uudecode hello tar gzip indent recode release
	sed perl gawk findutils gettext zip.
	(libgcj): Remove target-qthreads.
	(target_tools): Remove target-examples target-gperf.
	(YACC): Don't handle building byacc.
	* configure: Regenerate.
	* Makefile.def (ash, autoconf, automake, bash, byacc, bzip2, diff,
	dosutils, examples, fileutils, find, findutils, gawk, gettext,
	gnuserv, gperf, gzip, hello, indent, libtool, make, mmalloc,
	patch, perl, prms, qthreads, rcs, recode, release, sed, send-pr,
	shellutils, tar, textutils, time, uudecode, wdiff, zip): Don't
	handle building components.
	* Makefile.in: Regenerate.

From-SVN: r172042

diff --git a/ChangeLog b/ChangeLog
index f0f7873fef482a19df2609b95fcc08464a616c89..37eb913d8d61f7f2b565bfdc3154911846e9522f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2011-04-06  Joseph Myers  <joseph@codesourcery.com>
+
+       * configure.ac (build_tools): Remove build-byacc.
+       (host_libs): Remove mmalloc.
+       (host_tools): Remove byacc make patch prms send-pr ash bash bzip2
+       autoconf automake libtool diff rcs fileutils shellutils time
+       textutils wdiff find uudecode hello tar gzip indent recode release
+       sed perl gawk findutils gettext zip.
+       (libgcj): Remove target-qthreads.
+       (target_tools): Remove target-examples target-gperf.
+       (YACC): Don't handle building byacc.
+       * configure: Regenerate.
+       * Makefile.def (ash, autoconf, automake, bash, byacc, bzip2, diff,
+       dosutils, examples, fileutils, find, findutils, gawk, gettext,
+       gnuserv, gperf, gzip, hello, indent, libtool, make, mmalloc,
+       patch, perl, prms, qthreads, rcs, recode, release, sed, send-pr,
+       shellutils, tar, textutils, time, uudecode, wdiff, zip): Don't
+       handle building components.
+       * Makefile.in: Regenerate.
+
 2011-04-05  Sterling Augustine <augustine.sterling@gmail.com>
 
        * MAINTAINERS: Update my email address as Xtensa maintainer.

diff --git a/Makefile.def b/Makefile.def
index d52466d528713ee386824b199fc3d5efcf99e8e4..f499180de0d6024d69c8dff08545a336e5a24f33 100644 (file)
--- a/Makefile.def
+++ b/Makefile.def
@@ -4,7 +4,7 @@ AutoGen definitions Makefile.tpl;
 // Makefile.in is generated from Makefile.tpl by 'autogen Makefile.def'.
 // This file was originally written by Nathanael Nerode.
 //
-//   Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+//   Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 //   Free Software Foundation
 //
 // This file is free software; you can redistribute it and/or modify
@@ -27,39 +27,25 @@ AutoGen definitions Makefile.tpl;
 
 build_modules= { module= libiberty; };
 build_modules= { module= bison; };
-build_modules= { module= byacc; };
 build_modules= { module= flex; };
 build_modules= { module= m4; };
 build_modules= { module= texinfo; };
 build_modules= { module= fixincludes; };
 
-host_modules= { module= ash; };
-host_modules= { module= autoconf; };
-host_modules= { module= automake; };
-host_modules= { module= bash; };
 host_modules= { module= bfd; lib_path=.libs; bootstrap=true; };
 host_modules= { module= opcodes; lib_path=.libs; bootstrap=true; };
 host_modules= { module= binutils; bootstrap=true; };
 host_modules= { module= bison; no_check_cross= true; };
-host_modules= { module= byacc; no_check_cross= true; };
-host_modules= { module= bzip2; };
 host_modules= { module= cgen; };
 host_modules= { module= dejagnu; };
-host_modules= { module= diff; };
-host_modules= { module= dosutils; no_check= true; };
 host_modules= { module= etc; };
 host_modules= { module= fastjar; no_check_cross= true; };
-host_modules= { module= fileutils; };
-host_modules= { module= findutils; };
-host_modules= { module= find; };
 host_modules= { module= fixincludes;
                missing= TAGS; };
 host_modules= { module= flex; no_check_cross= true; };
 host_modules= { module= gas; bootstrap=true; };
 host_modules= { module= gcc; bootstrap=true; 
                extra_make_flags="$(EXTRA_GCC_FLAGS)"; };
-host_modules= { module= gawk; };
-host_modules= { module= gettext; };
 host_modules= { module= gmp; lib_path=.libs; bootstrap=true;
                extra_configure_flags='--disable-shared';
                no_install= true;
@@ -86,12 +72,8 @@ host_modules= { module= cloog; lib_path=.libs; bootstrap=true;
 host_modules= { module= libelf; lib_path=.libs; bootstrap=true;
                extra_configure_flags='--disable-shared';
                no_install= true; };
-host_modules= { module= gnuserv; };
 host_modules= { module= gold; bootstrap=true; };
 host_modules= { module= gprof; };
-host_modules= { module= gzip; };
-host_modules= { module= hello; };
-host_modules= { module= indent; };
 host_modules= { module= intl; bootstrap=true; };
 host_modules= { module= tcl;
                 missing=mostlyclean; };
@@ -110,29 +92,11 @@ host_modules= { module= libiconv;
                missing= install-pdf;
                missing= install-html;
                missing= install-info; };
-host_modules= { module= libtool; };
 host_modules= { module= m4; };
-host_modules= { module= make; };
-host_modules= { module= mmalloc; no_check=true; };
-host_modules= { module= patch; };
-host_modules= { module= perl; };
-host_modules= { module= prms; };
-host_modules= { module= rcs; };
 host_modules= { module= readline; };
-host_modules= { module= release; no_install= true; no_check= true; };
-host_modules= { module= recode; };
-host_modules= { module= sed; };
-host_modules= { module= send-pr; };
-host_modules= { module= shellutils; };
 host_modules= { module= sid; };
 host_modules= { module= sim; };
-host_modules= { module= tar; };
 host_modules= { module= texinfo; no_install= true; };
-host_modules= { module= textutils; };
-host_modules= { module= time; };
-host_modules= { module= uudecode; };
-host_modules= { module= wdiff; };
-host_modules= { module= zip; no_check_cross=true; };
 host_modules= { module= zlib; no_install=true; no_check=true; bootstrap=true; };
 host_modules= { module= gdb; };
 host_modules= { module= expect; };
@@ -168,13 +132,10 @@ target_modules = { module= libtermcap; no_check=true;
 target_modules = { module= winsup; };
 target_modules = { module= libgloss; no_check=true; };
 target_modules = { module= libiberty; };
-target_modules = { module= gperf; };
-target_modules = { module= examples; no_check=true; no_install=true; };
 target_modules = { module= libffi; };
 target_modules = { module= libjava; raw_cxx=true; };
 target_modules = { module= zlib; };
 target_modules = { module= boehm-gc; };
-target_modules = { module= qthreads; };
 target_modules = { module= rda; };
 target_modules = { module= libada; };
 target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; };
@@ -311,10 +272,8 @@ flags_to_pass = { flag= LEAN ; };
 
 // Build modules
 dependencies = { module=all-build-bison; on=all-build-texinfo; };
-dependencies = { module=all-build-byacc; on=all-build-texinfo; };
 dependencies = { module=all-build-flex; on=all-build-texinfo; };
 dependencies = { module=all-build-flex; on=all-build-bison; };
-dependencies = { module=all-build-flex; on=all-build-byacc; };
 dependencies = { module=all-build-flex; on=all-build-m4; };
 dependencies = { module=all-build-libiberty; on=all-build-texinfo; };
 dependencies = { module=all-build-m4; on=all-build-texinfo; };
@@ -337,7 +296,6 @@ dependencies = { module=all-gcc; on=all-ppl; };
 dependencies = { module=all-gcc; on=all-cloog; };
 dependencies = { module=all-gcc; on=all-build-texinfo; };
 dependencies = { module=all-gcc; on=all-build-bison; };
-dependencies = { module=all-gcc; on=all-build-byacc; };
 dependencies = { module=all-gcc; on=all-build-flex; };
 dependencies = { module=all-gcc; on=all-build-libiberty; };
 dependencies = { module=all-gcc; on=all-build-fixincludes; };
@@ -386,7 +344,6 @@ dependencies = { module=all-gdb; on=all-libiconv; };
 dependencies = { module=all-gdb; on=all-opcodes; };
 dependencies = { module=all-gdb; on=all-readline; };
 dependencies = { module=all-gdb; on=all-build-bison; };
-dependencies = { module=all-gdb; on=all-build-byacc; };
 dependencies = { module=all-gdb; on=all-sim; };
 dependencies = { module=all-gdb; on=all-libdecnumber; };
 dependencies = { module=all-gdb; on=all-libtermcap; };
@@ -411,7 +368,6 @@ dependencies = { module=all-binutils; on=all-opcodes; };
 dependencies = { module=all-binutils; on=all-bfd; };
 dependencies = { module=all-binutils; on=all-build-flex; };
 dependencies = { module=all-binutils; on=all-build-bison; };
-dependencies = { module=all-binutils; on=all-build-byacc; };
 dependencies = { module=all-binutils; on=all-intl; };
 
 // We put install-opcodes before install-binutils because the installed
@@ -439,7 +395,6 @@ dependencies = { module=all-ld; on=all-libiberty; };
 dependencies = { module=all-ld; on=all-bfd; };
 dependencies = { module=all-ld; on=all-opcodes; };
 dependencies = { module=all-ld; on=all-build-bison; };
-dependencies = { module=all-ld; on=all-build-byacc; };
 dependencies = { module=all-ld; on=all-build-flex; };
 dependencies = { module=all-ld; on=all-intl; };
 dependencies = { module=install-ld; on=install-gold; };
@@ -449,7 +404,6 @@ dependencies = { module=all-gold; on=all-libiberty; };
 dependencies = { module=all-gold; on=all-intl; };
 dependencies = { module=all-gold; on=all-bfd; };
 dependencies = { module=all-gold; on=all-build-bison; };
-dependencies = { module=all-gold; on=all-build-byacc; };
 dependencies = { module=check-gold; on=all-binutils; };
 dependencies = { module=check-gold; on=all-gas; };
 
@@ -503,44 +457,18 @@ dependencies = { module=all-fastjar; on=all-build-texinfo; };
 dependencies = { module=all-fastjar; on=all-libiberty; };
 
 // Warning, these are not well tested.
-dependencies = { module=all-autoconf; on=all-m4; };
-dependencies = { module=all-autoconf; on=all-build-texinfo; };
-dependencies = { module=all-automake; on=all-m4; };
-dependencies = { module=all-automake; on=all-build-texinfo; };
-dependencies = { module=all-automake; on=all-autoconf; };
 dependencies = { module=all-bison; on=all-intl; };
 dependencies = { module=all-bison; on=all-build-texinfo; };
-dependencies = { module=all-diff; on=all-intl; };
-dependencies = { module=all-diff; on=all-build-texinfo; };
-dependencies = { module=all-fileutils; on=all-intl; };
-dependencies = { module=all-fileutils; on=all-build-texinfo; };
 dependencies = { module=all-flex; on=all-build-bison; };
-dependencies = { module=all-flex; on=all-build-byacc; };
 dependencies = { module=all-flex; on=all-intl; };
 dependencies = { module=all-flex; on=all-m4; };
 dependencies = { module=all-flex; on=all-build-texinfo; };
-dependencies = { module=all-gzip; on=all-intl; };
-dependencies = { module=all-gzip; on=all-zlib; };
-dependencies = { module=all-gzip; on=all-build-texinfo; };
-dependencies = { module=all-hello; on=all-intl; };
-dependencies = { module=all-hello; on=all-build-texinfo; };
 dependencies = { module=all-m4; on=all-intl; };
 dependencies = { module=all-m4; on=all-build-texinfo; };
-dependencies = { module=all-make; on=all-intl; };
-dependencies = { module=all-make; on=all-build-texinfo; };
-dependencies = { module=all-patch; on=all-build-texinfo; };
-dependencies = { module=all-make; on=all-build-texinfo; };
-dependencies = { module=all-prms; on=all-libiberty; };
-dependencies = { module=all-recode; on=all-build-texinfo; };
-dependencies = { module=all-sed; on=all-build-texinfo; };
-dependencies = { module=all-send-pr; on=all-prms; };
-dependencies = { module=all-tar; on=all-build-texinfo; };
-dependencies = { module=all-uudecode; on=all-build-texinfo; };
 
 // Target modules.  These can also have dependencies on the language
 // environment (e.g. on libstdc++).  By default target modules depend
 // on libgcc and newlib/libgloss.
-lang_env_dependencies = { module=gperf; cxx=true; };
 lang_env_dependencies = { module=libjava; cxx=true; };
 lang_env_dependencies = { module=newlib; no_c=true; };
 lang_env_dependencies = { module=libgloss; no_c=true; };
@@ -550,7 +478,6 @@ lang_env_dependencies = { module=libgcc; no_gcc=true; no_c=true; };
 // a dependency on libgcc for native targets to configure.
 lang_env_dependencies = { module=libiberty; no_c=true; };
 
-dependencies = { module=configure-target-boehm-gc; on=configure-target-qthreads; };
 dependencies = { module=configure-target-boehm-gc; on=all-target-libstdc++-v3; };
 dependencies = { module=configure-target-fastjar; on=configure-target-zlib; };
 dependencies = { module=all-target-fastjar; on=all-target-zlib; };
@@ -560,12 +487,10 @@ dependencies = { module=configure-target-libgo; on=all-target-libstdc++-v3; };
 dependencies = { module=all-target-libgo; on=all-target-libffi; };
 dependencies = { module=configure-target-libjava; on=configure-target-zlib; };
 dependencies = { module=configure-target-libjava; on=configure-target-boehm-gc; };
-dependencies = { module=configure-target-libjava; on=configure-target-qthreads; };
 dependencies = { module=configure-target-libjava; on=configure-target-libffi; };
 dependencies = { module=all-target-libjava; on=all-fastjar; };
 dependencies = { module=all-target-libjava; on=all-target-zlib; };
 dependencies = { module=all-target-libjava; on=all-target-boehm-gc; };
-dependencies = { module=all-target-libjava; on=all-target-qthreads; };
 dependencies = { module=all-target-libjava; on=all-target-libffi; };
 dependencies = { module=configure-target-libobjc; on=configure-target-boehm-gc; };
 dependencies = { module=all-target-libobjc; on=all-target-libiberty; };
@@ -578,11 +503,9 @@ dependencies = { module=configure-target-libstdc++-v3; on=configure-target-libgo
 dependencies = { module=all-target-libstdc++-v3; on=configure-target-libgomp; };
 
 // Target modules in the 'src' repository.
-lang_env_dependencies = { module=examples; };
 lang_env_dependencies = { module=libtermcap; };
 lang_env_dependencies = { module=rda; };
 lang_env_dependencies = { module=winsup; };
-lang_env_dependencies = { module=qthreads; };
 
 dependencies = { module=all-target-libgloss; on=all-target-newlib; };
 dependencies = { module=all-target-winsup; on=all-target-libiberty; };

diff --git a/Makefile.in b/Makefile.in
index e64f0763025c21e2e93f4c5ce839611717ce536c..5cc03562a076c3856a67c231ad5718b95f265663 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -860,43 +860,26 @@ endif
 
 .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-mpc \
     maybe-configure-ppl \
     maybe-configure-cloog \
     maybe-configure-libelf \
-    maybe-configure-gnuserv \
     maybe-configure-gold \
     maybe-configure-gprof \
-    maybe-configure-gzip \
-    maybe-configure-hello \
-    maybe-configure-indent \
     maybe-configure-intl \
     maybe-configure-tcl \
     maybe-configure-itcl \
@@ -906,29 +889,11 @@ configure-host:  \
     maybe-configure-libgui \
     maybe-configure-libiberty \
     maybe-configure-libiconv \
-    maybe-configure-libtool \
     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-gdb \
     maybe-configure-expect \
@@ -953,13 +918,10 @@ configure-target:  \
     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
@@ -993,7 +955,6 @@ all:
 
 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
@@ -1001,10 +962,6 @@ all-build: maybe-all-build-fixincludes
 
 .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
@@ -1015,17 +972,10 @@ 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
 all-host: maybe-all-fixincludes
 all-host: maybe-all-flex
 @if gas-no-bootstrap
@@ -1034,8 +984,6 @@ 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
@@ -1054,14 +1002,10 @@ all-host: maybe-all-cloog
 @if libelf-no-bootstrap
 all-host: maybe-all-libelf
 @endif libelf-no-bootstrap
-all-host: maybe-all-gnuserv
 @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
@@ -1081,29 +1025,11 @@ all-host: maybe-all-libgui
 all-host: maybe-all-libiberty
 @endif libiberty-no-bootstrap
 all-host: maybe-all-libiconv
-all-host: maybe-all-libtool
 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
@@ -1137,13 +1063,10 @@ 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
@@ -1166,43 +1089,26 @@ 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-mpc
 info-host: maybe-info-ppl
 info-host: maybe-info-cloog
 info-host: maybe-info-libelf
-info-host: maybe-info-gnuserv
 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
@@ -1212,29 +1118,11 @@ info-host: maybe-info-libdecnumber
 info-host: maybe-info-libgui
 info-host: maybe-info-libiberty
 info-host: maybe-info-libiconv
-info-host: maybe-info-libtool
 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-gdb
 info-host: maybe-info-expect
@@ -1260,13 +1148,10 @@ 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
@@ -1282,43 +1167,26 @@ 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-mpc
 dvi-host: maybe-dvi-ppl
 dvi-host: maybe-dvi-cloog
 dvi-host: maybe-dvi-libelf
-dvi-host: maybe-dvi-gnuserv
 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
@@ -1328,29 +1196,11 @@ dvi-host: maybe-dvi-libdecnumber
 dvi-host: maybe-dvi-libgui
 dvi-host: maybe-dvi-libiberty
 dvi-host: maybe-dvi-libiconv
-dvi-host: maybe-dvi-libtool
 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-gdb
 dvi-host: maybe-dvi-expect
@@ -1376,13 +1226,10 @@ 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
@@ -1398,43 +1245,26 @@ 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-mpc
 pdf-host: maybe-pdf-ppl
 pdf-host: maybe-pdf-cloog
 pdf-host: maybe-pdf-libelf
-pdf-host: maybe-pdf-gnuserv
 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
@@ -1444,29 +1274,11 @@ pdf-host: maybe-pdf-libdecnumber
 pdf-host: maybe-pdf-libgui
 pdf-host: maybe-pdf-libiberty
 pdf-host: maybe-pdf-libiconv
-pdf-host: maybe-pdf-libtool
 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-gdb
 pdf-host: maybe-pdf-expect
@@ -1492,13 +1304,10 @@ 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
@@ -1514,43 +1323,26 @@ 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-mpc
 html-host: maybe-html-ppl
 html-host: maybe-html-cloog
 html-host: maybe-html-libelf
-html-host: maybe-html-gnuserv
 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
@@ -1560,29 +1352,11 @@ html-host: maybe-html-libdecnumber
 html-host: maybe-html-libgui
 html-host: maybe-html-libiberty
 html-host: maybe-html-libiconv
-html-host: maybe-html-libtool
 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-gdb
 html-host: maybe-html-expect
@@ -1608,13 +1382,10 @@ 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
@@ -1630,43 +1401,26 @@ 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-mpc
 TAGS-host: maybe-TAGS-ppl
 TAGS-host: maybe-TAGS-cloog
 TAGS-host: maybe-TAGS-libelf
-TAGS-host: maybe-TAGS-gnuserv
 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
@@ -1676,29 +1430,11 @@ TAGS-host: maybe-TAGS-libdecnumber
 TAGS-host: maybe-TAGS-libgui
 TAGS-host: maybe-TAGS-libiberty
 TAGS-host: maybe-TAGS-libiconv
-TAGS-host: maybe-TAGS-libtool
 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-gdb
 TAGS-host: maybe-TAGS-expect
@@ -1724,13 +1460,10 @@ 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
@@ -1746,43 +1479,26 @@ 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-mpc
 install-info-host: maybe-install-info-ppl
 install-info-host: maybe-install-info-cloog
 install-info-host: maybe-install-info-libelf
-install-info-host: maybe-install-info-gnuserv
 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
@@ -1792,29 +1508,11 @@ 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-libiconv
-install-info-host: maybe-install-info-libtool
 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-gdb
 install-info-host: maybe-install-info-expect
@@ -1840,13 +1538,10 @@ 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
@@ -1862,43 +1557,26 @@ 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-mpc
 install-pdf-host: maybe-install-pdf-ppl
 install-pdf-host: maybe-install-pdf-cloog
 install-pdf-host: maybe-install-pdf-libelf
-install-pdf-host: maybe-install-pdf-gnuserv
 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
@@ -1908,29 +1586,11 @@ 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-libiconv
-install-pdf-host: maybe-install-pdf-libtool
 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-gdb
 install-pdf-host: maybe-install-pdf-expect
@@ -1956,13 +1616,10 @@ 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
@@ -1978,43 +1635,26 @@ 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-mpc
 install-html-host: maybe-install-html-ppl
 install-html-host: maybe-install-html-cloog
 install-html-host: maybe-install-html-libelf
-install-html-host: maybe-install-html-gnuserv
 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
@@ -2024,29 +1664,11 @@ 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-libiconv
-install-html-host: maybe-install-html-libtool
 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-gdb
 install-html-host: maybe-install-html-expect
@@ -2072,13 +1694,10 @@ 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
@@ -2094,43 +1713,26 @@ 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-mpc
 installcheck-host: maybe-installcheck-ppl
 installcheck-host: maybe-installcheck-cloog
 installcheck-host: maybe-installcheck-libelf
-installcheck-host: maybe-installcheck-gnuserv
 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
@@ -2140,29 +1742,11 @@ installcheck-host: maybe-installcheck-libdecnumber
 installcheck-host: maybe-installcheck-libgui
 installcheck-host: maybe-installcheck-libiberty
 installcheck-host: maybe-installcheck-libiconv
-installcheck-host: maybe-installcheck-libtool
 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-gdb
 installcheck-host: maybe-installcheck-expect
@@ -2188,13 +1772,10 @@ 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
@@ -2210,43 +1791,26 @@ 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-mpc
 mostlyclean-host: maybe-mostlyclean-ppl
 mostlyclean-host: maybe-mostlyclean-cloog
 mostlyclean-host: maybe-mostlyclean-libelf
-mostlyclean-host: maybe-mostlyclean-gnuserv
 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
@@ -2256,29 +1820,11 @@ mostlyclean-host: maybe-mostlyclean-libdecnumber
 mostlyclean-host: maybe-mostlyclean-libgui
 mostlyclean-host: maybe-mostlyclean-libiberty
 mostlyclean-host: maybe-mostlyclean-libiconv
-mostlyclean-host: maybe-mostlyclean-libtool
 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-gdb
 mostlyclean-host: maybe-mostlyclean-expect
@@ -2304,13 +1850,10 @@ 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
@@ -2326,43 +1869,26 @@ 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-mpc
 clean-host: maybe-clean-ppl
 clean-host: maybe-clean-cloog
 clean-host: maybe-clean-libelf
-clean-host: maybe-clean-gnuserv
 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
@@ -2372,29 +1898,11 @@ clean-host: maybe-clean-libdecnumber
 clean-host: maybe-clean-libgui
 clean-host: maybe-clean-libiberty
 clean-host: maybe-clean-libiconv
-clean-host: maybe-clean-libtool
 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-gdb
 clean-host: maybe-clean-expect
@@ -2420,13 +1928,10 @@ 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
@@ -2442,43 +1947,26 @@ 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-mpc
 distclean-host: maybe-distclean-ppl
 distclean-host: maybe-distclean-cloog
 distclean-host: maybe-distclean-libelf
-distclean-host: maybe-distclean-gnuserv
 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
@@ -2488,29 +1976,11 @@ distclean-host: maybe-distclean-libdecnumber
 distclean-host: maybe-distclean-libgui
 distclean-host: maybe-distclean-libiberty
 distclean-host: maybe-distclean-libiconv
-distclean-host: maybe-distclean-libtool
 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-gdb
 distclean-host: maybe-distclean-expect
@@ -2536,13 +2006,10 @@ 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
@@ -2558,43 +2025,26 @@ 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-mpc
 maintainer-clean-host: maybe-maintainer-clean-ppl
 maintainer-clean-host: maybe-maintainer-clean-cloog
 maintainer-clean-host: maybe-maintainer-clean-libelf
-maintainer-clean-host: maybe-maintainer-clean-gnuserv
 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
@@ -2604,29 +2054,11 @@ 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-libiconv
-maintainer-clean-host: maybe-maintainer-clean-libtool
 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-gdb
 maintainer-clean-host: maybe-maintainer-clean-expect
@@ -2652,13 +2084,10 @@ 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
@@ -2729,43 +2158,26 @@ 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-mpc \
     maybe-check-ppl \
     maybe-check-cloog \
     maybe-check-libelf \
-    maybe-check-gnuserv \
     maybe-check-gold \
     maybe-check-gprof \
-    maybe-check-gzip \
-    maybe-check-hello \
-    maybe-check-indent \
     maybe-check-intl \
     maybe-check-tcl \
     maybe-check-itcl \
@@ -2775,29 +2187,11 @@ check-host:  \
     maybe-check-libgui \
     maybe-check-libiberty \
     maybe-check-libiconv \
-    maybe-check-libtool \
     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-gdb \
     maybe-check-expect \
@@ -2823,13 +2217,10 @@ check-target:  \
     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
@@ -2872,42 +2263,25 @@ 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-mpc \
     maybe-install-ppl \
     maybe-install-cloog \
     maybe-install-libelf \
-    maybe-install-gnuserv \
     maybe-install-gold \
     maybe-install-gprof \
-    maybe-install-gzip \
-    maybe-install-hello \
-    maybe-install-indent \
     maybe-install-intl \
     maybe-install-tcl \
     maybe-install-itcl \
@@ -2917,29 +2291,11 @@ install-host-nogcc:  \
     maybe-install-libgui \
     maybe-install-libiberty \
     maybe-install-libiconv \
-    maybe-install-libtool \
     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-gdb \
     maybe-install-expect \
@@ -2952,43 +2308,26 @@ install-host-nogcc:  \
 
 .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-mpc \
     maybe-install-ppl \
     maybe-install-cloog \
     maybe-install-libelf \
-    maybe-install-gnuserv \
     maybe-install-gold \
     maybe-install-gprof \
-    maybe-install-gzip \
-    maybe-install-hello \
-    maybe-install-indent \
     maybe-install-intl \
     maybe-install-tcl \
     maybe-install-itcl \
@@ -2998,29 +2337,11 @@ install-host:  \
     maybe-install-libgui \
     maybe-install-libiberty \
     maybe-install-libiconv \
-    maybe-install-libtool \
     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-gdb \
     maybe-install-expect \
@@ -3046,13 +2367,10 @@ install-target:  \
     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
@@ -3087,43 +2405,26 @@ install-strip:
 
 .PHONY: install-strip-host
 install-strip-host:  \
-    maybe-install-strip-ash \
-    maybe-install-strip-autoconf \
-    maybe-install-strip-automake \
-    maybe-install-strip-bash \
     maybe-install-strip-bfd \
     maybe-install-strip-opcodes \
     maybe-install-strip-binutils \
     maybe-install-strip-bison \
-    maybe-install-strip-byacc \
-    maybe-install-strip-bzip2 \
     maybe-install-strip-cgen \
     maybe-install-strip-dejagnu \
-    maybe-install-strip-diff \
-    maybe-install-strip-dosutils \
     maybe-install-strip-etc \
     maybe-install-strip-fastjar \
-    maybe-install-strip-fileutils \
-    maybe-install-strip-findutils \
-    maybe-install-strip-find \
     maybe-install-strip-fixincludes \
     maybe-install-strip-flex \
     maybe-install-strip-gas \
     maybe-install-strip-gcc \
-    maybe-install-strip-gawk \
-    maybe-install-strip-gettext \
     maybe-install-strip-gmp \
     maybe-install-strip-mpfr \
     maybe-install-strip-mpc \
     maybe-install-strip-ppl \
     maybe-install-strip-cloog \
     maybe-install-strip-libelf \
-    maybe-install-strip-gnuserv \
     maybe-install-strip-gold \
     maybe-install-strip-gprof \
-    maybe-install-strip-gzip \
-    maybe-install-strip-hello \
-    maybe-install-strip-indent \
     maybe-install-strip-intl \
     maybe-install-strip-tcl \
     maybe-install-strip-itcl \
@@ -3133,29 +2434,11 @@ install-strip-host:  \
     maybe-install-strip-libgui \
     maybe-install-strip-libiberty \
     maybe-install-strip-libiconv \
-    maybe-install-strip-libtool \
     maybe-install-strip-m4 \
-    maybe-install-strip-make \
-    maybe-install-strip-mmalloc \
-    maybe-install-strip-patch \
-    maybe-install-strip-perl \
-    maybe-install-strip-prms \
-    maybe-install-strip-rcs \
     maybe-install-strip-readline \
-    maybe-install-strip-release \
-    maybe-install-strip-recode \
-    maybe-install-strip-sed \
-    maybe-install-strip-send-pr \
-    maybe-install-strip-shellutils \
     maybe-install-strip-sid \
     maybe-install-strip-sim \
-    maybe-install-strip-tar \
     maybe-install-strip-texinfo \
-    maybe-install-strip-textutils \
-    maybe-install-strip-time \
-    maybe-install-strip-uudecode \
-    maybe-install-strip-wdiff \
-    maybe-install-strip-zip \
     maybe-install-strip-zlib \
     maybe-install-strip-gdb \
     maybe-install-strip-expect \
@@ -3181,13 +2464,10 @@ install-strip-target:  \
     maybe-install-strip-target-winsup \
     maybe-install-strip-target-libgloss \
     maybe-install-strip-target-libiberty \
-    maybe-install-strip-target-gperf \
-    maybe-install-strip-target-examples \
     maybe-install-strip-target-libffi \
     maybe-install-strip-target-libjava \
     maybe-install-strip-target-zlib \
     maybe-install-strip-target-boehm-gc \
-    maybe-install-strip-target-qthreads \
     maybe-install-strip-target-rda \
     maybe-install-strip-target-libada \
     maybe-install-strip-target-libgomp
@@ -3348,62 +2628,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
@@ -3633,564 +2857,577 @@ all-build-fixincludes: configure-build-fixincludes
 # --------------------------------------
 
 
-.PHONY: configure-ash maybe-configure-ash
-maybe-configure-ash:
+.PHONY: configure-bfd maybe-configure-bfd
+maybe-configure-bfd:
 @if gcc-bootstrap
-configure-ash: stage_current
+configure-bfd: stage_current
 @endif gcc-bootstrap
-@if ash
-maybe-configure-ash: configure-ash
-configure-ash: 
-       @: $(MAKE); $(unstage)
+@if bfd
+maybe-configure-bfd: configure-bfd
+configure-bfd: 
        @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 ; \
+       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/ash; \
-       cd "$(HOST_SUBDIR)/ash" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/bfd; \
+       cd "$(HOST_SUBDIR)/bfd" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/ash/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ash"; \
-       libsrcdir="$$s/ash"; \
+       srcdiroption="--srcdir=$${topdir}/bfd"; \
+       libsrcdir="$$s/bfd"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif ash
-
-
+@endif bfd
 
 
 
-.PHONY: all-ash maybe-all-ash
-maybe-all-ash:
-@if gcc-bootstrap
-all-ash: stage_current
-@endif gcc-bootstrap
-@if ash
-TARGET-ash=all
-maybe-all-ash: all-ash
-all-ash: configure-ash
-       @: $(MAKE); $(unstage)
+.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; \
-       $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-ash))
-@endif ash
-
-
-
-
-.PHONY: check-ash maybe-check-ash
-maybe-check-ash:
-@if ash
-maybe-check-ash: check-ash
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/bfd/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)/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} \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif bfd-bootstrap
 
-check-ash:
-       @: $(MAKE); $(unstage)
+.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) \
-       (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif ash
-
-.PHONY: install-ash maybe-install-ash
-maybe-install-ash:
-@if ash
-maybe-install-ash: install-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; \
+       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_CONFIGURE_FLAGS)
+@endif bfd-bootstrap
 
-install-ash: installdirs
-       @: $(MAKE); $(unstage)
+.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) \
-       (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif ash
-
-.PHONY: install-strip-ash maybe-install-strip-ash
-maybe-install-strip-ash:
-@if ash
-maybe-install-strip-ash: install-strip-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; \
+       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) \
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif bfd-bootstrap
 
-install-strip-ash: installdirs
-       @: $(MAKE); $(unstage)
+.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) \
-       (cd $(HOST_SUBDIR)/ash && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif ash
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-ash info-ash
-maybe-info-ash:
-@if ash
-maybe-info-ash: info-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; \
+       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) \
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif bfd-bootstrap
 
-info-ash: \
-    configure-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 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
+       $(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; \
+       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) \
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif bfd-bootstrap
 
-dvi-ash: \
-    configure-ash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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; \
+       TFLAGS="$(STAGEfeedback_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 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
+       $(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)/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) \
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif bfd-bootstrap
 
-.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; \
+.PHONY: all-bfd maybe-all-bfd
+maybe-all-bfd:
+@if gcc-bootstrap
+all-bfd: stage_current
+@endif gcc-bootstrap
+@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) \
-       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
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/bfd && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+               $(TARGET-bfd))
+@endif bfd
 
-@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; \
+.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) \
-       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
+       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)   \
+               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(TARGET-stage1-bfd)
 
-@endif ash
+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)  \
+                clean
+@endif bfd-bootstrap
 
-.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; \
+.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 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
+       $(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 ash
+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-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; \
+.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 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
+       $(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 ash
+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-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; \
+.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 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) \
-         || 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 ash
+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-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; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 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
-
-mostlyclean-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 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
-
-clean-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 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
-
-distclean-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 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
-
-maintainer-clean-ash: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./ash/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 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)  \
+       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)
 
+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: 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: 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; \
-       test ! -f $(HOST_SUBDIR)/autoconf/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/autoconf ; \
-       $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/autoconf; \
-       cd "$(HOST_SUBDIR)/autoconf" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/autoconf/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/autoconf"; \
-       libsrcdir="$$s/autoconf"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif autoconf
-
-
-
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(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: all-autoconf maybe-all-autoconf
-maybe-all-autoconf:
-@if gcc-bootstrap
-all-autoconf: stage_current
-@endif gcc-bootstrap
-@if autoconf
-TARGET-autoconf=all
-maybe-all-autoconf: all-autoconf
-all-autoconf: configure-autoconf
-       @: $(MAKE); $(unstage)
-       @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
 
 
 
 
-.PHONY: check-autoconf maybe-check-autoconf
-maybe-check-autoconf:
-@if autoconf
-maybe-check-autoconf: check-autoconf
+.PHONY: check-bfd maybe-check-bfd
+maybe-check-bfd:
+@if bfd
+maybe-check-bfd: check-bfd
 
-check-autoconf:
+check-bfd:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/autoconf && \
+       (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif autoconf
+@endif bfd
 
-.PHONY: install-autoconf maybe-install-autoconf
-maybe-install-autoconf:
-@if autoconf
-maybe-install-autoconf: install-autoconf
+.PHONY: install-bfd maybe-install-bfd
+maybe-install-bfd:
+@if bfd
+maybe-install-bfd: install-bfd
 
-install-autoconf: installdirs
+install-bfd: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/autoconf && \
+       (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif autoconf
+@endif bfd
 
-.PHONY: install-strip-autoconf maybe-install-strip-autoconf
-maybe-install-strip-autoconf:
-@if autoconf
-maybe-install-strip-autoconf: install-strip-autoconf
+.PHONY: install-strip-bfd maybe-install-strip-bfd
+maybe-install-strip-bfd:
+@if bfd
+maybe-install-strip-bfd: install-strip-bfd
 
-install-strip-autoconf: installdirs
+install-strip-bfd: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/autoconf && \
+       (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif autoconf
+@endif bfd
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-autoconf info-autoconf
-maybe-info-autoconf:
-@if autoconf
-maybe-info-autoconf: info-autoconf
+.PHONY: maybe-info-bfd info-bfd
+maybe-info-bfd:
+@if bfd
+maybe-info-bfd: info-bfd
 
-info-autoconf: \
-    configure-autoconf 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
+       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}" \
@@ -4198,25 +3435,24 @@ info-autoconf: \
                  info) \
          || exit 1
 
-@endif autoconf
+@endif bfd
 
-.PHONY: maybe-dvi-autoconf dvi-autoconf
-maybe-dvi-autoconf:
-@if autoconf
-maybe-dvi-autoconf: dvi-autoconf
+.PHONY: maybe-dvi-bfd dvi-bfd
+maybe-dvi-bfd:
+@if bfd
+maybe-dvi-bfd: dvi-bfd
 
-dvi-autoconf: \
-    configure-autoconf 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
+       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}" \
@@ -4224,25 +3460,24 @@ dvi-autoconf: \
                  dvi) \
          || exit 1
 
-@endif autoconf
+@endif bfd
 
-.PHONY: maybe-pdf-autoconf pdf-autoconf
-maybe-pdf-autoconf:
-@if autoconf
-maybe-pdf-autoconf: pdf-autoconf
+.PHONY: maybe-pdf-bfd pdf-bfd
+maybe-pdf-bfd:
+@if bfd
+maybe-pdf-bfd: pdf-bfd
 
-pdf-autoconf: \
-    configure-autoconf 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
+       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}" \
@@ -4250,25 +3485,24 @@ pdf-autoconf: \
                  pdf) \
          || exit 1
 
-@endif autoconf
+@endif bfd
 
-.PHONY: maybe-html-autoconf html-autoconf
-maybe-html-autoconf:
-@if autoconf
-maybe-html-autoconf: html-autoconf
+.PHONY: maybe-html-bfd html-bfd
+maybe-html-bfd:
+@if bfd
+maybe-html-bfd: html-bfd
 
-html-autoconf: \
-    configure-autoconf 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
+       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}" \
@@ -4276,25 +3510,24 @@ html-autoconf: \
                  html) \
          || exit 1
 
-@endif autoconf
+@endif bfd
 
-.PHONY: maybe-TAGS-autoconf TAGS-autoconf
-maybe-TAGS-autoconf:
-@if autoconf
-maybe-TAGS-autoconf: TAGS-autoconf
+.PHONY: maybe-TAGS-bfd TAGS-bfd
+maybe-TAGS-bfd:
+@if bfd
+maybe-TAGS-bfd: TAGS-bfd
 
-TAGS-autoconf: \
-    configure-autoconf 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
+       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}" \
@@ -4302,26 +3535,25 @@ TAGS-autoconf: \
                  TAGS) \
          || exit 1
 
-@endif autoconf
+@endif bfd
 
-.PHONY: maybe-install-info-autoconf install-info-autoconf
-maybe-install-info-autoconf:
-@if autoconf
-maybe-install-info-autoconf: install-info-autoconf
+.PHONY: maybe-install-info-bfd install-info-bfd
+maybe-install-info-bfd:
+@if bfd
+maybe-install-info-bfd: install-info-bfd
 
-install-info-autoconf: \
-    configure-autoconf \
-    info-autoconf 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
+       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}" \
@@ -4329,26 +3561,25 @@ install-info-autoconf: \
                  install-info) \
          || exit 1
 
-@endif autoconf
+@endif bfd
 
-.PHONY: maybe-install-pdf-autoconf install-pdf-autoconf
-maybe-install-pdf-autoconf:
-@if autoconf
-maybe-install-pdf-autoconf: install-pdf-autoconf
+.PHONY: maybe-install-pdf-bfd install-pdf-bfd
+maybe-install-pdf-bfd:
+@if bfd
+maybe-install-pdf-bfd: install-pdf-bfd
 
-install-pdf-autoconf: \
-    configure-autoconf \
-    pdf-autoconf 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
+       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}" \
@@ -4356,26 +3587,25 @@ install-pdf-autoconf: \
                  install-pdf) \
          || exit 1
 
-@endif autoconf
+@endif bfd
 
-.PHONY: maybe-install-html-autoconf install-html-autoconf
-maybe-install-html-autoconf:
-@if autoconf
-maybe-install-html-autoconf: install-html-autoconf
+.PHONY: maybe-install-html-bfd install-html-bfd
+maybe-install-html-bfd:
+@if bfd
+maybe-install-html-bfd: install-html-bfd
 
-install-html-autoconf: \
-    configure-autoconf \
-    html-autoconf 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
+       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}" \
@@ -4383,25 +3613,24 @@ install-html-autoconf: \
                  install-html) \
          || exit 1
 
-@endif autoconf
+@endif bfd
 
-.PHONY: maybe-installcheck-autoconf installcheck-autoconf
-maybe-installcheck-autoconf:
-@if autoconf
-maybe-installcheck-autoconf: installcheck-autoconf
+.PHONY: maybe-installcheck-bfd installcheck-bfd
+maybe-installcheck-bfd:
+@if bfd
+maybe-installcheck-bfd: installcheck-bfd
 
-installcheck-autoconf: \
-    configure-autoconf 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
+       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}" \
@@ -4409,24 +3638,23 @@ installcheck-autoconf: \
                  installcheck) \
          || exit 1
 
-@endif autoconf
+@endif bfd
 
-.PHONY: maybe-mostlyclean-autoconf mostlyclean-autoconf
-maybe-mostlyclean-autoconf:
-@if autoconf
-maybe-mostlyclean-autoconf: mostlyclean-autoconf
+.PHONY: maybe-mostlyclean-bfd mostlyclean-bfd
+maybe-mostlyclean-bfd:
+@if bfd
+maybe-mostlyclean-bfd: mostlyclean-bfd
 
-mostlyclean-autoconf: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
+       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}" \
@@ -4434,24 +3662,23 @@ mostlyclean-autoconf:
                  mostlyclean) \
          || exit 1
 
-@endif autoconf
+@endif bfd
 
-.PHONY: maybe-clean-autoconf clean-autoconf
-maybe-clean-autoconf:
-@if autoconf
-maybe-clean-autoconf: clean-autoconf
+.PHONY: maybe-clean-bfd clean-bfd
+maybe-clean-bfd:
+@if bfd
+maybe-clean-bfd: clean-bfd
 
-clean-autoconf: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
+       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}" \
@@ -4459,24 +3686,23 @@ clean-autoconf:
                  clean) \
          || exit 1
 
-@endif autoconf
+@endif bfd
 
-.PHONY: maybe-distclean-autoconf distclean-autoconf
-maybe-distclean-autoconf:
-@if autoconf
-maybe-distclean-autoconf: distclean-autoconf
+.PHONY: maybe-distclean-bfd distclean-bfd
+maybe-distclean-bfd:
+@if bfd
+maybe-distclean-bfd: distclean-bfd
 
-distclean-autoconf: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
+       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}" \
@@ -4484,24 +3710,23 @@ distclean-autoconf:
                  distclean) \
          || exit 1
 
-@endif autoconf
+@endif bfd
 
-.PHONY: maybe-maintainer-clean-autoconf maintainer-clean-autoconf
-maybe-maintainer-clean-autoconf:
-@if autoconf
-maybe-maintainer-clean-autoconf: maintainer-clean-autoconf
+.PHONY: maybe-maintainer-clean-bfd maintainer-clean-bfd
+maybe-maintainer-clean-bfd:
+@if bfd
+maybe-maintainer-clean-bfd: maintainer-clean-bfd
 
-maintainer-clean-autoconf: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./autoconf/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 autoconf" ; \
-       (cd $(HOST_SUBDIR)/autoconf && \
+       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}" \
@@ -4509,804 +3734,808 @@ maintainer-clean-autoconf:
                  maintainer-clean) \
          || exit 1
 
-@endif autoconf
+@endif bfd
 
 
 
-.PHONY: configure-automake maybe-configure-automake
-maybe-configure-automake:
+.PHONY: configure-opcodes maybe-configure-opcodes
+maybe-configure-opcodes:
 @if gcc-bootstrap
-configure-automake: stage_current
+configure-opcodes: stage_current
 @endif gcc-bootstrap
-@if automake
-maybe-configure-automake: configure-automake
-configure-automake: 
-       @: $(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)/automake/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/automake ; \
+       test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/automake; \
-       cd "$(HOST_SUBDIR)/automake" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/opcodes; \
+       cd "$(HOST_SUBDIR)/opcodes" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/automake/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/automake"; \
-       libsrcdir="$$s/automake"; \
+       srcdiroption="--srcdir=$${topdir}/opcodes"; \
+       libsrcdir="$$s/opcodes"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif automake
-
-
+@endif opcodes
 
 
 
-.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
-       @: $(MAKE); $(unstage)
+.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; \
-       $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/automake && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-automake))
-@endif automake
-
-
-
-
-.PHONY: check-automake maybe-check-automake
-maybe-check-automake:
-@if automake
-maybe-check-automake: check-automake
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/opcodes/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)/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} \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif opcodes-bootstrap
 
-check-automake:
-       @: $(MAKE); $(unstage)
+.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) \
-       (cd $(HOST_SUBDIR)/automake && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif automake
-
-.PHONY: install-automake maybe-install-automake
-maybe-install-automake:
-@if automake
-maybe-install-automake: install-automake
+       $(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; \
+       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_CONFIGURE_FLAGS)
+@endif opcodes-bootstrap
 
-install-automake: installdirs
-       @: $(MAKE); $(unstage)
+.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) \
-       (cd $(HOST_SUBDIR)/automake && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif automake
-
-.PHONY: install-strip-automake maybe-install-strip-automake
-maybe-install-strip-automake:
-@if automake
-maybe-install-strip-automake: install-strip-automake
+       $(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; \
+       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) \
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif opcodes-bootstrap
 
-install-strip-automake: installdirs
-       @: $(MAKE); $(unstage)
+.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) \
-       (cd $(HOST_SUBDIR)/automake && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif automake
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-automake info-automake
-maybe-info-automake:
-@if automake
-maybe-info-automake: info-automake
+       $(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; \
+       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) \
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif opcodes-bootstrap
 
-info-automake: \
-    configure-automake 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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 automake
-
-.PHONY: maybe-dvi-automake dvi-automake
-maybe-dvi-automake:
-@if automake
-maybe-dvi-automake: dvi-automake
-
-dvi-automake: \
-    configure-automake 
+       $(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; \
+       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) \
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif opcodes-bootstrap
+
+.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) \
+       $(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; \
+       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) \
+         $(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)  \
+               $(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)   \
+               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)  \
+                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)
-       @[ -f ./automake/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) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing dvi in automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
-         $(MAKE) $(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
+       (cd $(HOST_SUBDIR)/opcodes && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif automake
+@endif opcodes
 
-.PHONY: maybe-pdf-automake pdf-automake
-maybe-pdf-automake:
-@if automake
-maybe-pdf-automake: pdf-automake
+.PHONY: install-opcodes maybe-install-opcodes
+maybe-install-opcodes:
+@if opcodes
+maybe-install-opcodes: install-opcodes
 
-pdf-automake: \
-    configure-automake 
+install-opcodes: installdirs
        @: $(MAKE); $(unstage)
-       @[ -f ./automake/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) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing pdf in automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
-         $(MAKE) $(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
+       (cd $(HOST_SUBDIR)/opcodes && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif automake
+@endif opcodes
 
-.PHONY: maybe-html-automake html-automake
-maybe-html-automake:
-@if automake
-maybe-html-automake: html-automake
+.PHONY: install-strip-opcodes maybe-install-strip-opcodes
+maybe-install-strip-opcodes:
+@if opcodes
+maybe-install-strip-opcodes: install-strip-opcodes
 
-html-automake: \
-    configure-automake 
+install-strip-opcodes: installdirs
        @: $(MAKE); $(unstage)
-       @[ -f ./automake/Makefile ] || exit 0; \
+       @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-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 html in automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
-                 html) \
+                 info) \
          || exit 1
 
-@endif automake
+@endif opcodes
 
-.PHONY: maybe-TAGS-automake TAGS-automake
-maybe-TAGS-automake:
-@if automake
-maybe-TAGS-automake: TAGS-automake
+.PHONY: maybe-dvi-opcodes dvi-opcodes
+maybe-dvi-opcodes:
+@if opcodes
+maybe-dvi-opcodes: dvi-opcodes
 
-TAGS-automake: \
-    configure-automake 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/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 TAGS in automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 TAGS) \
+                 dvi) \
          || exit 1
 
-@endif automake
+@endif opcodes
 
-.PHONY: maybe-install-info-automake install-info-automake
-maybe-install-info-automake:
-@if automake
-maybe-install-info-automake: install-info-automake
+.PHONY: maybe-pdf-opcodes pdf-opcodes
+maybe-pdf-opcodes:
+@if opcodes
+maybe-pdf-opcodes: pdf-opcodes
 
-install-info-automake: \
-    configure-automake \
-    info-automake 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/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 install-info in automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-info) \
+                 pdf) \
          || exit 1
 
-@endif automake
+@endif opcodes
 
-.PHONY: maybe-install-pdf-automake install-pdf-automake
-maybe-install-pdf-automake:
-@if automake
-maybe-install-pdf-automake: install-pdf-automake
+.PHONY: maybe-html-opcodes html-opcodes
+maybe-html-opcodes:
+@if opcodes
+maybe-html-opcodes: html-opcodes
 
-install-pdf-automake: \
-    configure-automake \
-    pdf-automake 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/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 install-pdf in automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-pdf) \
+                 html) \
          || exit 1
 
-@endif automake
+@endif opcodes
 
-.PHONY: maybe-install-html-automake install-html-automake
-maybe-install-html-automake:
-@if automake
-maybe-install-html-automake: install-html-automake
+.PHONY: maybe-TAGS-opcodes TAGS-opcodes
+maybe-TAGS-opcodes:
+@if opcodes
+maybe-TAGS-opcodes: TAGS-opcodes
 
-install-html-automake: \
-    configure-automake \
-    html-automake 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/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 install-html in automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-html) \
+                 TAGS) \
          || exit 1
 
-@endif automake
+@endif opcodes
 
-.PHONY: maybe-installcheck-automake installcheck-automake
-maybe-installcheck-automake:
-@if automake
-maybe-installcheck-automake: installcheck-automake
+.PHONY: maybe-install-info-opcodes install-info-opcodes
+maybe-install-info-opcodes:
+@if opcodes
+maybe-install-info-opcodes: install-info-opcodes
 
-installcheck-automake: \
-    configure-automake 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/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 installcheck in automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 installcheck) \
+                 install-info) \
          || exit 1
 
-@endif automake
+@endif opcodes
 
-.PHONY: maybe-mostlyclean-automake mostlyclean-automake
-maybe-mostlyclean-automake:
-@if automake
-maybe-mostlyclean-automake: mostlyclean-automake
+.PHONY: maybe-install-pdf-opcodes install-pdf-opcodes
+maybe-install-pdf-opcodes:
+@if opcodes
+maybe-install-pdf-opcodes: install-pdf-opcodes
 
-mostlyclean-automake: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/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 mostlyclean in automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 mostlyclean) \
+                 install-pdf) \
          || exit 1
 
-@endif automake
+@endif opcodes
 
-.PHONY: maybe-clean-automake clean-automake
-maybe-clean-automake:
-@if automake
-maybe-clean-automake: clean-automake
+.PHONY: maybe-install-html-opcodes install-html-opcodes
+maybe-install-html-opcodes:
+@if opcodes
+maybe-install-html-opcodes: install-html-opcodes
 
-clean-automake: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/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 clean in automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 clean) \
+                 install-html) \
          || exit 1
 
-@endif automake
+@endif opcodes
 
-.PHONY: maybe-distclean-automake distclean-automake
-maybe-distclean-automake:
-@if automake
-maybe-distclean-automake: distclean-automake
+.PHONY: maybe-installcheck-opcodes installcheck-opcodes
+maybe-installcheck-opcodes:
+@if opcodes
+maybe-installcheck-opcodes: installcheck-opcodes
 
-distclean-automake: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/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 distclean in automake" ; \
-       (cd $(HOST_SUBDIR)/automake && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 distclean) \
+                 installcheck) \
          || exit 1
 
-@endif automake
-
-.PHONY: maybe-maintainer-clean-automake maintainer-clean-automake
-maybe-maintainer-clean-automake:
-@if automake
-maybe-maintainer-clean-automake: maintainer-clean-automake
+@endif opcodes
 
-maintainer-clean-automake: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./automake/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 automake
-
-
-
-.PHONY: configure-bash maybe-configure-bash
-maybe-configure-bash:
-@if gcc-bootstrap
-configure-bash: stage_current
-@endif gcc-bootstrap
-@if bash
-maybe-configure-bash: configure-bash
-configure-bash: 
-       @: $(MAKE); $(unstage)
-       @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; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/bash/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/bash"; \
-       libsrcdir="$$s/bash"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif bash
-
-
-
-
-
-.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; \
-       $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/bash && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-bash))
-@endif bash
-
-
-
-
-.PHONY: check-bash maybe-check-bash
-maybe-check-bash:
-@if bash
-maybe-check-bash: check-bash
-
-check-bash:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/bash && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif bash
-
-.PHONY: install-bash maybe-install-bash
-maybe-install-bash:
-@if bash
-maybe-install-bash: install-bash
-
-install-bash: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/bash && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif bash
-
-.PHONY: install-strip-bash maybe-install-strip-bash
-maybe-install-strip-bash:
-@if bash
-maybe-install-strip-bash: install-strip-bash
-
-install-strip-bash: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/bash && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif bash
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-bash info-bash
-maybe-info-bash:
-@if bash
-maybe-info-bash: info-bash
-
-info-bash: \
-    configure-bash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 bash
-
-.PHONY: maybe-dvi-bash dvi-bash
-maybe-dvi-bash:
-@if bash
-maybe-dvi-bash: dvi-bash
-
-dvi-bash: \
-    configure-bash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 bash
-
-.PHONY: maybe-pdf-bash pdf-bash
-maybe-pdf-bash:
-@if bash
-maybe-pdf-bash: pdf-bash
-
-pdf-bash: \
-    configure-bash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 bash
-
-.PHONY: maybe-html-bash html-bash
-maybe-html-bash:
-@if bash
-maybe-html-bash: html-bash
-
-html-bash: \
-    configure-bash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 bash
-
-.PHONY: maybe-TAGS-bash TAGS-bash
-maybe-TAGS-bash:
-@if bash
-maybe-TAGS-bash: TAGS-bash
-
-TAGS-bash: \
-    configure-bash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 bash
-
-.PHONY: maybe-install-info-bash install-info-bash
-maybe-install-info-bash:
-@if bash
-maybe-install-info-bash: install-info-bash
-
-install-info-bash: \
-    configure-bash \
-    info-bash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 bash
-
-.PHONY: maybe-install-pdf-bash install-pdf-bash
-maybe-install-pdf-bash:
-@if bash
-maybe-install-pdf-bash: install-pdf-bash
-
-install-pdf-bash: \
-    configure-bash \
-    pdf-bash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 bash
-
-.PHONY: maybe-install-html-bash install-html-bash
-maybe-install-html-bash:
-@if bash
-maybe-install-html-bash: install-html-bash
-
-install-html-bash: \
-    configure-bash \
-    html-bash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 bash
-
-.PHONY: maybe-installcheck-bash installcheck-bash
-maybe-installcheck-bash:
-@if bash
-maybe-installcheck-bash: installcheck-bash
-
-installcheck-bash: \
-    configure-bash 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bash/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 bash
-
-.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}" \
@@ -5314,24 +4543,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}" \
@@ -5339,24 +4567,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}" \
@@ -5364,24 +4591,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}" \
@@ -5389,274 +4615,274 @@ 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 ; \
+       test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/bfd; \
-       cd "$(HOST_SUBDIR)/bfd" || exit 1; \
+       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"; \
+       srcdiroption="--srcdir=$${topdir}/binutils"; \
+       libsrcdir="$$s/binutils"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption}  \
          || 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; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/binutils/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)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       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"; \
+       srcdiroption="--srcdir=$${topdir}/binutils"; \
+       libsrcdir="$$s/binutils"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption} \
          $(STAGE1_CONFIGURE_FLAGS)
-@endif bfd-bootstrap
+@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; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/binutils/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)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       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"; \
+       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_CONFIGURE_FLAGS)
-@endif bfd-bootstrap
+@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; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/binutils/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)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       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"; \
+       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) \
          $(STAGE3_CONFIGURE_FLAGS)
-@endif bfd-bootstrap
+@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; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/binutils/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)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       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"; \
+       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) \
          $(STAGE4_CONFIGURE_FLAGS)
-@endif bfd-bootstrap
+@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; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/binutils/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)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       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"; \
+       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) \
          $(STAGEprofile_CONFIGURE_FLAGS)
-@endif bfd-bootstrap
+@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; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/binutils/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)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-       cd $(HOST_SUBDIR)/bfd || exit 1; \
+       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"; \
+       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) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif bfd-bootstrap
+@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 && \
+       (cd $(HOST_SUBDIR)/binutils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-bfd))
-@endif bfd
+               $(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; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
        $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/bfd && \
+       cd $(HOST_SUBDIR)/binutils && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -5666,39 +4892,39 @@ all-stage1-bfd: configure-stage1-bfd
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS)   \
                TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-bfd)
+               $(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
+@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 && \
+       cd $(HOST_SUBDIR)/binutils && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -5708,40 +4934,40 @@ all-stage2-bfd: configure-stage2-bfd
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE2_TFLAGS)" \
-               $(TARGET-stage2-bfd)
+               $(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 && \
+       cd $(HOST_SUBDIR)/binutils && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif bfd-bootstrap
+@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 && \
+       cd $(HOST_SUBDIR)/binutils && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -5751,40 +4977,40 @@ all-stage3-bfd: configure-stage3-bfd
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE3_TFLAGS)" \
-               $(TARGET-stage3-bfd)
+               $(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 && \
+       cd $(HOST_SUBDIR)/binutils && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif bfd-bootstrap
+@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 && \
+       cd $(HOST_SUBDIR)/binutils && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -5794,40 +5020,40 @@ all-stage4-bfd: configure-stage4-bfd
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE4_TFLAGS)" \
-               $(TARGET-stage4-bfd)
+               $(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 && \
+       cd $(HOST_SUBDIR)/binutils && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif bfd-bootstrap
+@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 && \
+       cd $(HOST_SUBDIR)/binutils && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -5837,40 +5063,40 @@ all-stageprofile-bfd: configure-stageprofile-bfd
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEprofile_TFLAGS)" \
-               $(TARGET-stageprofile-bfd)
+               $(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 && \
+       cd $(HOST_SUBDIR)/binutils && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif bfd-bootstrap
+@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 && \
+       cd $(HOST_SUBDIR)/binutils && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -5880,90 +5106,90 @@ all-stagefeedback-bfd: configure-stagefeedback-bfd
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEfeedback_TFLAGS)" \
-               $(TARGET-stagefeedback-bfd)
+               $(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 && \
+       cd $(HOST_SUBDIR)/binutils && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif bfd-bootstrap
+@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 && \
+       (cd $(HOST_SUBDIR)/binutils && \
          $(MAKE) $(FLAGS_TO_PASS)  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-bfd maybe-install-strip-bfd
-maybe-install-strip-bfd:
-@if bfd
-maybe-install-strip-bfd: install-strip-bfd
+.PHONY: install-strip-binutils maybe-install-strip-binutils
+maybe-install-strip-binutils:
+@if binutils
+maybe-install-strip-binutils: install-strip-binutils
 
-install-strip-bfd: installdirs
+install-strip-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-strip)
 
-@endif bfd
+@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}" \
@@ -5971,24 +5197,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}" \
@@ -5996,24 +5222,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}" \
@@ -6021,24 +5247,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}" \
@@ -6046,24 +5272,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}" \
@@ -6071,25 +5297,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}" \
@@ -6097,25 +5323,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}" \
@@ -6123,25 +5349,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}" \
@@ -6149,24 +5375,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}" \
@@ -6174,23 +5400,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}" \
@@ -6198,23 +5424,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}" \
@@ -6222,23 +5448,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}" \
@@ -6246,23 +5472,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}" \
@@ -6270,1462 +5496,1011 @@ 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 ; \
+       test ! -f $(HOST_SUBDIR)/bison/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/opcodes; \
-       cd "$(HOST_SUBDIR)/opcodes" || exit 1; \
+       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"; \
+       srcdiroption="--srcdir=$${topdir}/bison"; \
+       libsrcdir="$$s/bison"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption}  \
          || 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
-       @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) \
-       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; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         $(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; \
-       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_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
+.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; \
-       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; \
-       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) \
-         $(STAGE3_CONFIGURE_FLAGS)
-@endif opcodes-bootstrap
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/bison && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+               $(TARGET-bison))
+@endif 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; \
-       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; \
-       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) \
-         $(STAGE4_CONFIGURE_FLAGS)
-@endif opcodes-bootstrap
 
-.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; \
-       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) \
-         $(STAGEprofile_CONFIGURE_FLAGS)
-@endif opcodes-bootstrap
 
-.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) \
-       $(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; \
-       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) \
-         $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif opcodes-bootstrap
 
+.PHONY: check-bison maybe-check-bison
+maybe-check-bison:
+@if bison
+maybe-check-bison: check-bison
 
+# 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
 
+@endif bison
 
+.PHONY: install-bison maybe-install-bison
+maybe-install-bison:
+@if bison
+maybe-install-bison: install-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
+install-bison: installdirs
+       @: $(MAKE); $(unstage)
        @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
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/bison && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
+@endif bison
 
+.PHONY: install-strip-bison maybe-install-strip-bison
+maybe-install-strip-bison:
+@if bison
+maybe-install-strip-bison: install-strip-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
+install-strip-bison: installdirs
+       @: $(MAKE); $(unstage)
        @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)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-opcodes)
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/bison && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-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
+@endif bison
 
+# Other targets (info, dvi, pdf, etc.)
 
-.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; \
+.PHONY: maybe-info-bison info-bison
+maybe-info-bison:
+@if bison
+maybe-info-bison: info-bison
+
+info-bison: \
+    configure-bison 
+       @: $(MAKE); $(unstage)
+       @[ -f ./bison/Makefile ] || exit 0; \
+       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)
+       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
 
-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
+@endif bison
 
+.PHONY: maybe-dvi-bison dvi-bison
+maybe-dvi-bison:
+@if bison
+maybe-dvi-bison: dvi-bison
 
-.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; \
+dvi-bison: \
+    configure-bison 
+       @: $(MAKE); $(unstage)
+       @[ -f ./bison/Makefile ] || exit 0; \
+       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)
+       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 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 dvi) \
+         || exit 1
 
-maybe-clean-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
+@endif bison
 
+.PHONY: maybe-pdf-bison pdf-bison
+maybe-pdf-bison:
+@if bison
+maybe-pdf-bison: pdf-bison
 
-.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; \
+pdf-bison: \
+    configure-bison 
+       @: $(MAKE); $(unstage)
+       @[ -f ./bison/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE4_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/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)
+       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 && \
+         $(MAKE) $(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
 
-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
+@endif bison
 
+.PHONY: maybe-html-bison html-bison
+maybe-html-bison:
+@if bison
+maybe-html-bison: html-bison
 
-.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; \
+html-bison: \
+    configure-bison 
+       @: $(MAKE); $(unstage)
+       @[ -f ./bison/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEprofile_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/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)
+       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 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 html) \
+         || exit 1
 
-maybe-clean-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) \
-       (cd $(HOST_SUBDIR)/opcodes && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif opcodes
+@endif bison
 
-.PHONY: install-opcodes maybe-install-opcodes
-maybe-install-opcodes:
-@if opcodes
-maybe-install-opcodes: install-opcodes
+.PHONY: maybe-TAGS-bison TAGS-bison
+maybe-TAGS-bison:
+@if bison
+maybe-TAGS-bison: TAGS-bison
 
-install-opcodes: installdirs
+TAGS-bison: \
+    configure-bison 
        @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
+       @[ -f ./bison/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/opcodes && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+       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 && \
+         $(MAKE) $(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 opcodes
+@endif bison
 
-.PHONY: install-strip-opcodes maybe-install-strip-opcodes
-maybe-install-strip-opcodes:
-@if opcodes
-maybe-install-strip-opcodes: install-strip-opcodes
+.PHONY: maybe-install-info-bison install-info-bison
+maybe-install-info-bison:
+@if bison
+maybe-install-info-bison: install-info-bison
 
-install-strip-opcodes: installdirs
+install-info-bison: \
+    configure-bison \
+    info-bison 
        @: $(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-opcodes info-opcodes
-maybe-info-opcodes:
-@if opcodes
-maybe-info-opcodes: info-opcodes
-
-info-opcodes: \
-    configure-opcodes 
-       @[ -f ./opcodes/Makefile ] || exit 0; \
+       @[ -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 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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 info) \
+                 install-info) \
          || exit 1
 
-@endif opcodes
+@endif bison
 
-.PHONY: maybe-dvi-opcodes dvi-opcodes
-maybe-dvi-opcodes:
-@if opcodes
-maybe-dvi-opcodes: dvi-opcodes
+.PHONY: maybe-install-pdf-bison install-pdf-bison
+maybe-install-pdf-bison:
+@if bison
+maybe-install-pdf-bison: install-pdf-bison
 
-dvi-opcodes: \
-    configure-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 dvi 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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 dvi) \
+                 install-pdf) \
          || exit 1
 
-@endif opcodes
+@endif bison
 
-.PHONY: maybe-pdf-opcodes pdf-opcodes
-maybe-pdf-opcodes:
-@if opcodes
-maybe-pdf-opcodes: pdf-opcodes
+.PHONY: maybe-install-html-bison install-html-bison
+maybe-install-html-bison:
+@if bison
+maybe-install-html-bison: install-html-bison
 
-pdf-opcodes: \
-    configure-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 pdf 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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 pdf) \
+                 install-html) \
          || exit 1
 
-@endif opcodes
+@endif bison
 
-.PHONY: maybe-html-opcodes html-opcodes
-maybe-html-opcodes:
-@if opcodes
-maybe-html-opcodes: html-opcodes
+.PHONY: maybe-installcheck-bison installcheck-bison
+maybe-installcheck-bison:
+@if bison
+maybe-installcheck-bison: installcheck-bison
 
-html-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 html 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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 html) \
+                 installcheck) \
          || exit 1
 
-@endif opcodes
+@endif bison
 
-.PHONY: maybe-TAGS-opcodes TAGS-opcodes
-maybe-TAGS-opcodes:
-@if opcodes
-maybe-TAGS-opcodes: TAGS-opcodes
+.PHONY: maybe-mostlyclean-bison mostlyclean-bison
+maybe-mostlyclean-bison:
+@if bison
+maybe-mostlyclean-bison: mostlyclean-bison
 
-TAGS-opcodes: \
-    configure-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 TAGS 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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 TAGS) \
+                 mostlyclean) \
          || 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-clean-bison clean-bison
+maybe-clean-bison:
+@if bison
+maybe-clean-bison: clean-bison
 
-install-info-opcodes: \
-    configure-opcodes \
-    info-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 install-info 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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-info) \
+                 clean) \
          || 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-distclean-bison distclean-bison
+maybe-distclean-bison:
+@if bison
+maybe-distclean-bison: distclean-bison
 
-install-pdf-opcodes: \
-    configure-opcodes \
-    pdf-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 install-pdf 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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-pdf) \
+                 distclean) \
          || 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-maintainer-clean-bison maintainer-clean-bison
+maybe-maintainer-clean-bison:
+@if bison
+maybe-maintainer-clean-bison: maintainer-clean-bison
 
-install-html-opcodes: \
-    configure-opcodes \
-    html-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 install-html 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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-html) \
+                 maintainer-clean) \
          || exit 1
 
-@endif opcodes
+@endif bison
 
-.PHONY: maybe-installcheck-opcodes installcheck-opcodes
-maybe-installcheck-opcodes:
-@if opcodes
-maybe-installcheck-opcodes: installcheck-opcodes
 
-installcheck-opcodes: \
-    configure-opcodes 
-       @[ -f ./opcodes/Makefile ] || exit 0; \
+
+.PHONY: configure-cgen maybe-configure-cgen
+maybe-configure-cgen:
+@if gcc-bootstrap
+configure-cgen: stage_current
+@endif gcc-bootstrap
+@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)/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)/cgen/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/cgen"; \
+       libsrcdir="$$s/cgen"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption}  \
+         || exit 1
+@endif cgen
+
+
+
+
+
+.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; \
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/cgen && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+               $(TARGET-cgen))
+@endif cgen
+
+
+
+
+.PHONY: check-cgen maybe-check-cgen
+maybe-check-cgen:
+@if cgen
+maybe-check-cgen: check-cgen
+
+check-cgen:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/cgen && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif cgen
+
+.PHONY: install-cgen maybe-install-cgen
+maybe-install-cgen:
+@if cgen
+maybe-install-cgen: install-cgen
+
+install-cgen: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/cgen && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
+
+@endif cgen
+
+.PHONY: install-strip-cgen maybe-install-strip-cgen
+maybe-install-strip-cgen:
+@if cgen
+maybe-install-strip-cgen: install-strip-cgen
+
+install-strip-cgen: installdirs
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/cgen && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+
+@endif cgen
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-cgen info-cgen
+maybe-info-cgen:
+@if cgen
+maybe-info-cgen: info-cgen
+
+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 installcheck in opcodes" ; \
-       (cd $(HOST_SUBDIR)/opcodes && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 installcheck) \
+                 info) \
          || exit 1
 
-@endif opcodes
+@endif cgen
 
-.PHONY: maybe-mostlyclean-opcodes mostlyclean-opcodes
-maybe-mostlyclean-opcodes:
-@if opcodes
-maybe-mostlyclean-opcodes: mostlyclean-opcodes
+.PHONY: maybe-dvi-cgen dvi-cgen
+maybe-dvi-cgen:
+@if cgen
+maybe-dvi-cgen: dvi-cgen
 
-mostlyclean-opcodes: 
-       @[ -f ./opcodes/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 mostlyclean in opcodes" ; \
-       (cd $(HOST_SUBDIR)/opcodes && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 mostlyclean) \
+                 dvi) \
          || exit 1
 
-@endif opcodes
+@endif cgen
 
-.PHONY: maybe-clean-opcodes clean-opcodes
-maybe-clean-opcodes:
-@if opcodes
-maybe-clean-opcodes: clean-opcodes
+.PHONY: maybe-pdf-cgen pdf-cgen
+maybe-pdf-cgen:
+@if cgen
+maybe-pdf-cgen: pdf-cgen
 
-clean-opcodes: 
-       @[ -f ./opcodes/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 clean in opcodes" ; \
-       (cd $(HOST_SUBDIR)/opcodes && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 clean) \
+                 pdf) \
          || exit 1
 
-@endif opcodes
+@endif cgen
 
-.PHONY: maybe-distclean-opcodes distclean-opcodes
-maybe-distclean-opcodes:
-@if opcodes
-maybe-distclean-opcodes: distclean-opcodes
+.PHONY: maybe-html-cgen html-cgen
+maybe-html-cgen:
+@if cgen
+maybe-html-cgen: html-cgen
 
-distclean-opcodes: 
-       @[ -f ./opcodes/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 distclean in opcodes" ; \
-       (cd $(HOST_SUBDIR)/opcodes && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 distclean) \
+                 html) \
          || exit 1
 
-@endif opcodes
+@endif cgen
 
-.PHONY: maybe-maintainer-clean-opcodes maintainer-clean-opcodes
-maybe-maintainer-clean-opcodes:
-@if opcodes
-maybe-maintainer-clean-opcodes: maintainer-clean-opcodes
+.PHONY: maybe-TAGS-cgen TAGS-cgen
+maybe-TAGS-cgen:
+@if cgen
+maybe-TAGS-cgen: TAGS-cgen
 
-maintainer-clean-opcodes: 
-       @[ -f ./opcodes/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 maintainer-clean in opcodes" ; \
-       (cd $(HOST_SUBDIR)/opcodes && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 maintainer-clean) \
+                 TAGS) \
          || exit 1
 
-@endif opcodes
+@endif cgen
 
+.PHONY: maybe-install-info-cgen install-info-cgen
+maybe-install-info-cgen:
+@if cgen
+maybe-install-info-cgen: install-info-cgen
 
+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 cgen" ; \
+       (cd $(HOST_SUBDIR)/cgen && \
+         $(MAKE) $(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
 
-.PHONY: configure-binutils maybe-configure-binutils
-maybe-configure-binutils:
-@if gcc-bootstrap
-configure-binutils: stage_current
-@endif gcc-bootstrap
-@if binutils
-maybe-configure-binutils: configure-binutils
-configure-binutils: 
-       @r=`${PWD_COMMAND}`; export r; \
+@endif cgen
+
+.PHONY: maybe-install-pdf-cgen install-pdf-cgen
+maybe-install-pdf-cgen:
+@if cgen
+maybe-install-pdf-cgen: install-pdf-cgen
+
+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; \
-       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)/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}  \
+       $(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 cgen" ; \
+       (cd $(HOST_SUBDIR)/cgen && \
+         $(MAKE) $(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 binutils
 
+@endif cgen
 
+.PHONY: maybe-install-html-cgen install-html-cgen
+maybe-install-html-cgen:
+@if cgen
+maybe-install-html-cgen: install-html-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
-       @r=`${PWD_COMMAND}`; export r; \
+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; \
-       TFLAGS="$(STAGE1_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/binutils/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)/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} \
-         $(STAGE1_CONFIGURE_FLAGS)
-@endif binutils-bootstrap
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       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}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 install-html) \
+         || exit 1
 
-.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; \
+@endif cgen
+
+.PHONY: maybe-installcheck-cgen installcheck-cgen
+maybe-installcheck-cgen:
+@if cgen
+maybe-installcheck-cgen: installcheck-cgen
+
+installcheck-cgen: \
+    configure-cgen 
+       @: $(MAKE); $(unstage)
+       @[ -f ./cgen/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/binutils/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)/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_CONFIGURE_FLAGS)
-@endif binutils-bootstrap
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       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}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 installcheck) \
+         || exit 1
 
-.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; \
+@endif cgen
+
+.PHONY: maybe-mostlyclean-cgen mostlyclean-cgen
+maybe-mostlyclean-cgen:
+@if cgen
+maybe-mostlyclean-cgen: mostlyclean-cgen
+
+mostlyclean-cgen: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./cgen/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE3_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/binutils/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)/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) \
-         $(STAGE3_CONFIGURE_FLAGS)
-@endif binutils-bootstrap
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       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}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 mostlyclean) \
+         || exit 1
 
-.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; \
+@endif cgen
+
+.PHONY: maybe-clean-cgen clean-cgen
+maybe-clean-cgen:
+@if cgen
+maybe-clean-cgen: clean-cgen
+
+clean-cgen: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./cgen/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE4_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/binutils/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)/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) \
-         $(STAGE4_CONFIGURE_FLAGS)
-@endif binutils-bootstrap
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       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}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 clean) \
+         || exit 1
 
-.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; \
+@endif cgen
+
+.PHONY: maybe-distclean-cgen distclean-cgen
+maybe-distclean-cgen:
+@if cgen
+maybe-distclean-cgen: distclean-cgen
+
+distclean-cgen: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./cgen/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/binutils/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)/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) \
-         $(STAGEprofile_CONFIGURE_FLAGS)
-@endif binutils-bootstrap
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       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}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 distclean) \
+         || exit 1
 
-.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; \
+@endif cgen
+
+.PHONY: maybe-maintainer-clean-cgen maintainer-clean-cgen
+maybe-maintainer-clean-cgen:
+@if cgen
+maybe-maintainer-clean-cgen: maintainer-clean-cgen
+
+maintainer-clean-cgen: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./cgen/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/binutils/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)/binutils ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
-       cd $(HOST_SUBDIR)/binutils || 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 cgen" ; \
+       (cd $(HOST_SUBDIR)/cgen && \
+         $(MAKE) $(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 cgen
+
+
+
+.PHONY: configure-dejagnu maybe-configure-dejagnu
+maybe-configure-dejagnu:
+@if gcc-bootstrap
+configure-dejagnu: stage_current
+@endif gcc-bootstrap
+@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)/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)/binutils/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/dejagnu/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
+       srcdiroption="--srcdir=$${topdir}/dejagnu"; \
+       libsrcdir="$$s/dejagnu"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif binutils-bootstrap
+         --target=${target_alias} $${srcdiroption}  \
+         || exit 1
+@endif dejagnu
 
 
 
 
 
-.PHONY: all-binutils maybe-all-binutils
-maybe-all-binutils:
+.PHONY: all-dejagnu maybe-all-dejagnu
+maybe-all-dejagnu:
 @if gcc-bootstrap
-all-binutils: stage_current
+all-dejagnu: stage_current
 @endif gcc-bootstrap
-@if binutils
-TARGET-binutils=all
-maybe-all-binutils: all-binutils
-all-binutils: configure-binutils
+@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)/binutils && \
+       (cd $(HOST_SUBDIR)/dejagnu && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-binutils))
-@endif binutils
+               $(TARGET-dejagnu))
+@endif dejagnu
 
 
 
-.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
+
+.PHONY: check-dejagnu maybe-check-dejagnu
+maybe-check-dejagnu:
+@if dejagnu
+maybe-check-dejagnu: check-dejagnu
+
+check-dejagnu:
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE1_TFLAGS)"; \
-       $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" \
-               CXXFLAGS="$(STAGE1_CXXFLAGS)" \
-               LIBCFLAGS="$(LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-binutils)
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/dejagnu && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
 
-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
+@endif dejagnu
 
+.PHONY: install-dejagnu maybe-install-dejagnu
+maybe-install-dejagnu:
+@if dejagnu
+maybe-install-dejagnu: install-dejagnu
 
-.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
+install-dejagnu: installdirs
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/binutils && \
-       $(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-binutils)
+       (cd $(HOST_SUBDIR)/dejagnu && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-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-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)/binutils && \
-       $(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-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-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)/binutils && \
-       $(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-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
-
-
-.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)/binutils && \
-       $(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-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: 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)/binutils && \
-       $(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-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
-
-
-
-
-
-.PHONY: check-binutils maybe-check-binutils
-maybe-check-binutils:
-@if binutils
-maybe-check-binutils: check-binutils
-
-check-binutils:
-       @: $(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)
-
-@endif binutils
-
-.PHONY: install-binutils maybe-install-binutils
-maybe-install-binutils:
-@if binutils
-maybe-install-binutils: install-binutils
-
-install-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)
-
-@endif binutils
+@endif dejagnu
 
-.PHONY: install-strip-binutils maybe-install-strip-binutils
-maybe-install-strip-binutils:
-@if binutils
-maybe-install-strip-binutils: install-strip-binutils
+.PHONY: install-strip-dejagnu maybe-install-strip-dejagnu
+maybe-install-strip-dejagnu:
+@if dejagnu
+maybe-install-strip-dejagnu: install-strip-dejagnu
 
-install-strip-binutils: installdirs
+install-strip-dejagnu: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/binutils && \
+       (cd $(HOST_SUBDIR)/dejagnu && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif binutils
+@endif dejagnu
 
 # 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-dejagnu info-dejagnu
+maybe-info-dejagnu:
+@if dejagnu
+maybe-info-dejagnu: info-dejagnu
 
-info-binutils: \
-    configure-binutils 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+info-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 info in binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
@@ -7733,24 +6508,25 @@ info-binutils: \
                  info) \
          || exit 1
 
-@endif binutils
+@endif dejagnu
 
-.PHONY: maybe-dvi-binutils dvi-binutils
-maybe-dvi-binutils:
-@if binutils
-maybe-dvi-binutils: dvi-binutils
+.PHONY: maybe-dvi-dejagnu dvi-dejagnu
+maybe-dvi-dejagnu:
+@if dejagnu
+maybe-dvi-dejagnu: dvi-dejagnu
 
-dvi-binutils: \
-    configure-binutils 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+dvi-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 dvi in binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
@@ -7758,24 +6534,25 @@ dvi-binutils: \
                  dvi) \
          || exit 1
 
-@endif binutils
+@endif dejagnu
 
-.PHONY: maybe-pdf-binutils pdf-binutils
-maybe-pdf-binutils:
-@if binutils
-maybe-pdf-binutils: pdf-binutils
+.PHONY: maybe-pdf-dejagnu pdf-dejagnu
+maybe-pdf-dejagnu:
+@if dejagnu
+maybe-pdf-dejagnu: pdf-dejagnu
 
-pdf-binutils: \
-    configure-binutils 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+pdf-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 pdf in binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
@@ -7783,24 +6560,25 @@ pdf-binutils: \
                  pdf) \
          || exit 1
 
-@endif binutils
+@endif dejagnu
 
-.PHONY: maybe-html-binutils html-binutils
-maybe-html-binutils:
-@if binutils
-maybe-html-binutils: html-binutils
+.PHONY: maybe-html-dejagnu html-dejagnu
+maybe-html-dejagnu:
+@if dejagnu
+maybe-html-dejagnu: html-dejagnu
 
-html-binutils: \
-    configure-binutils 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+html-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 html in binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
@@ -7808,24 +6586,25 @@ html-binutils: \
                  html) \
          || exit 1
 
-@endif binutils
+@endif dejagnu
 
-.PHONY: maybe-TAGS-binutils TAGS-binutils
-maybe-TAGS-binutils:
-@if binutils
-maybe-TAGS-binutils: TAGS-binutils
+.PHONY: maybe-TAGS-dejagnu TAGS-dejagnu
+maybe-TAGS-dejagnu:
+@if dejagnu
+maybe-TAGS-dejagnu: TAGS-dejagnu
 
-TAGS-binutils: \
-    configure-binutils 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+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 binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
@@ -7833,25 +6612,26 @@ TAGS-binutils: \
                  TAGS) \
          || exit 1
 
-@endif binutils
+@endif dejagnu
 
-.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-dejagnu install-info-dejagnu
+maybe-install-info-dejagnu:
+@if dejagnu
+maybe-install-info-dejagnu: install-info-dejagnu
 
-install-info-binutils: \
-    configure-binutils \
-    info-binutils 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+install-info-dejagnu: \
+    configure-dejagnu \
+    info-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 install-info in binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
@@ -7859,25 +6639,26 @@ install-info-binutils: \
                  install-info) \
          || exit 1
 
-@endif binutils
+@endif dejagnu
 
-.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-dejagnu install-pdf-dejagnu
+maybe-install-pdf-dejagnu:
+@if dejagnu
+maybe-install-pdf-dejagnu: install-pdf-dejagnu
 
-install-pdf-binutils: \
-    configure-binutils \
-    pdf-binutils 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+install-pdf-dejagnu: \
+    configure-dejagnu \
+    pdf-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 install-pdf in binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
@@ -7885,25 +6666,26 @@ install-pdf-binutils: \
                  install-pdf) \
          || exit 1
 
-@endif binutils
+@endif dejagnu
 
-.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-dejagnu install-html-dejagnu
+maybe-install-html-dejagnu:
+@if dejagnu
+maybe-install-html-dejagnu: install-html-dejagnu
 
-install-html-binutils: \
-    configure-binutils \
-    html-binutils 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+install-html-dejagnu: \
+    configure-dejagnu \
+    html-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 install-html in binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
@@ -7911,24 +6693,25 @@ install-html-binutils: \
                  install-html) \
          || exit 1
 
-@endif binutils
+@endif dejagnu
 
-.PHONY: maybe-installcheck-binutils installcheck-binutils
-maybe-installcheck-binutils:
-@if binutils
-maybe-installcheck-binutils: installcheck-binutils
+.PHONY: maybe-installcheck-dejagnu installcheck-dejagnu
+maybe-installcheck-dejagnu:
+@if dejagnu
+maybe-installcheck-dejagnu: installcheck-dejagnu
 
-installcheck-binutils: \
-    configure-binutils 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+installcheck-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 installcheck in binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
@@ -7936,23 +6719,24 @@ installcheck-binutils: \
                  installcheck) \
          || exit 1
 
-@endif binutils
+@endif dejagnu
 
-.PHONY: maybe-mostlyclean-binutils mostlyclean-binutils
-maybe-mostlyclean-binutils:
-@if binutils
-maybe-mostlyclean-binutils: mostlyclean-binutils
+.PHONY: maybe-mostlyclean-dejagnu mostlyclean-dejagnu
+maybe-mostlyclean-dejagnu:
+@if dejagnu
+maybe-mostlyclean-dejagnu: mostlyclean-dejagnu
 
-mostlyclean-binutils: 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+mostlyclean-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 mostlyclean in binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
@@ -7960,23 +6744,24 @@ mostlyclean-binutils:
                  mostlyclean) \
          || exit 1
 
-@endif binutils
+@endif dejagnu
 
-.PHONY: maybe-clean-binutils clean-binutils
-maybe-clean-binutils:
-@if binutils
-maybe-clean-binutils: clean-binutils
+.PHONY: maybe-clean-dejagnu clean-dejagnu
+maybe-clean-dejagnu:
+@if dejagnu
+maybe-clean-dejagnu: clean-dejagnu
 
-clean-binutils: 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+clean-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 clean in binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
@@ -7984,23 +6769,24 @@ clean-binutils:
                  clean) \
          || exit 1
 
-@endif binutils
+@endif dejagnu
 
-.PHONY: maybe-distclean-binutils distclean-binutils
-maybe-distclean-binutils:
-@if binutils
-maybe-distclean-binutils: distclean-binutils
+.PHONY: maybe-distclean-dejagnu distclean-dejagnu
+maybe-distclean-dejagnu:
+@if dejagnu
+maybe-distclean-dejagnu: distclean-dejagnu
 
-distclean-binutils: 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+distclean-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 distclean in binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
@@ -8008,23 +6794,24 @@ distclean-binutils:
                  distclean) \
          || exit 1
 
-@endif binutils
+@endif dejagnu
 
-.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-dejagnu maintainer-clean-dejagnu
+maybe-maintainer-clean-dejagnu:
+@if dejagnu
+maybe-maintainer-clean-dejagnu: maintainer-clean-dejagnu
 
-maintainer-clean-binutils: 
-       @[ -f ./binutils/Makefile ] || exit 0; \
+maintainer-clean-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 maintainer-clean in binutils" ; \
-       (cd $(HOST_SUBDIR)/binutils && \
+       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}" \
@@ -8032,131 +6819,128 @@ maintainer-clean-binutils:
                  maintainer-clean) \
          || exit 1
 
-@endif binutils
+@endif dejagnu
 
 
 
-.PHONY: configure-bison maybe-configure-bison
-maybe-configure-bison:
+.PHONY: configure-etc maybe-configure-etc
+maybe-configure-etc:
 @if gcc-bootstrap
-configure-bison: stage_current
+configure-etc: stage_current
 @endif gcc-bootstrap
-@if bison
-maybe-configure-bison: configure-bison
-configure-bison: 
+@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)/bison/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison ; \
+       test ! -f $(HOST_SUBDIR)/etc/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/etc ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/bison; \
-       cd "$(HOST_SUBDIR)/bison" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/etc; \
+       cd "$(HOST_SUBDIR)/etc" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/bison/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/etc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bison"; \
-       libsrcdir="$$s/bison"; \
+       srcdiroption="--srcdir=$${topdir}/etc"; \
+       libsrcdir="$$s/etc"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif bison
+@endif etc
 
 
 
 
 
-.PHONY: all-bison maybe-all-bison
-maybe-all-bison:
+.PHONY: all-etc maybe-all-etc
+maybe-all-etc:
 @if gcc-bootstrap
-all-bison: stage_current
+all-etc: stage_current
 @endif gcc-bootstrap
-@if bison
-TARGET-bison=all
-maybe-all-bison: all-bison
-all-bison: configure-bison
+@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)/bison && \
+       (cd $(HOST_SUBDIR)/etc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-bison))
-@endif bison
+               $(TARGET-etc))
+@endif etc
 
 
 
 
-.PHONY: check-bison maybe-check-bison
-maybe-check-bison:
-@if bison
-maybe-check-bison: check-bison
+.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-bison:
+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)/bison && \
-           $(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 bison
+@endif etc
 
-.PHONY: install-bison maybe-install-bison
-maybe-install-bison:
-@if bison
-maybe-install-bison: install-bison
+.PHONY: install-etc maybe-install-etc
+maybe-install-etc:
+@if etc
+maybe-install-etc: install-etc
 
-install-bison: installdirs
+install-etc: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/bison && \
+       (cd $(HOST_SUBDIR)/etc && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif bison
+@endif etc
 
-.PHONY: install-strip-bison maybe-install-strip-bison
-maybe-install-strip-bison:
-@if bison
-maybe-install-strip-bison: install-strip-bison
+.PHONY: install-strip-etc maybe-install-strip-etc
+maybe-install-strip-etc:
+@if etc
+maybe-install-strip-etc: install-strip-etc
 
-install-strip-bison: installdirs
+install-strip-etc: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/bison && \
+       (cd $(HOST_SUBDIR)/etc && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif bison
+@endif etc
 
 # 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-etc info-etc
+maybe-info-etc:
+@if etc
+maybe-info-etc: info-etc
 
-info-bison: \
-    configure-bison 
+info-etc: \
+    configure-etc 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
@@ -8164,25 +6948,25 @@ info-bison: \
                  info) \
          || exit 1
 
-@endif bison
+@endif etc
 
-.PHONY: maybe-dvi-bison dvi-bison
-maybe-dvi-bison:
-@if bison
-maybe-dvi-bison: dvi-bison
+.PHONY: maybe-dvi-etc dvi-etc
+maybe-dvi-etc:
+@if etc
+maybe-dvi-etc: dvi-etc
 
-dvi-bison: \
-    configure-bison 
+dvi-etc: \
+    configure-etc 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
@@ -8190,25 +6974,25 @@ dvi-bison: \
                  dvi) \
          || exit 1
 
-@endif bison
+@endif etc
 
-.PHONY: maybe-pdf-bison pdf-bison
-maybe-pdf-bison:
-@if bison
-maybe-pdf-bison: pdf-bison
+.PHONY: maybe-pdf-etc pdf-etc
+maybe-pdf-etc:
+@if etc
+maybe-pdf-etc: pdf-etc
 
-pdf-bison: \
-    configure-bison 
+pdf-etc: \
+    configure-etc 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
@@ -8216,25 +7000,25 @@ pdf-bison: \
                  pdf) \
          || exit 1
 
-@endif bison
+@endif etc
 
-.PHONY: maybe-html-bison html-bison
-maybe-html-bison:
-@if bison
-maybe-html-bison: html-bison
+.PHONY: maybe-html-etc html-etc
+maybe-html-etc:
+@if etc
+maybe-html-etc: html-etc
 
-html-bison: \
-    configure-bison 
+html-etc: \
+    configure-etc 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
@@ -8242,25 +7026,25 @@ html-bison: \
                  html) \
          || exit 1
 
-@endif bison
+@endif etc
 
-.PHONY: maybe-TAGS-bison TAGS-bison
-maybe-TAGS-bison:
-@if bison
-maybe-TAGS-bison: TAGS-bison
+.PHONY: maybe-TAGS-etc TAGS-etc
+maybe-TAGS-etc:
+@if etc
+maybe-TAGS-etc: TAGS-etc
 
-TAGS-bison: \
-    configure-bison 
+TAGS-etc: \
+    configure-etc 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
@@ -8268,26 +7052,26 @@ TAGS-bison: \
                  TAGS) \
          || exit 1
 
-@endif bison
+@endif etc
 
-.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-etc install-info-etc
+maybe-install-info-etc:
+@if etc
+maybe-install-info-etc: install-info-etc
 
-install-info-bison: \
-    configure-bison \
-    info-bison 
+install-info-etc: \
+    configure-etc \
+    info-etc 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
@@ -8295,26 +7079,26 @@ install-info-bison: \
                  install-info) \
          || exit 1
 
-@endif bison
+@endif etc
 
-.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-etc install-pdf-etc
+maybe-install-pdf-etc:
+@if etc
+maybe-install-pdf-etc: install-pdf-etc
 
-install-pdf-bison: \
-    configure-bison \
-    pdf-bison 
+install-pdf-etc: \
+    configure-etc \
+    pdf-etc 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
@@ -8322,26 +7106,26 @@ install-pdf-bison: \
                  install-pdf) \
          || exit 1
 
-@endif bison
+@endif etc
 
-.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-etc install-html-etc
+maybe-install-html-etc:
+@if etc
+maybe-install-html-etc: install-html-etc
 
-install-html-bison: \
-    configure-bison \
-    html-bison 
+install-html-etc: \
+    configure-etc \
+    html-etc 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
@@ -8349,25 +7133,25 @@ install-html-bison: \
                  install-html) \
          || exit 1
 
-@endif bison
+@endif etc
 
-.PHONY: maybe-installcheck-bison installcheck-bison
-maybe-installcheck-bison:
-@if bison
-maybe-installcheck-bison: installcheck-bison
+.PHONY: maybe-installcheck-etc installcheck-etc
+maybe-installcheck-etc:
+@if etc
+maybe-installcheck-etc: installcheck-etc
 
-installcheck-bison: \
-    configure-bison 
+installcheck-etc: \
+    configure-etc 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
@@ -8375,24 +7159,24 @@ installcheck-bison: \
                  installcheck) \
          || exit 1
 
-@endif bison
+@endif etc
 
-.PHONY: maybe-mostlyclean-bison mostlyclean-bison
-maybe-mostlyclean-bison:
-@if bison
-maybe-mostlyclean-bison: mostlyclean-bison
+.PHONY: maybe-mostlyclean-etc mostlyclean-etc
+maybe-mostlyclean-etc:
+@if etc
+maybe-mostlyclean-etc: mostlyclean-etc
 
-mostlyclean-bison: 
+mostlyclean-etc: 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
@@ -8400,24 +7184,24 @@ mostlyclean-bison:
                  mostlyclean) \
          || exit 1
 
-@endif bison
+@endif etc
 
-.PHONY: maybe-clean-bison clean-bison
-maybe-clean-bison:
-@if bison
-maybe-clean-bison: clean-bison
+.PHONY: maybe-clean-etc clean-etc
+maybe-clean-etc:
+@if etc
+maybe-clean-etc: clean-etc
 
-clean-bison: 
+clean-etc: 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/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 clean in bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
@@ -8425,24 +7209,24 @@ clean-bison:
                  clean) \
          || exit 1
 
-@endif bison
+@endif etc
 
-.PHONY: maybe-distclean-bison distclean-bison
-maybe-distclean-bison:
-@if bison
-maybe-distclean-bison: distclean-bison
+.PHONY: maybe-distclean-etc distclean-etc
+maybe-distclean-etc:
+@if etc
+maybe-distclean-etc: distclean-etc
 
-distclean-bison: 
+distclean-etc: 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
@@ -8450,24 +7234,24 @@ distclean-bison:
                  distclean) \
          || exit 1
 
-@endif bison
+@endif etc
 
-.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-etc maintainer-clean-etc
+maybe-maintainer-clean-etc:
+@if etc
+maybe-maintainer-clean-etc: maintainer-clean-etc
 
-maintainer-clean-bison: 
+maintainer-clean-etc: 
        @: $(MAKE); $(unstage)
-       @[ -f ./bison/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 bison" ; \
-       (cd $(HOST_SUBDIR)/bison && \
+       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}" \
@@ -8475,131 +7259,131 @@ maintainer-clean-bison:
                  maintainer-clean) \
          || exit 1
 
-@endif bison
+@endif etc
 
 
 
-.PHONY: configure-byacc maybe-configure-byacc
-maybe-configure-byacc:
+.PHONY: configure-fastjar maybe-configure-fastjar
+maybe-configure-fastjar:
 @if gcc-bootstrap
-configure-byacc: stage_current
+configure-fastjar: stage_current
 @endif gcc-bootstrap
-@if byacc
-maybe-configure-byacc: configure-byacc
-configure-byacc: 
+@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)/byacc/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/byacc ; \
+       test ! -f $(HOST_SUBDIR)/fastjar/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fastjar ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/byacc; \
-       cd "$(HOST_SUBDIR)/byacc" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/fastjar; \
+       cd "$(HOST_SUBDIR)/fastjar" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/byacc/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/fastjar/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/byacc"; \
-       libsrcdir="$$s/byacc"; \
+       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 byacc
+@endif fastjar
 
 
 
 
 
-.PHONY: all-byacc maybe-all-byacc
-maybe-all-byacc:
+.PHONY: all-fastjar maybe-all-fastjar
+maybe-all-fastjar:
 @if gcc-bootstrap
-all-byacc: stage_current
+all-fastjar: stage_current
 @endif gcc-bootstrap
-@if byacc
-TARGET-byacc=all
-maybe-all-byacc: all-byacc
-all-byacc: configure-byacc
+@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)/byacc && \
+       (cd $(HOST_SUBDIR)/fastjar && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-byacc))
-@endif byacc
+               $(TARGET-fastjar))
+@endif fastjar
 
 
 
 
-.PHONY: check-byacc maybe-check-byacc
-maybe-check-byacc:
-@if byacc
-maybe-check-byacc: check-byacc
+.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-byacc:
+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)/byacc && \
+         (cd $(HOST_SUBDIR)/fastjar && \
            $(MAKE) $(FLAGS_TO_PASS)  check); \
        fi
 
-@endif byacc
+@endif fastjar
 
-.PHONY: install-byacc maybe-install-byacc
-maybe-install-byacc:
-@if byacc
-maybe-install-byacc: install-byacc
+.PHONY: install-fastjar maybe-install-fastjar
+maybe-install-fastjar:
+@if fastjar
+maybe-install-fastjar: install-fastjar
 
-install-byacc: installdirs
+install-fastjar: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/byacc && \
+       (cd $(HOST_SUBDIR)/fastjar && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif byacc
+@endif fastjar
 
-.PHONY: install-strip-byacc maybe-install-strip-byacc
-maybe-install-strip-byacc:
-@if byacc
-maybe-install-strip-byacc: install-strip-byacc
+.PHONY: install-strip-fastjar maybe-install-strip-fastjar
+maybe-install-strip-fastjar:
+@if fastjar
+maybe-install-strip-fastjar: install-strip-fastjar
 
-install-strip-byacc: installdirs
+install-strip-fastjar: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/byacc && \
+       (cd $(HOST_SUBDIR)/fastjar && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif byacc
+@endif fastjar
 
 # 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-fastjar info-fastjar
+maybe-info-fastjar:
+@if fastjar
+maybe-info-fastjar: info-fastjar
 
-info-byacc: \
-    configure-byacc 
+info-fastjar: \
+    configure-fastjar 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
@@ -8607,25 +7391,25 @@ info-byacc: \
                  info) \
          || exit 1
 
-@endif byacc
+@endif fastjar
 
-.PHONY: maybe-dvi-byacc dvi-byacc
-maybe-dvi-byacc:
-@if byacc
-maybe-dvi-byacc: dvi-byacc
+.PHONY: maybe-dvi-fastjar dvi-fastjar
+maybe-dvi-fastjar:
+@if fastjar
+maybe-dvi-fastjar: dvi-fastjar
 
-dvi-byacc: \
-    configure-byacc 
+dvi-fastjar: \
+    configure-fastjar 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
@@ -8633,25 +7417,25 @@ dvi-byacc: \
                  dvi) \
          || exit 1
 
-@endif byacc
+@endif fastjar
 
-.PHONY: maybe-pdf-byacc pdf-byacc
-maybe-pdf-byacc:
-@if byacc
-maybe-pdf-byacc: pdf-byacc
+.PHONY: maybe-pdf-fastjar pdf-fastjar
+maybe-pdf-fastjar:
+@if fastjar
+maybe-pdf-fastjar: pdf-fastjar
 
-pdf-byacc: \
-    configure-byacc 
+pdf-fastjar: \
+    configure-fastjar 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
@@ -8659,25 +7443,25 @@ pdf-byacc: \
                  pdf) \
          || exit 1
 
-@endif byacc
+@endif fastjar
 
-.PHONY: maybe-html-byacc html-byacc
-maybe-html-byacc:
-@if byacc
-maybe-html-byacc: html-byacc
+.PHONY: maybe-html-fastjar html-fastjar
+maybe-html-fastjar:
+@if fastjar
+maybe-html-fastjar: html-fastjar
 
-html-byacc: \
-    configure-byacc 
+html-fastjar: \
+    configure-fastjar 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
@@ -8685,25 +7469,25 @@ html-byacc: \
                  html) \
          || exit 1
 
-@endif byacc
+@endif fastjar
 
-.PHONY: maybe-TAGS-byacc TAGS-byacc
-maybe-TAGS-byacc:
-@if byacc
-maybe-TAGS-byacc: TAGS-byacc
+.PHONY: maybe-TAGS-fastjar TAGS-fastjar
+maybe-TAGS-fastjar:
+@if fastjar
+maybe-TAGS-fastjar: TAGS-fastjar
 
-TAGS-byacc: \
-    configure-byacc 
+TAGS-fastjar: \
+    configure-fastjar 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
@@ -8711,26 +7495,26 @@ TAGS-byacc: \
                  TAGS) \
          || exit 1
 
-@endif byacc
+@endif fastjar
 
-.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-fastjar install-info-fastjar
+maybe-install-info-fastjar:
+@if fastjar
+maybe-install-info-fastjar: install-info-fastjar
 
-install-info-byacc: \
-    configure-byacc \
-    info-byacc 
+install-info-fastjar: \
+    configure-fastjar \
+    info-fastjar 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
@@ -8738,26 +7522,26 @@ install-info-byacc: \
                  install-info) \
          || exit 1
 
-@endif byacc
+@endif fastjar
 
-.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-fastjar install-pdf-fastjar
+maybe-install-pdf-fastjar:
+@if fastjar
+maybe-install-pdf-fastjar: install-pdf-fastjar
 
-install-pdf-byacc: \
-    configure-byacc \
-    pdf-byacc 
+install-pdf-fastjar: \
+    configure-fastjar \
+    pdf-fastjar 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
@@ -8765,26 +7549,26 @@ install-pdf-byacc: \
                  install-pdf) \
          || exit 1
 
-@endif byacc
+@endif fastjar
 
-.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-fastjar install-html-fastjar
+maybe-install-html-fastjar:
+@if fastjar
+maybe-install-html-fastjar: install-html-fastjar
 
-install-html-byacc: \
-    configure-byacc \
-    html-byacc 
+install-html-fastjar: \
+    configure-fastjar \
+    html-fastjar 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
@@ -8792,25 +7576,25 @@ install-html-byacc: \
                  install-html) \
          || exit 1
 
-@endif byacc
+@endif fastjar
 
-.PHONY: maybe-installcheck-byacc installcheck-byacc
-maybe-installcheck-byacc:
-@if byacc
-maybe-installcheck-byacc: installcheck-byacc
+.PHONY: maybe-installcheck-fastjar installcheck-fastjar
+maybe-installcheck-fastjar:
+@if fastjar
+maybe-installcheck-fastjar: installcheck-fastjar
 
-installcheck-byacc: \
-    configure-byacc 
+installcheck-fastjar: \
+    configure-fastjar 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
@@ -8818,24 +7602,24 @@ installcheck-byacc: \
                  installcheck) \
          || exit 1
 
-@endif byacc
+@endif fastjar
 
-.PHONY: maybe-mostlyclean-byacc mostlyclean-byacc
-maybe-mostlyclean-byacc:
-@if byacc
-maybe-mostlyclean-byacc: mostlyclean-byacc
+.PHONY: maybe-mostlyclean-fastjar mostlyclean-fastjar
+maybe-mostlyclean-fastjar:
+@if fastjar
+maybe-mostlyclean-fastjar: mostlyclean-fastjar
 
-mostlyclean-byacc: 
+mostlyclean-fastjar: 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
@@ -8843,24 +7627,24 @@ mostlyclean-byacc:
                  mostlyclean) \
          || exit 1
 
-@endif byacc
+@endif fastjar
 
-.PHONY: maybe-clean-byacc clean-byacc
-maybe-clean-byacc:
-@if byacc
-maybe-clean-byacc: clean-byacc
+.PHONY: maybe-clean-fastjar clean-fastjar
+maybe-clean-fastjar:
+@if fastjar
+maybe-clean-fastjar: clean-fastjar
 
-clean-byacc: 
+clean-fastjar: 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
@@ -8868,24 +7652,24 @@ clean-byacc:
                  clean) \
          || exit 1
 
-@endif byacc
+@endif fastjar
 
-.PHONY: maybe-distclean-byacc distclean-byacc
-maybe-distclean-byacc:
-@if byacc
-maybe-distclean-byacc: distclean-byacc
+.PHONY: maybe-distclean-fastjar distclean-fastjar
+maybe-distclean-fastjar:
+@if fastjar
+maybe-distclean-fastjar: distclean-fastjar
 
-distclean-byacc: 
+distclean-fastjar: 
        @: $(MAKE); $(unstage)
-       @[ -f ./byacc/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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
@@ -8893,24 +7677,24 @@ distclean-byacc:
                  distclean) \
          || exit 1
 
-@endif byacc
-
-.PHONY: maybe-maintainer-clean-byacc maintainer-clean-byacc
-maybe-maintainer-clean-byacc:
-@if byacc
-maybe-maintainer-clean-byacc: maintainer-clean-byacc
+@endif fastjar
 
-maintainer-clean-byacc: 
+.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 ./byacc/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 byacc" ; \
-       (cd $(HOST_SUBDIR)/byacc && \
+       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}" \
@@ -8918,128 +7702,128 @@ maintainer-clean-byacc:
                  maintainer-clean) \
          || exit 1
 
-@endif byacc
+@endif fastjar
 
 
 
-.PHONY: configure-bzip2 maybe-configure-bzip2
-maybe-configure-bzip2:
+.PHONY: configure-fixincludes maybe-configure-fixincludes
+maybe-configure-fixincludes:
 @if gcc-bootstrap
-configure-bzip2: stage_current
+configure-fixincludes: stage_current
 @endif gcc-bootstrap
-@if bzip2
-maybe-configure-bzip2: configure-bzip2
-configure-bzip2: 
+@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)/bzip2/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bzip2 ; \
+       test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/bzip2; \
-       cd "$(HOST_SUBDIR)/bzip2" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/fixincludes; \
+       cd "$(HOST_SUBDIR)/fixincludes" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/bzip2/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bzip2"; \
-       libsrcdir="$$s/bzip2"; \
+       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 bzip2
+@endif fixincludes
 
 
 
 
 
-.PHONY: all-bzip2 maybe-all-bzip2
-maybe-all-bzip2:
+.PHONY: all-fixincludes maybe-all-fixincludes
+maybe-all-fixincludes:
 @if gcc-bootstrap
-all-bzip2: stage_current
+all-fixincludes: stage_current
 @endif gcc-bootstrap
-@if bzip2
-TARGET-bzip2=all
-maybe-all-bzip2: all-bzip2
-all-bzip2: configure-bzip2
+@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)/bzip2 && \
+       (cd $(HOST_SUBDIR)/fixincludes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-bzip2))
-@endif bzip2
+               $(TARGET-fixincludes))
+@endif fixincludes
 
 
 
 
-.PHONY: check-bzip2 maybe-check-bzip2
-maybe-check-bzip2:
-@if bzip2
-maybe-check-bzip2: check-bzip2
+.PHONY: check-fixincludes maybe-check-fixincludes
+maybe-check-fixincludes:
+@if fixincludes
+maybe-check-fixincludes: check-fixincludes
 
-check-bzip2:
+check-fixincludes:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       (cd $(HOST_SUBDIR)/fixincludes && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif bzip2
+@endif fixincludes
 
-.PHONY: install-bzip2 maybe-install-bzip2
-maybe-install-bzip2:
-@if bzip2
-maybe-install-bzip2: install-bzip2
+.PHONY: install-fixincludes maybe-install-fixincludes
+maybe-install-fixincludes:
+@if fixincludes
+maybe-install-fixincludes: install-fixincludes
 
-install-bzip2: installdirs
+install-fixincludes: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       (cd $(HOST_SUBDIR)/fixincludes && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif bzip2
+@endif fixincludes
 
-.PHONY: install-strip-bzip2 maybe-install-strip-bzip2
-maybe-install-strip-bzip2:
-@if bzip2
-maybe-install-strip-bzip2: install-strip-bzip2
+.PHONY: install-strip-fixincludes maybe-install-strip-fixincludes
+maybe-install-strip-fixincludes:
+@if fixincludes
+maybe-install-strip-fixincludes: install-strip-fixincludes
 
-install-strip-bzip2: installdirs
+install-strip-fixincludes: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       (cd $(HOST_SUBDIR)/fixincludes && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif bzip2
+@endif fixincludes
 
 # 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-fixincludes info-fixincludes
+maybe-info-fixincludes:
+@if fixincludes
+maybe-info-fixincludes: info-fixincludes
 
-info-bzip2: \
-    configure-bzip2 
+info-fixincludes: \
+    configure-fixincludes 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
@@ -9047,25 +7831,25 @@ info-bzip2: \
                  info) \
          || exit 1
 
-@endif bzip2
+@endif fixincludes
 
-.PHONY: maybe-dvi-bzip2 dvi-bzip2
-maybe-dvi-bzip2:
-@if bzip2
-maybe-dvi-bzip2: dvi-bzip2
+.PHONY: maybe-dvi-fixincludes dvi-fixincludes
+maybe-dvi-fixincludes:
+@if fixincludes
+maybe-dvi-fixincludes: dvi-fixincludes
 
-dvi-bzip2: \
-    configure-bzip2 
+dvi-fixincludes: \
+    configure-fixincludes 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
@@ -9073,25 +7857,25 @@ dvi-bzip2: \
                  dvi) \
          || exit 1
 
-@endif bzip2
+@endif fixincludes
 
-.PHONY: maybe-pdf-bzip2 pdf-bzip2
-maybe-pdf-bzip2:
-@if bzip2
-maybe-pdf-bzip2: pdf-bzip2
+.PHONY: maybe-pdf-fixincludes pdf-fixincludes
+maybe-pdf-fixincludes:
+@if fixincludes
+maybe-pdf-fixincludes: pdf-fixincludes
 
-pdf-bzip2: \
-    configure-bzip2 
+pdf-fixincludes: \
+    configure-fixincludes 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
@@ -9099,25 +7883,25 @@ pdf-bzip2: \
                  pdf) \
          || exit 1
 
-@endif bzip2
+@endif fixincludes
 
-.PHONY: maybe-html-bzip2 html-bzip2
-maybe-html-bzip2:
-@if bzip2
-maybe-html-bzip2: html-bzip2
+.PHONY: maybe-html-fixincludes html-fixincludes
+maybe-html-fixincludes:
+@if fixincludes
+maybe-html-fixincludes: html-fixincludes
 
-html-bzip2: \
-    configure-bzip2 
+html-fixincludes: \
+    configure-fixincludes 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
@@ -9125,52 +7909,36 @@ html-bzip2: \
                  html) \
          || exit 1
 
-@endif bzip2
+@endif fixincludes
 
-.PHONY: maybe-TAGS-bzip2 TAGS-bzip2
-maybe-TAGS-bzip2:
-@if bzip2
-maybe-TAGS-bzip2: TAGS-bzip2
+.PHONY: maybe-TAGS-fixincludes TAGS-fixincludes
+maybe-TAGS-fixincludes:
+@if fixincludes
+maybe-TAGS-fixincludes: TAGS-fixincludes
 
-TAGS-bzip2: \
-    configure-bzip2 
-       @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 bzip2
+@endif fixincludes
 
-.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-fixincludes install-info-fixincludes
+maybe-install-info-fixincludes:
+@if fixincludes
+maybe-install-info-fixincludes: install-info-fixincludes
 
-install-info-bzip2: \
-    configure-bzip2 \
-    info-bzip2 
+install-info-fixincludes: \
+    configure-fixincludes \
+    info-fixincludes 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
@@ -9178,26 +7946,26 @@ install-info-bzip2: \
                  install-info) \
          || exit 1
 
-@endif bzip2
+@endif fixincludes
 
-.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-fixincludes install-pdf-fixincludes
+maybe-install-pdf-fixincludes:
+@if fixincludes
+maybe-install-pdf-fixincludes: install-pdf-fixincludes
 
-install-pdf-bzip2: \
-    configure-bzip2 \
-    pdf-bzip2 
+install-pdf-fixincludes: \
+    configure-fixincludes \
+    pdf-fixincludes 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
@@ -9205,26 +7973,26 @@ install-pdf-bzip2: \
                  install-pdf) \
          || exit 1
 
-@endif bzip2
+@endif fixincludes
 
-.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-fixincludes install-html-fixincludes
+maybe-install-html-fixincludes:
+@if fixincludes
+maybe-install-html-fixincludes: install-html-fixincludes
 
-install-html-bzip2: \
-    configure-bzip2 \
-    html-bzip2 
+install-html-fixincludes: \
+    configure-fixincludes \
+    html-fixincludes 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
@@ -9232,25 +8000,25 @@ install-html-bzip2: \
                  install-html) \
          || exit 1
 
-@endif bzip2
+@endif fixincludes
 
-.PHONY: maybe-installcheck-bzip2 installcheck-bzip2
-maybe-installcheck-bzip2:
-@if bzip2
-maybe-installcheck-bzip2: installcheck-bzip2
+.PHONY: maybe-installcheck-fixincludes installcheck-fixincludes
+maybe-installcheck-fixincludes:
+@if fixincludes
+maybe-installcheck-fixincludes: installcheck-fixincludes
 
-installcheck-bzip2: \
-    configure-bzip2 
+installcheck-fixincludes: \
+    configure-fixincludes 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
@@ -9258,24 +8026,24 @@ installcheck-bzip2: \
                  installcheck) \
          || exit 1
 
-@endif bzip2
+@endif fixincludes
 
-.PHONY: maybe-mostlyclean-bzip2 mostlyclean-bzip2
-maybe-mostlyclean-bzip2:
-@if bzip2
-maybe-mostlyclean-bzip2: mostlyclean-bzip2
+.PHONY: maybe-mostlyclean-fixincludes mostlyclean-fixincludes
+maybe-mostlyclean-fixincludes:
+@if fixincludes
+maybe-mostlyclean-fixincludes: mostlyclean-fixincludes
 
-mostlyclean-bzip2: 
+mostlyclean-fixincludes: 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
@@ -9283,24 +8051,24 @@ mostlyclean-bzip2:
                  mostlyclean) \
          || exit 1
 
-@endif bzip2
+@endif fixincludes
 
-.PHONY: maybe-clean-bzip2 clean-bzip2
-maybe-clean-bzip2:
-@if bzip2
-maybe-clean-bzip2: clean-bzip2
+.PHONY: maybe-clean-fixincludes clean-fixincludes
+maybe-clean-fixincludes:
+@if fixincludes
+maybe-clean-fixincludes: clean-fixincludes
 
-clean-bzip2: 
+clean-fixincludes: 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
@@ -9308,24 +8076,24 @@ clean-bzip2:
                  clean) \
          || exit 1
 
-@endif bzip2
+@endif fixincludes
 
-.PHONY: maybe-distclean-bzip2 distclean-bzip2
-maybe-distclean-bzip2:
-@if bzip2
-maybe-distclean-bzip2: distclean-bzip2
+.PHONY: maybe-distclean-fixincludes distclean-fixincludes
+maybe-distclean-fixincludes:
+@if fixincludes
+maybe-distclean-fixincludes: distclean-fixincludes
 
-distclean-bzip2: 
+distclean-fixincludes: 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
@@ -9333,24 +8101,24 @@ distclean-bzip2:
                  distclean) \
          || exit 1
 
-@endif bzip2
+@endif fixincludes
 
-.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-fixincludes maintainer-clean-fixincludes
+maybe-maintainer-clean-fixincludes:
+@if fixincludes
+maybe-maintainer-clean-fixincludes: maintainer-clean-fixincludes
 
-maintainer-clean-bzip2: 
+maintainer-clean-fixincludes: 
        @: $(MAKE); $(unstage)
-       @[ -f ./bzip2/Makefile ] || exit 0; \
+       @[ -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 bzip2" ; \
-       (cd $(HOST_SUBDIR)/bzip2 && \
+       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}" \
@@ -9358,128 +8126,131 @@ maintainer-clean-bzip2:
                  maintainer-clean) \
          || exit 1
 
-@endif bzip2
+@endif fixincludes
 
 
 
-.PHONY: configure-cgen maybe-configure-cgen
-maybe-configure-cgen:
+.PHONY: configure-flex maybe-configure-flex
+maybe-configure-flex:
 @if gcc-bootstrap
-configure-cgen: stage_current
+configure-flex: stage_current
 @endif gcc-bootstrap
-@if cgen
-maybe-configure-cgen: configure-cgen
-configure-cgen: 
+@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)/cgen/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cgen ; \
+       test ! -f $(HOST_SUBDIR)/flex/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/flex ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/cgen; \
-       cd "$(HOST_SUBDIR)/cgen" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/flex; \
+       cd "$(HOST_SUBDIR)/flex" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/cgen/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/flex/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/cgen"; \
-       libsrcdir="$$s/cgen"; \
+       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 cgen
+@endif flex
 
 
 
 
 
-.PHONY: all-cgen maybe-all-cgen
-maybe-all-cgen:
+.PHONY: all-flex maybe-all-flex
+maybe-all-flex:
 @if gcc-bootstrap
-all-cgen: stage_current
+all-flex: stage_current
 @endif gcc-bootstrap
-@if cgen
-TARGET-cgen=all
-maybe-all-cgen: all-cgen
-all-cgen: configure-cgen
+@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)/cgen && \
+       (cd $(HOST_SUBDIR)/flex && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-cgen))
-@endif cgen
+               $(TARGET-flex))
+@endif flex
 
 
 
 
-.PHONY: check-cgen maybe-check-cgen
-maybe-check-cgen:
-@if cgen
-maybe-check-cgen: check-cgen
+.PHONY: check-flex maybe-check-flex
+maybe-check-flex:
+@if flex
+maybe-check-flex: check-flex
 
-check-cgen:
+# This module is only tested in a native toolchain.
+check-flex:
        @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/cgen && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       @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 cgen
+@endif flex
 
-.PHONY: install-cgen maybe-install-cgen
-maybe-install-cgen:
-@if cgen
-maybe-install-cgen: install-cgen
+.PHONY: install-flex maybe-install-flex
+maybe-install-flex:
+@if flex
+maybe-install-flex: install-flex
 
-install-cgen: installdirs
+install-flex: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/cgen && \
+       (cd $(HOST_SUBDIR)/flex && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif cgen
+@endif flex
 
-.PHONY: install-strip-cgen maybe-install-strip-cgen
-maybe-install-strip-cgen:
-@if cgen
-maybe-install-strip-cgen: install-strip-cgen
+.PHONY: install-strip-flex maybe-install-strip-flex
+maybe-install-strip-flex:
+@if flex
+maybe-install-strip-flex: install-strip-flex
 
-install-strip-cgen: installdirs
+install-strip-flex: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/cgen && \
+       (cd $(HOST_SUBDIR)/flex && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif cgen
+@endif flex
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-cgen info-cgen
-maybe-info-cgen:
-@if cgen
-maybe-info-cgen: info-cgen
+.PHONY: maybe-info-flex info-flex
+maybe-info-flex:
+@if flex
+maybe-info-flex: info-flex
 
-info-cgen: \
-    configure-cgen 
+info-flex: \
+    configure-flex 
        @: $(MAKE); $(unstage)
-       @[ -f ./cgen/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 cgen" ; \
-       (cd $(HOST_SUBDIR)/cgen && \
+       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}" \
@@ -9487,25 +8258,25 @@ info-cgen: \
                  info) \
          || exit 1
 
-@endif cgen
+@endif flex
 
-.PHONY: maybe-dvi-cgen dvi-cgen
-maybe-dvi-cgen:
-@if cgen
-maybe-dvi-cgen: dvi-cgen
+.PHONY: maybe-dvi-flex dvi-flex
+maybe-dvi-flex:
+@if flex
+maybe-dvi-flex: dvi-flex
 
-dvi-cgen: \
-    configure-cgen 
+dvi-flex: \
+    configure-flex 
        @: $(MAKE); $(unstage)
-       @[ -f ./cgen/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 cgen" ; \
-       (cd $(HOST_SUBDIR)/cgen && \
+       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}" \
@@ -9513,25 +8284,25 @@ dvi-cgen: \
                  dvi) \
          || exit 1
 
-@endif cgen
+@endif flex
 
-.PHONY: maybe-pdf-cgen pdf-cgen
-maybe-pdf-cgen:
-@if cgen
-maybe-pdf-cgen: pdf-cgen
+.PHONY: maybe-pdf-flex pdf-flex
+maybe-pdf-flex:
+@if flex
+maybe-pdf-flex: pdf-flex
 
-pdf-cgen: \
-    configure-cgen 
+pdf-flex: \
+    configure-flex 
        @: $(MAKE); $(unstage)
-       @[ -f ./cgen/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 cgen" ; \
-       (cd $(HOST_SUBDIR)/cgen && \
+       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}" \
@@ -9539,25 +8310,25 @@ pdf-cgen: \
                  pdf) \
          || exit 1
 
-@endif cgen
+@endif flex
 
-.PHONY: maybe-html-cgen html-cgen
-maybe-html-cgen:
-@if cgen
-maybe-html-cgen: html-cgen
+.PHONY: maybe-html-flex html-flex
+maybe-html-flex:
+@if flex
+maybe-html-flex: html-flex
 
-html-cgen: \
-    configure-cgen 
+html-flex: \
+    configure-flex 
        @: $(MAKE); $(unstage)
-       @[ -f ./cgen/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 cgen" ; \
-       (cd $(HOST_SUBDIR)/cgen && \
+       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}" \
@@ -9565,25 +8336,25 @@ html-cgen: \
                  html) \
          || exit 1
 
-@endif cgen
+@endif flex
 
-.PHONY: maybe-TAGS-cgen TAGS-cgen
-maybe-TAGS-cgen:
-@if cgen
-maybe-TAGS-cgen: TAGS-cgen
+.PHONY: maybe-TAGS-flex TAGS-flex
+maybe-TAGS-flex:
+@if flex
+maybe-TAGS-flex: TAGS-flex
 
-TAGS-cgen: \
-    configure-cgen 
+TAGS-flex: \
+    configure-flex 
        @: $(MAKE); $(unstage)
-       @[ -f ./cgen/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 cgen" ; \
-       (cd $(HOST_SUBDIR)/cgen && \
+       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}" \
@@ -9591,26 +8362,26 @@ TAGS-cgen: \
                  TAGS) \
          || exit 1
 
-@endif cgen
+@endif flex
 
-.PHONY: maybe-install-info-cgen install-info-cgen
-maybe-install-info-cgen:
-@if cgen
-maybe-install-info-cgen: install-info-cgen
+.PHONY: maybe-install-info-flex install-info-flex
+maybe-install-info-flex:
+@if flex
+maybe-install-info-flex: install-info-flex
 
-install-info-cgen: \
-    configure-cgen \
-    info-cgen 
+install-info-flex: \
+    configure-flex \
+    info-flex 
        @: $(MAKE); $(unstage)
-       @[ -f ./cgen/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 cgen" ; \
-       (cd $(HOST_SUBDIR)/cgen && \
+       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}" \
@@ -9618,26 +8389,26 @@ install-info-cgen: \
                  install-info) \
          || exit 1
 
-@endif cgen
+@endif flex
 
-.PHONY: maybe-install-pdf-cgen install-pdf-cgen
-maybe-install-pdf-cgen:
-@if cgen
-maybe-install-pdf-cgen: install-pdf-cgen
+.PHONY: maybe-install-pdf-flex install-pdf-flex
+maybe-install-pdf-flex:
+@if flex
+maybe-install-pdf-flex: install-pdf-flex
 
-install-pdf-cgen: \
-    configure-cgen \
-    pdf-cgen 
+install-pdf-flex: \
+    configure-flex \
+    pdf-flex 
        @: $(MAKE); $(unstage)
-       @[ -f ./cgen/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 cgen" ; \
-       (cd $(HOST_SUBDIR)/cgen && \
+       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}" \
@@ -9645,26 +8416,26 @@ install-pdf-cgen: \
                  install-pdf) \
          || exit 1
 
-@endif cgen
+@endif flex
 
-.PHONY: maybe-install-html-cgen install-html-cgen
-maybe-install-html-cgen:
-@if cgen
-maybe-install-html-cgen: install-html-cgen
+.PHONY: maybe-install-html-flex install-html-flex
+maybe-install-html-flex:
+@if flex
+maybe-install-html-flex: install-html-flex
 
-install-html-cgen: \
-    configure-cgen \
-    html-cgen 
+install-html-flex: \
+    configure-flex \
+    html-flex 
        @: $(MAKE); $(unstage)
-       @[ -f ./cgen/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 cgen" ; \
-       (cd $(HOST_SUBDIR)/cgen && \
+       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}" \
@@ -9672,25 +8443,25 @@ install-html-cgen: \
                  install-html) \
          || exit 1
 
-@endif cgen
+@endif flex
 
-.PHONY: maybe-installcheck-cgen installcheck-cgen
-maybe-installcheck-cgen:
-@if cgen
-maybe-installcheck-cgen: installcheck-cgen
+.PHONY: maybe-installcheck-flex installcheck-flex
+maybe-installcheck-flex:
+@if flex
+maybe-installcheck-flex: installcheck-flex
 
-installcheck-cgen: \
-    configure-cgen 
+installcheck-flex: \
+    configure-flex 
        @: $(MAKE); $(unstage)
-       @[ -f ./cgen/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 cgen" ; \
-       (cd $(HOST_SUBDIR)/cgen && \
+       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}" \
@@ -9698,24 +8469,24 @@ installcheck-cgen: \
                  installcheck) \
          || exit 1
 
-@endif cgen
+@endif flex
 
-.PHONY: maybe-mostlyclean-cgen mostlyclean-cgen
-maybe-mostlyclean-cgen:
-@if cgen
-maybe-mostlyclean-cgen: mostlyclean-cgen
+.PHONY: maybe-mostlyclean-flex mostlyclean-flex
+maybe-mostlyclean-flex:
+@if flex
+maybe-mostlyclean-flex: mostlyclean-flex
 
-mostlyclean-cgen: 
+mostlyclean-flex: 
        @: $(MAKE); $(unstage)
-       @[ -f ./cgen/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 cgen" ; \
-       (cd $(HOST_SUBDIR)/cgen && \
+       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}" \
@@ -9723,24 +8494,24 @@ mostlyclean-cgen:
                  mostlyclean) \
          || exit 1
 
-@endif cgen
+@endif flex
 
-.PHONY: maybe-clean-cgen clean-cgen
-maybe-clean-cgen:
-@if cgen
-maybe-clean-cgen: clean-cgen
+.PHONY: maybe-clean-flex clean-flex
+maybe-clean-flex:
+@if flex
+maybe-clean-flex: clean-flex
 
-clean-cgen: 
+clean-flex: 
        @: $(MAKE); $(unstage)
-       @[ -f ./cgen/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 cgen" ; \
-       (cd $(HOST_SUBDIR)/cgen && \
+       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}" \
@@ -9748,24 +8519,24 @@ clean-cgen:
                  clean) \
          || exit 1
 
-@endif cgen
+@endif flex
 
-.PHONY: maybe-distclean-cgen distclean-cgen
-maybe-distclean-cgen:
-@if cgen
-maybe-distclean-cgen: distclean-cgen
+.PHONY: maybe-distclean-flex distclean-flex
+maybe-distclean-flex:
+@if flex
+maybe-distclean-flex: distclean-flex
 
-distclean-cgen: 
+distclean-flex: 
        @: $(MAKE); $(unstage)
-       @[ -f ./cgen/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 cgen" ; \
-       (cd $(HOST_SUBDIR)/cgen && \
+       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}" \
@@ -9773,24 +8544,24 @@ distclean-cgen:
                  distclean) \
          || exit 1
 
-@endif cgen
+@endif flex
 
-.PHONY: maybe-maintainer-clean-cgen maintainer-clean-cgen
-maybe-maintainer-clean-cgen:
-@if cgen
-maybe-maintainer-clean-cgen: maintainer-clean-cgen
+.PHONY: maybe-maintainer-clean-flex maintainer-clean-flex
+maybe-maintainer-clean-flex:
+@if flex
+maybe-maintainer-clean-flex: maintainer-clean-flex
 
-maintainer-clean-cgen: 
+maintainer-clean-flex: 
        @: $(MAKE); $(unstage)
-       @[ -f ./cgen/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 cgen" ; \
-       (cd $(HOST_SUBDIR)/cgen && \
+       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}" \
@@ -9798,568 +8569,581 @@ maintainer-clean-cgen:
                  maintainer-clean) \
          || exit 1
 
-@endif cgen
+@endif flex
 
 
 
-.PHONY: configure-dejagnu maybe-configure-dejagnu
-maybe-configure-dejagnu:
+.PHONY: configure-gas maybe-configure-gas
+maybe-configure-gas:
 @if gcc-bootstrap
-configure-dejagnu: stage_current
+configure-gas: stage_current
 @endif gcc-bootstrap
-@if dejagnu
-maybe-configure-dejagnu: configure-dejagnu
-configure-dejagnu: 
-       @: $(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)/dejagnu/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dejagnu ; \
+       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/dejagnu; \
-       cd "$(HOST_SUBDIR)/dejagnu" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gas; \
+       cd "$(HOST_SUBDIR)/gas" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/dejagnu/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/dejagnu"; \
-       libsrcdir="$$s/dejagnu"; \
+       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 dejagnu
-
-
+@endif gas
 
 
 
-.PHONY: all-dejagnu maybe-all-dejagnu
-maybe-all-dejagnu:
-@if gcc-bootstrap
-all-dejagnu: stage_current
-@endif gcc-bootstrap
-@if dejagnu
-TARGET-dejagnu=all
-maybe-all-dejagnu: all-dejagnu
-all-dejagnu: configure-dejagnu
-       @: $(MAKE); $(unstage)
+.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; \
-       $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/dejagnu && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-dejagnu))
-@endif dejagnu
-
-
-
-
-.PHONY: check-dejagnu maybe-check-dejagnu
-maybe-check-dejagnu:
-@if dejagnu
-maybe-check-dejagnu: check-dejagnu
+       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; \
+       srcdiroption="--srcdir=$${topdir}/gas"; \
+       libsrcdir="$$s/gas"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif gas-bootstrap
 
-check-dejagnu:
-       @: $(MAKE); $(unstage)
+.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) \
-       (cd $(HOST_SUBDIR)/dejagnu && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif dejagnu
-
-.PHONY: install-dejagnu maybe-install-dejagnu
-maybe-install-dejagnu:
-@if dejagnu
-maybe-install-dejagnu: install-dejagnu
+       $(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; \
+       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_CONFIGURE_FLAGS)
+@endif gas-bootstrap
 
-install-dejagnu: installdirs
-       @: $(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)/dejagnu && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif dejagnu
-
-.PHONY: install-strip-dejagnu maybe-install-strip-dejagnu
-maybe-install-strip-dejagnu:
-@if dejagnu
-maybe-install-strip-dejagnu: install-strip-dejagnu
+       $(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; \
+       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) \
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif gas-bootstrap
 
-install-strip-dejagnu: installdirs
-       @: $(MAKE); $(unstage)
+.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) \
-       (cd $(HOST_SUBDIR)/dejagnu && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif dejagnu
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-dejagnu info-dejagnu
-maybe-info-dejagnu:
-@if dejagnu
-maybe-info-dejagnu: info-dejagnu
+       $(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; \
+       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) \
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif gas-bootstrap
 
-info-dejagnu: \
-    configure-dejagnu 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dejagnu/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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 dejagnu
-
-.PHONY: maybe-dvi-dejagnu dvi-dejagnu
-maybe-dvi-dejagnu:
-@if dejagnu
-maybe-dvi-dejagnu: dvi-dejagnu
+       $(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; \
+       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) \
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif gas-bootstrap
 
-dvi-dejagnu: \
-    configure-dejagnu 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dejagnu/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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 dejagnu
+       $(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; \
+       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) \
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif gas-bootstrap
 
-.PHONY: maybe-pdf-dejagnu pdf-dejagnu
-maybe-pdf-dejagnu:
-@if dejagnu
-maybe-pdf-dejagnu: pdf-dejagnu
 
-pdf-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 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}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 pdf) \
-         || exit 1
 
-@endif dejagnu
 
-.PHONY: maybe-html-dejagnu html-dejagnu
-maybe-html-dejagnu:
-@if dejagnu
-maybe-html-dejagnu: html-dejagnu
 
-html-dejagnu: \
-    configure-dejagnu 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dejagnu/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gas && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+               $(TARGET-gas))
+@endif gas
 
-@endif dejagnu
 
-.PHONY: maybe-TAGS-dejagnu TAGS-dejagnu
-maybe-TAGS-dejagnu:
-@if dejagnu
-maybe-TAGS-dejagnu: TAGS-dejagnu
 
-TAGS-dejagnu: \
-    configure-dejagnu 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dejagnu/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; \
-       $(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
+       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)   \
+               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(TARGET-stage1-gas)
 
-@endif dejagnu
+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: maybe-install-info-dejagnu install-info-dejagnu
-maybe-install-info-dejagnu:
-@if dejagnu
-maybe-install-info-dejagnu: install-info-dejagnu
 
-install-info-dejagnu: \
-    configure-dejagnu \
-    info-dejagnu 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dejagnu/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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 dejagnu
+       $(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)
 
-.PHONY: maybe-install-pdf-dejagnu install-pdf-dejagnu
-maybe-install-pdf-dejagnu:
-@if dejagnu
-maybe-install-pdf-dejagnu: install-pdf-dejagnu
-
-install-pdf-dejagnu: \
-    configure-dejagnu \
-    pdf-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 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}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-pdf) \
-         || exit 1
-
-@endif dejagnu
-
-.PHONY: maybe-install-html-dejagnu install-html-dejagnu
-maybe-install-html-dejagnu:
-@if dejagnu
-maybe-install-html-dejagnu: install-html-dejagnu
-
-install-html-dejagnu: \
-    configure-dejagnu \
-    html-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 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}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-html) \
-         || exit 1
-
-@endif dejagnu
-
-.PHONY: maybe-installcheck-dejagnu installcheck-dejagnu
-maybe-installcheck-dejagnu:
-@if dejagnu
-maybe-installcheck-dejagnu: installcheck-dejagnu
-
-installcheck-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 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}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 installcheck) \
-         || exit 1
-
-@endif dejagnu
-
-.PHONY: maybe-mostlyclean-dejagnu mostlyclean-dejagnu
-maybe-mostlyclean-dejagnu:
-@if dejagnu
-maybe-mostlyclean-dejagnu: mostlyclean-dejagnu
-
-mostlyclean-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 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}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 mostlyclean) \
-         || exit 1
-
-@endif dejagnu
+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: maybe-clean-dejagnu clean-dejagnu
-maybe-clean-dejagnu:
-@if dejagnu
-maybe-clean-dejagnu: clean-dejagnu
 
-clean-dejagnu: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dejagnu/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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)/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)
 
-@endif dejagnu
+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: maybe-distclean-dejagnu distclean-dejagnu
-maybe-distclean-dejagnu:
-@if dejagnu
-maybe-distclean-dejagnu: distclean-dejagnu
 
-distclean-dejagnu: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dejagnu/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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)/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)
 
-@endif dejagnu
+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: maybe-maintainer-clean-dejagnu maintainer-clean-dejagnu
-maybe-maintainer-clean-dejagnu:
-@if dejagnu
-maybe-maintainer-clean-dejagnu: maintainer-clean-dejagnu
 
-maintainer-clean-dejagnu: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dejagnu/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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 dejagnu
+       $(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: configure-diff maybe-configure-diff
-maybe-configure-diff:
-@if gcc-bootstrap
-configure-diff: stage_current
-@endif gcc-bootstrap
-@if diff
-maybe-configure-diff: configure-diff
-configure-diff: 
-       @: $(MAKE); $(unstage)
+.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; \
-       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; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/diff/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/diff"; \
-       libsrcdir="$$s/diff"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif diff
-
-
-
+       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: all-diff maybe-all-diff
-maybe-all-diff:
-@if gcc-bootstrap
-all-diff: stage_current
-@endif gcc-bootstrap
-@if diff
-TARGET-diff=all
-maybe-all-diff: all-diff
-all-diff: configure-diff
-       @: $(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
 
 
 
 
-.PHONY: check-diff maybe-check-diff
-maybe-check-diff:
-@if diff
-maybe-check-diff: check-diff
+.PHONY: check-gas maybe-check-gas
+maybe-check-gas:
+@if gas
+maybe-check-gas: check-gas
 
-check-diff:
+check-gas:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/diff && \
+       (cd $(HOST_SUBDIR)/gas && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif diff
+@endif gas
 
-.PHONY: install-diff maybe-install-diff
-maybe-install-diff:
-@if diff
-maybe-install-diff: install-diff
+.PHONY: install-gas maybe-install-gas
+maybe-install-gas:
+@if gas
+maybe-install-gas: install-gas
 
-install-diff: installdirs
+install-gas: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/diff && \
+       (cd $(HOST_SUBDIR)/gas && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif diff
+@endif gas
 
-.PHONY: install-strip-diff maybe-install-strip-diff
-maybe-install-strip-diff:
-@if diff
-maybe-install-strip-diff: install-strip-diff
+.PHONY: install-strip-gas maybe-install-strip-gas
+maybe-install-strip-gas:
+@if gas
+maybe-install-strip-gas: install-strip-gas
 
-install-strip-diff: installdirs
+install-strip-gas: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/diff && \
+       (cd $(HOST_SUBDIR)/gas && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif diff
+@endif gas
 
 # 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-gas info-gas
+maybe-info-gas:
+@if gas
+maybe-info-gas: info-gas
 
-info-diff: \
-    configure-diff 
-       @: $(MAKE); $(unstage)
-       @[ -f ./diff/Makefile ] || exit 0; \
+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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
@@ -10367,25 +9151,24 @@ info-diff: \
                  info) \
          || exit 1
 
-@endif diff
+@endif gas
 
-.PHONY: maybe-dvi-diff dvi-diff
-maybe-dvi-diff:
-@if diff
-maybe-dvi-diff: dvi-diff
+.PHONY: maybe-dvi-gas dvi-gas
+maybe-dvi-gas:
+@if gas
+maybe-dvi-gas: dvi-gas
 
-dvi-diff: \
-    configure-diff 
-       @: $(MAKE); $(unstage)
-       @[ -f ./diff/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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
@@ -10393,25 +9176,24 @@ dvi-diff: \
                  dvi) \
          || exit 1
 
-@endif diff
+@endif gas
 
-.PHONY: maybe-pdf-diff pdf-diff
-maybe-pdf-diff:
-@if diff
-maybe-pdf-diff: pdf-diff
+.PHONY: maybe-pdf-gas pdf-gas
+maybe-pdf-gas:
+@if gas
+maybe-pdf-gas: pdf-gas
 
-pdf-diff: \
-    configure-diff 
-       @: $(MAKE); $(unstage)
-       @[ -f ./diff/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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
@@ -10419,25 +9201,24 @@ pdf-diff: \
                  pdf) \
          || exit 1
 
-@endif diff
+@endif gas
 
-.PHONY: maybe-html-diff html-diff
-maybe-html-diff:
-@if diff
-maybe-html-diff: html-diff
+.PHONY: maybe-html-gas html-gas
+maybe-html-gas:
+@if gas
+maybe-html-gas: html-gas
 
-html-diff: \
-    configure-diff 
-       @: $(MAKE); $(unstage)
-       @[ -f ./diff/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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
@@ -10445,25 +9226,24 @@ html-diff: \
                  html) \
          || exit 1
 
-@endif diff
+@endif gas
 
-.PHONY: maybe-TAGS-diff TAGS-diff
-maybe-TAGS-diff:
-@if diff
-maybe-TAGS-diff: TAGS-diff
+.PHONY: maybe-TAGS-gas TAGS-gas
+maybe-TAGS-gas:
+@if gas
+maybe-TAGS-gas: TAGS-gas
 
-TAGS-diff: \
-    configure-diff 
-       @: $(MAKE); $(unstage)
-       @[ -f ./diff/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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
@@ -10471,26 +9251,25 @@ TAGS-diff: \
                  TAGS) \
          || exit 1
 
-@endif diff
+@endif gas
 
-.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-gas install-info-gas
+maybe-install-info-gas:
+@if gas
+maybe-install-info-gas: install-info-gas
 
-install-info-diff: \
-    configure-diff \
-    info-diff 
-       @: $(MAKE); $(unstage)
-       @[ -f ./diff/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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
@@ -10498,26 +9277,25 @@ install-info-diff: \
                  install-info) \
          || exit 1
 
-@endif diff
+@endif gas
 
-.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-gas install-pdf-gas
+maybe-install-pdf-gas:
+@if gas
+maybe-install-pdf-gas: install-pdf-gas
 
-install-pdf-diff: \
-    configure-diff \
-    pdf-diff 
-       @: $(MAKE); $(unstage)
-       @[ -f ./diff/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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
@@ -10525,26 +9303,25 @@ install-pdf-diff: \
                  install-pdf) \
          || exit 1
 
-@endif diff
+@endif gas
 
-.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-gas install-html-gas
+maybe-install-html-gas:
+@if gas
+maybe-install-html-gas: install-html-gas
 
-install-html-diff: \
-    configure-diff \
-    html-diff 
-       @: $(MAKE); $(unstage)
-       @[ -f ./diff/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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
@@ -10552,25 +9329,24 @@ install-html-diff: \
                  install-html) \
          || exit 1
 
-@endif diff
+@endif gas
 
-.PHONY: maybe-installcheck-diff installcheck-diff
-maybe-installcheck-diff:
-@if diff
-maybe-installcheck-diff: installcheck-diff
+.PHONY: maybe-installcheck-gas installcheck-gas
+maybe-installcheck-gas:
+@if gas
+maybe-installcheck-gas: installcheck-gas
 
-installcheck-diff: \
-    configure-diff 
-       @: $(MAKE); $(unstage)
-       @[ -f ./diff/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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
@@ -10578,24 +9354,23 @@ installcheck-diff: \
                  installcheck) \
          || exit 1
 
-@endif diff
+@endif gas
 
-.PHONY: maybe-mostlyclean-diff mostlyclean-diff
-maybe-mostlyclean-diff:
-@if diff
-maybe-mostlyclean-diff: mostlyclean-diff
+.PHONY: maybe-mostlyclean-gas mostlyclean-gas
+maybe-mostlyclean-gas:
+@if gas
+maybe-mostlyclean-gas: mostlyclean-gas
 
-mostlyclean-diff: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./diff/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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
@@ -10603,24 +9378,23 @@ mostlyclean-diff:
                  mostlyclean) \
          || exit 1
 
-@endif diff
+@endif gas
 
-.PHONY: maybe-clean-diff clean-diff
-maybe-clean-diff:
-@if diff
-maybe-clean-diff: clean-diff
+.PHONY: maybe-clean-gas clean-gas
+maybe-clean-gas:
+@if gas
+maybe-clean-gas: clean-gas
 
-clean-diff: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./diff/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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
@@ -10628,24 +9402,23 @@ clean-diff:
                  clean) \
          || exit 1
 
-@endif diff
+@endif gas
 
-.PHONY: maybe-distclean-diff distclean-diff
-maybe-distclean-diff:
-@if diff
-maybe-distclean-diff: distclean-diff
+.PHONY: maybe-distclean-gas distclean-gas
+maybe-distclean-gas:
+@if gas
+maybe-distclean-gas: distclean-gas
 
-distclean-diff: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./diff/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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
@@ -10653,24 +9426,23 @@ distclean-diff:
                  distclean) \
          || exit 1
 
-@endif diff
+@endif gas
 
-.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-gas maintainer-clean-gas
+maybe-maintainer-clean-gas:
+@if gas
+maybe-maintainer-clean-gas: maintainer-clean-gas
 
-maintainer-clean-diff: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./diff/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+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 diff" ; \
-       (cd $(HOST_SUBDIR)/diff && \
+       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}" \
@@ -10678,562 +9450,581 @@ maintainer-clean-diff:
                  maintainer-clean) \
          || exit 1
 
-@endif diff
+@endif gas
 
 
 
-.PHONY: configure-dosutils maybe-configure-dosutils
-maybe-configure-dosutils:
+.PHONY: configure-gcc maybe-configure-gcc
+maybe-configure-gcc:
 @if gcc-bootstrap
-configure-dosutils: stage_current
+configure-gcc: stage_current
 @endif gcc-bootstrap
-@if dosutils
-maybe-configure-dosutils: configure-dosutils
-configure-dosutils: 
-       @: $(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)/dosutils/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dosutils ; \
+       test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/dosutils; \
-       cd "$(HOST_SUBDIR)/dosutils" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gcc; \
+       cd "$(HOST_SUBDIR)/gcc" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/dosutils/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/dosutils"; \
-       libsrcdir="$$s/dosutils"; \
+       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 dosutils
-
-
+@endif gcc
 
 
 
-.PHONY: all-dosutils maybe-all-dosutils
-maybe-all-dosutils:
+.PHONY: configure-stage1-gcc maybe-configure-stage1-gcc
+maybe-configure-stage1-gcc:
 @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)
+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; \
-       $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/dosutils && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-dosutils))
-@endif dosutils
-
-
-
-
-.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
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/gcc/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)/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} \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif gcc-bootstrap
 
-install-dosutils: installdirs
-       @: $(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)/dosutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif dosutils
-
-.PHONY: install-strip-dosutils maybe-install-strip-dosutils
-maybe-install-strip-dosutils:
-@if dosutils
-maybe-install-strip-dosutils: install-strip-dosutils
+       $(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; \
+       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_CONFIGURE_FLAGS)
+@endif gcc-bootstrap
 
-install-strip-dosutils: 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)/dosutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif dosutils
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-dosutils info-dosutils
-maybe-info-dosutils:
-@if dosutils
-maybe-info-dosutils: info-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)/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) \
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif gcc-bootstrap
 
-info-dosutils: \
-    configure-dosutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/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 dosutils" ; \
-       (cd $(HOST_SUBDIR)/dosutils && \
-         $(MAKE) $(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 dosutils
-
-.PHONY: maybe-dvi-dosutils dvi-dosutils
-maybe-dvi-dosutils:
-@if dosutils
-maybe-dvi-dosutils: dvi-dosutils
+       $(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; \
+       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) \
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif gcc-bootstrap
 
-dvi-dosutils: \
-    configure-dosutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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 dosutils
-
-.PHONY: maybe-pdf-dosutils pdf-dosutils
-maybe-pdf-dosutils:
-@if dosutils
-maybe-pdf-dosutils: pdf-dosutils
+       $(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; \
+       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) \
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif gcc-bootstrap
 
-pdf-dosutils: \
-    configure-dosutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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 dosutils
+       $(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; \
+       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) \
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif gcc-bootstrap
 
-.PHONY: maybe-html-dosutils html-dosutils
-maybe-html-dosutils:
-@if dosutils
-maybe-html-dosutils: html-dosutils
 
-html-dosutils: \
-    configure-dosutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 dosutils
 
-.PHONY: maybe-TAGS-dosutils TAGS-dosutils
-maybe-TAGS-dosutils:
-@if dosutils
-maybe-TAGS-dosutils: TAGS-dosutils
 
-TAGS-dosutils: \
-    configure-dosutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gcc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) \
+               $(TARGET-gcc))
+@endif gcc
 
-@endif dosutils
 
-.PHONY: maybe-install-info-dosutils install-info-dosutils
-maybe-install-info-dosutils:
-@if dosutils
-maybe-install-info-dosutils: install-info-dosutils
 
-install-info-dosutils: \
-    configure-dosutils \
-    info-dosutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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
+       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)  $(EXTRA_GCC_FLAGS) \
+               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(TARGET-stage1-gcc)
 
-@endif dosutils
+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: maybe-install-pdf-dosutils install-pdf-dosutils
-maybe-install-pdf-dosutils:
-@if dosutils
-maybe-install-pdf-dosutils: install-pdf-dosutils
 
-install-pdf-dosutils: \
-    configure-dosutils \
-    pdf-dosutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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
+       $(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)
 
-@endif dosutils
+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: maybe-install-html-dosutils install-html-dosutils
-maybe-install-html-dosutils:
-@if dosutils
-maybe-install-html-dosutils: install-html-dosutils
 
-install-html-dosutils: \
-    configure-dosutils \
-    html-dosutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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
+       $(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)
 
-@endif dosutils
+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: maybe-installcheck-dosutils installcheck-dosutils
-maybe-installcheck-dosutils:
-@if dosutils
-maybe-installcheck-dosutils: installcheck-dosutils
 
-installcheck-dosutils: \
-    configure-dosutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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)/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)
 
-@endif dosutils
+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: maybe-mostlyclean-dosutils mostlyclean-dosutils
-maybe-mostlyclean-dosutils:
-@if dosutils
-maybe-mostlyclean-dosutils: mostlyclean-dosutils
 
-mostlyclean-dosutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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 dosutils
-
-.PHONY: maybe-clean-dosutils clean-dosutils
-maybe-clean-dosutils:
-@if dosutils
-maybe-clean-dosutils: clean-dosutils
-
-clean-dosutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 dosutils
-
-.PHONY: maybe-distclean-dosutils distclean-dosutils
-maybe-distclean-dosutils:
-@if dosutils
-maybe-distclean-dosutils: distclean-dosutils
-
-distclean-dosutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 dosutils
-
-.PHONY: maybe-maintainer-clean-dosutils maintainer-clean-dosutils
-maybe-maintainer-clean-dosutils:
-@if dosutils
-maybe-maintainer-clean-dosutils: maintainer-clean-dosutils
-
-maintainer-clean-dosutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./dosutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 dosutils
+       $(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: configure-etc maybe-configure-etc
-maybe-configure-etc:
+.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
-configure-etc: stage_current
-@endif gcc-bootstrap
-@if etc
-maybe-configure-etc: configure-etc
-configure-etc: 
-       @: $(MAKE); $(unstage)
+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; \
-       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)/etc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/etc"; \
-       libsrcdir="$$s/etc"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif etc
-
-
-
-
+       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)
 
-.PHONY: all-etc maybe-all-etc
-maybe-all-etc:
-@if gcc-bootstrap
-all-etc: stage_current
+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
-@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)/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
 
-check-etc:
+.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)/etc && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+       (cd $(HOST_SUBDIR)/gcc && \
+         $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) check)
 
-@endif etc
+@endif gcc
 
-.PHONY: install-etc maybe-install-etc
-maybe-install-etc:
-@if etc
-maybe-install-etc: install-etc
+.PHONY: install-gcc maybe-install-gcc
+maybe-install-gcc:
+@if gcc
+maybe-install-gcc: install-gcc
 
-install-etc: installdirs
+install-gcc: 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)
+       (cd $(HOST_SUBDIR)/gcc && \
+         $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) install)
 
-@endif etc
+@endif gcc
 
-.PHONY: install-strip-etc maybe-install-strip-etc
-maybe-install-strip-etc:
-@if etc
-maybe-install-strip-etc: install-strip-etc
+.PHONY: install-strip-gcc maybe-install-strip-gcc
+maybe-install-strip-gcc:
+@if gcc
+maybe-install-strip-gcc: install-strip-gcc
 
-install-strip-etc: installdirs
+install-strip-gcc: 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)
+       (cd $(HOST_SUBDIR)/gcc && \
+         $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) install-strip)
 
-@endif etc
+@endif gcc
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-etc info-etc
-maybe-info-etc:
-@if etc
-maybe-info-etc: info-etc
+.PHONY: maybe-info-gcc info-gcc
+maybe-info-gcc:
+@if gcc
+maybe-info-gcc: info-gcc
 
-info-etc: \
-    configure-etc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./etc/Makefile ] || exit 0; \
+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) ; do \
+       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 etc" ; \
-       (cd $(HOST_SUBDIR)/etc && \
+       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}" \
@@ -11241,25 +10032,24 @@ info-etc: \
                  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}" \
@@ -11267,25 +10057,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}" \
@@ -11293,25 +10082,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}" \
@@ -11319,25 +10107,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}" \
@@ -11345,26 +10132,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}" \
@@ -11372,26 +10158,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}" \
@@ -11399,26 +10184,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}" \
@@ -11426,25 +10210,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}" \
@@ -11452,24 +10235,23 @@ installcheck-etc: \
                  installcheck) \
          || exit 1
 
-@endif etc
+@endif gcc
 
-.PHONY: maybe-mostlyclean-etc mostlyclean-etc
-maybe-mostlyclean-etc:
-@if etc
-maybe-mostlyclean-etc: mostlyclean-etc
+.PHONY: maybe-mostlyclean-gcc mostlyclean-gcc
+maybe-mostlyclean-gcc:
+@if gcc
+maybe-mostlyclean-gcc: mostlyclean-gcc
 
-mostlyclean-etc: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./etc/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 etc" ; \
-       (cd $(HOST_SUBDIR)/etc && \
+       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}" \
@@ -11477,24 +10259,23 @@ mostlyclean-etc:
                  mostlyclean) \
          || exit 1
 
-@endif etc
+@endif gcc
 
-.PHONY: maybe-clean-etc clean-etc
-maybe-clean-etc:
-@if etc
-maybe-clean-etc: clean-etc
+.PHONY: maybe-clean-gcc clean-gcc
+maybe-clean-gcc:
+@if gcc
+maybe-clean-gcc: clean-gcc
 
-clean-etc: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./etc/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 etc" ; \
-       (cd $(HOST_SUBDIR)/etc && \
+       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}" \
@@ -11502,24 +10283,23 @@ clean-etc:
                  clean) \
          || exit 1
 
-@endif etc
+@endif gcc
 
-.PHONY: maybe-distclean-etc distclean-etc
-maybe-distclean-etc:
-@if etc
-maybe-distclean-etc: distclean-etc
+.PHONY: maybe-distclean-gcc distclean-gcc
+maybe-distclean-gcc:
+@if gcc
+maybe-distclean-gcc: distclean-gcc
 
-distclean-etc: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./etc/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 etc" ; \
-       (cd $(HOST_SUBDIR)/etc && \
+       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}" \
@@ -11527,24 +10307,23 @@ distclean-etc:
                  distclean) \
          || exit 1
 
-@endif etc
+@endif gcc
 
-.PHONY: maybe-maintainer-clean-etc maintainer-clean-etc
-maybe-maintainer-clean-etc:
-@if etc
-maybe-maintainer-clean-etc: maintainer-clean-etc
+.PHONY: maybe-maintainer-clean-gcc maintainer-clean-gcc
+maybe-maintainer-clean-gcc:
+@if gcc
+maybe-maintainer-clean-gcc: maintainer-clean-gcc
 
-maintainer-clean-etc: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./etc/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 etc" ; \
-       (cd $(HOST_SUBDIR)/etc && \
+       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}" \
@@ -11552,571 +10331,575 @@ maintainer-clean-etc:
                  maintainer-clean) \
          || exit 1
 
-@endif etc
+@endif gcc
 
 
 
-.PHONY: configure-fastjar maybe-configure-fastjar
-maybe-configure-fastjar:
+.PHONY: configure-gmp maybe-configure-gmp
+maybe-configure-gmp:
 @if gcc-bootstrap
-configure-fastjar: stage_current
+configure-gmp: stage_current
 @endif gcc-bootstrap
-@if fastjar
-maybe-configure-fastjar: configure-fastjar
-configure-fastjar: 
-       @: $(MAKE); $(unstage)
+@if gmp
+maybe-configure-gmp: configure-gmp
+configure-gmp: 
        @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 ; \
+       test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/fastjar; \
-       cd "$(HOST_SUBDIR)/fastjar" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gmp; \
+       cd "$(HOST_SUBDIR)/gmp" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/fastjar/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/fastjar"; \
-       libsrcdir="$$s/fastjar"; \
+       srcdiroption="--srcdir=$${topdir}/gmp"; \
+       libsrcdir="$$s/gmp"; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
+         --target=none-${host_vendor}-${host_os} $${srcdiroption} --disable-shared \
          || exit 1
-@endif fastjar
-
-
+@endif gmp
 
 
 
-.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)
+.PHONY: configure-stage1-gmp maybe-configure-stage1-gmp
+maybe-configure-stage1-gmp:
+@if gmp-bootstrap
+maybe-configure-stage1-gmp: configure-stage1-gmp
+configure-stage1-gmp:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
        @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
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/gmp/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)/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} \
+         $(STAGE1_CONFIGURE_FLAGS) \
+         --disable-shared
+@endif gmp-bootstrap
 
-.PHONY: install-fastjar maybe-install-fastjar
-maybe-install-fastjar:
-@if fastjar
-maybe-install-fastjar: install-fastjar
+.PHONY: configure-stage2-gmp maybe-configure-stage2-gmp
+maybe-configure-stage2-gmp:
+@if gmp-bootstrap
+maybe-configure-stage2-gmp: configure-stage2-gmp
+configure-stage2-gmp:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(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) \
+       CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/gmp ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+       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_CONFIGURE_FLAGS) \
+         --disable-shared
+@endif gmp-bootstrap
 
-install-fastjar: installdirs
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage3-gmp maybe-configure-stage3-gmp
+maybe-configure-stage3-gmp:
+@if gmp-bootstrap
+maybe-configure-stage3-gmp: configure-stage3-gmp
+configure-stage3-gmp:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(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) \
-       (cd $(HOST_SUBDIR)/fastjar && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+       $(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)/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) \
+         $(STAGE3_CONFIGURE_FLAGS) \
+         --disable-shared
+@endif gmp-bootstrap
 
-@endif fastjar
+.PHONY: configure-stage4-gmp maybe-configure-stage4-gmp
+maybe-configure-stage4-gmp:
+@if gmp-bootstrap
+maybe-configure-stage4-gmp: configure-stage4-gmp
+configure-stage4-gmp:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(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) \
+       CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/gmp ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+       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) \
+         $(STAGE4_CONFIGURE_FLAGS) \
+         --disable-shared
+@endif gmp-bootstrap
 
-.PHONY: install-strip-fastjar maybe-install-strip-fastjar
-maybe-install-strip-fastjar:
-@if fastjar
-maybe-install-strip-fastjar: install-strip-fastjar
+.PHONY: configure-stageprofile-gmp maybe-configure-stageprofile-gmp
+maybe-configure-stageprofile-gmp:
+@if gmp-bootstrap
+maybe-configure-stageprofile-gmp: configure-stageprofile-gmp
+configure-stageprofile-gmp:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(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="$(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 \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
+         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEprofile_CONFIGURE_FLAGS) \
+         --disable-shared
+@endif gmp-bootstrap
 
-install-strip-fastjar: installdirs
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stagefeedback-gmp maybe-configure-stagefeedback-gmp
+maybe-configure-stagefeedback-gmp:
+@if gmp-bootstrap
+maybe-configure-stagefeedback-gmp: configure-stagefeedback-gmp
+configure-stagefeedback-gmp:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(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) \
-       (cd $(HOST_SUBDIR)/fastjar && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
+       $(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 \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
+         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEfeedback_CONFIGURE_FLAGS) \
+         --disable-shared
+@endif gmp-bootstrap
 
-@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; \
+
+.PHONY: all-gmp maybe-all-gmp
+maybe-all-gmp:
+@if gcc-bootstrap
+all-gmp: stage_current
+@endif gcc-bootstrap
+@if gmp
+TARGET-gmp=all
+maybe-all-gmp: all-gmp
+all-gmp: configure-gmp
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gmp && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+               $(TARGET-gmp))
+@endif gmp
 
-@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; \
+.PHONY: all-stage1-gmp maybe-all-stage1-gmp
+.PHONY: clean-stage1-gmp maybe-clean-stage1-gmp
+maybe-all-stage1-gmp:
+maybe-clean-stage1-gmp:
+@if gmp-bootstrap
+maybe-all-stage1-gmp: all-stage1-gmp
+all-stage1: all-stage1-gmp
+TARGET-stage1-gmp = $(TARGET-gmp)
+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) \
-       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
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/gmp && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE1_CFLAGS)" \
+               CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+               LIBCFLAGS="$(LIBCFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS)   \
+               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(TARGET-stage1-gmp)
 
-@endif fastjar
+maybe-clean-stage1-gmp: clean-stage1-gmp
+clean-stage1: clean-stage1-gmp
+clean-stage1-gmp:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-gmp/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/gmp && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+                clean
+@endif gmp-bootstrap
 
-.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; \
+.PHONY: all-stage2-gmp maybe-all-stage2-gmp
+.PHONY: clean-stage2-gmp maybe-clean-stage2-gmp
+maybe-all-stage2-gmp:
+maybe-clean-stage2-gmp:
+@if gmp-bootstrap
+maybe-all-stage2-gmp: all-stage2-gmp
+all-stage2: all-stage2-gmp
+TARGET-stage2-gmp = $(TARGET-gmp)
+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) \
-       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
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/gmp && \
+       $(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-gmp)
 
-@endif fastjar
+maybe-clean-stage2-gmp: clean-stage2-gmp
+clean-stage2: clean-stage2-gmp
+clean-stage2-gmp:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-gmp/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/gmp && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                clean
+@endif gmp-bootstrap
 
-.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; \
+.PHONY: all-stage3-gmp maybe-all-stage3-gmp
+.PHONY: clean-stage3-gmp maybe-clean-stage3-gmp
+maybe-all-stage3-gmp:
+maybe-clean-stage3-gmp:
+@if gmp-bootstrap
+maybe-all-stage3-gmp: all-stage3-gmp
+all-stage3: all-stage3-gmp
+TARGET-stage3-gmp = $(TARGET-gmp)
+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) \
-       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
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/gmp && \
+       $(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-gmp)
 
-@endif fastjar
+maybe-clean-stage3-gmp: clean-stage3-gmp
+clean-stage3: clean-stage3-gmp
+clean-stage3-gmp:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-gmp/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/gmp && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                clean
+@endif gmp-bootstrap
 
-.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; \
+.PHONY: all-stage4-gmp maybe-all-stage4-gmp
+.PHONY: clean-stage4-gmp maybe-clean-stage4-gmp
+maybe-all-stage4-gmp:
+maybe-clean-stage4-gmp:
+@if gmp-bootstrap
+maybe-all-stage4-gmp: all-stage4-gmp
+all-stage4: all-stage4-gmp
+TARGET-stage4-gmp = $(TARGET-gmp)
+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) \
-       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
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/gmp && \
+       $(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-gmp)
 
-@endif fastjar
+maybe-clean-stage4-gmp: clean-stage4-gmp
+clean-stage4: clean-stage4-gmp
+clean-stage4-gmp:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-gmp/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/gmp && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                clean
+@endif gmp-bootstrap
 
-.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; \
+.PHONY: all-stageprofile-gmp maybe-all-stageprofile-gmp
+.PHONY: clean-stageprofile-gmp maybe-clean-stageprofile-gmp
+maybe-all-stageprofile-gmp:
+maybe-clean-stageprofile-gmp:
+@if gmp-bootstrap
+maybe-all-stageprofile-gmp: all-stageprofile-gmp
+all-stageprofile: all-stageprofile-gmp
+TARGET-stageprofile-gmp = $(TARGET-gmp)
+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) \
-       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
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/gmp && \
+       $(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-gmp)
 
+maybe-clean-stageprofile-gmp: clean-stageprofile-gmp
+clean-stageprofile: clean-stageprofile-gmp
+clean-stageprofile-gmp:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-gmp/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/gmp && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                clean
+@endif gmp-bootstrap
 
 
-.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)
+.PHONY: all-stagefeedback-gmp maybe-all-stagefeedback-gmp
+.PHONY: clean-stagefeedback-gmp maybe-clean-stagefeedback-gmp
+maybe-all-stagefeedback-gmp:
+maybe-clean-stagefeedback-gmp:
+@if gmp-bootstrap
+maybe-all-stagefeedback-gmp: all-stagefeedback-gmp
+all-stagefeedback: all-stagefeedback-gmp
+TARGET-stagefeedback-gmp = $(TARGET-gmp)
+all-stagefeedback-gmp: configure-stagefeedback-gmp
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
        @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
-
-
-
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/gmp && \
+       $(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-gmp)
 
+maybe-clean-stagefeedback-gmp: clean-stagefeedback-gmp
+clean-stagefeedback: clean-stagefeedback-gmp
+clean-stagefeedback-gmp:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-gmp/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/gmp && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                clean
+@endif gmp-bootstrap
 
-.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
+.PHONY: check-gmp maybe-check-gmp
+maybe-check-gmp:
+@if gmp
+maybe-check-gmp: check-gmp
 
-check-fileutils:
+check-gmp:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/fileutils && \
+       (cd $(HOST_SUBDIR)/gmp && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif fileutils
+@endif gmp
 
-.PHONY: install-fileutils maybe-install-fileutils
-maybe-install-fileutils:
-@if fileutils
-maybe-install-fileutils: install-fileutils
+.PHONY: install-gmp maybe-install-gmp
+maybe-install-gmp:
+@if gmp
+maybe-install-gmp: install-gmp
 
-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)
+install-gmp:
 
-@endif fileutils
+@endif gmp
 
-.PHONY: install-strip-fileutils maybe-install-strip-fileutils
-maybe-install-strip-fileutils:
-@if fileutils
-maybe-install-strip-fileutils: install-strip-fileutils
+.PHONY: install-strip-gmp maybe-install-strip-gmp
+maybe-install-strip-gmp:
+@if gmp
+maybe-install-strip-gmp: install-strip-gmp
 
-install-strip-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-strip)
+install-strip-gmp:
 
-@endif fileutils
+@endif gmp
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-fileutils info-fileutils
-maybe-info-fileutils:
-@if fileutils
-maybe-info-fileutils: info-fileutils
+.PHONY: maybe-info-gmp info-gmp
+maybe-info-gmp:
+@if gmp
+maybe-info-gmp: info-gmp
 
-info-fileutils: \
-    configure-fileutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
+info-gmp: \
+    configure-gmp 
+       @[ -f ./gmp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -12124,25 +10907,24 @@ info-fileutils: \
                  info) \
          || exit 1
 
-@endif fileutils
+@endif gmp
 
-.PHONY: maybe-dvi-fileutils dvi-fileutils
-maybe-dvi-fileutils:
-@if fileutils
-maybe-dvi-fileutils: dvi-fileutils
+.PHONY: maybe-dvi-gmp dvi-gmp
+maybe-dvi-gmp:
+@if gmp
+maybe-dvi-gmp: dvi-gmp
 
-dvi-fileutils: \
-    configure-fileutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
+dvi-gmp: \
+    configure-gmp 
+       @[ -f ./gmp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -12150,25 +10932,24 @@ dvi-fileutils: \
                  dvi) \
          || exit 1
 
-@endif fileutils
+@endif gmp
 
-.PHONY: maybe-pdf-fileutils pdf-fileutils
-maybe-pdf-fileutils:
-@if fileutils
-maybe-pdf-fileutils: pdf-fileutils
+.PHONY: maybe-pdf-gmp pdf-gmp
+maybe-pdf-gmp:
+@if gmp
+maybe-pdf-gmp: pdf-gmp
 
-pdf-fileutils: \
-    configure-fileutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
+pdf-gmp: \
+    configure-gmp 
+       @[ -f ./gmp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -12176,25 +10957,24 @@ pdf-fileutils: \
                  pdf) \
          || exit 1
 
-@endif fileutils
+@endif gmp
 
-.PHONY: maybe-html-fileutils html-fileutils
-maybe-html-fileutils:
-@if fileutils
-maybe-html-fileutils: html-fileutils
+.PHONY: maybe-html-gmp html-gmp
+maybe-html-gmp:
+@if gmp
+maybe-html-gmp: html-gmp
 
-html-fileutils: \
-    configure-fileutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
+html-gmp: \
+    configure-gmp 
+       @[ -f ./gmp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -12202,25 +10982,24 @@ html-fileutils: \
                  html) \
          || exit 1
 
-@endif fileutils
+@endif gmp
 
-.PHONY: maybe-TAGS-fileutils TAGS-fileutils
-maybe-TAGS-fileutils:
-@if fileutils
-maybe-TAGS-fileutils: TAGS-fileutils
+.PHONY: maybe-TAGS-gmp TAGS-gmp
+maybe-TAGS-gmp:
+@if gmp
+maybe-TAGS-gmp: TAGS-gmp
 
-TAGS-fileutils: \
-    configure-fileutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
+TAGS-gmp: \
+    configure-gmp 
+       @[ -f ./gmp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -12228,26 +11007,25 @@ TAGS-fileutils: \
                  TAGS) \
          || exit 1
 
-@endif fileutils
+@endif gmp
 
-.PHONY: maybe-install-info-fileutils install-info-fileutils
-maybe-install-info-fileutils:
-@if fileutils
-maybe-install-info-fileutils: install-info-fileutils
+.PHONY: maybe-install-info-gmp install-info-gmp
+maybe-install-info-gmp:
+@if gmp
+maybe-install-info-gmp: install-info-gmp
 
-install-info-fileutils: \
-    configure-fileutils \
-    info-fileutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
+install-info-gmp: \
+    configure-gmp \
+    info-gmp 
+       @[ -f ./gmp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -12255,26 +11033,25 @@ install-info-fileutils: \
                  install-info) \
          || exit 1
 
-@endif fileutils
+@endif gmp
 
-.PHONY: maybe-install-pdf-fileutils install-pdf-fileutils
-maybe-install-pdf-fileutils:
-@if fileutils
-maybe-install-pdf-fileutils: install-pdf-fileutils
+.PHONY: maybe-install-pdf-gmp install-pdf-gmp
+maybe-install-pdf-gmp:
+@if gmp
+maybe-install-pdf-gmp: install-pdf-gmp
 
-install-pdf-fileutils: \
-    configure-fileutils \
-    pdf-fileutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
+install-pdf-gmp: \
+    configure-gmp \
+    pdf-gmp 
+       @[ -f ./gmp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -12282,26 +11059,25 @@ install-pdf-fileutils: \
                  install-pdf) \
          || exit 1
 
-@endif fileutils
+@endif gmp
 
-.PHONY: maybe-install-html-fileutils install-html-fileutils
-maybe-install-html-fileutils:
-@if fileutils
-maybe-install-html-fileutils: install-html-fileutils
+.PHONY: maybe-install-html-gmp install-html-gmp
+maybe-install-html-gmp:
+@if gmp
+maybe-install-html-gmp: install-html-gmp
 
-install-html-fileutils: \
-    configure-fileutils \
-    html-fileutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
+install-html-gmp: \
+    configure-gmp \
+    html-gmp 
+       @[ -f ./gmp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -12309,25 +11085,24 @@ install-html-fileutils: \
                  install-html) \
          || exit 1
 
-@endif fileutils
+@endif gmp
 
-.PHONY: maybe-installcheck-fileutils installcheck-fileutils
-maybe-installcheck-fileutils:
-@if fileutils
-maybe-installcheck-fileutils: installcheck-fileutils
+.PHONY: maybe-installcheck-gmp installcheck-gmp
+maybe-installcheck-gmp:
+@if gmp
+maybe-installcheck-gmp: installcheck-gmp
 
-installcheck-fileutils: \
-    configure-fileutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
+installcheck-gmp: \
+    configure-gmp 
+       @[ -f ./gmp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -12335,24 +11110,23 @@ installcheck-fileutils: \
                  installcheck) \
          || exit 1
 
-@endif fileutils
+@endif gmp
 
-.PHONY: maybe-mostlyclean-fileutils mostlyclean-fileutils
-maybe-mostlyclean-fileutils:
-@if fileutils
-maybe-mostlyclean-fileutils: mostlyclean-fileutils
+.PHONY: maybe-mostlyclean-gmp mostlyclean-gmp
+maybe-mostlyclean-gmp:
+@if gmp
+maybe-mostlyclean-gmp: mostlyclean-gmp
 
-mostlyclean-fileutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
+mostlyclean-gmp: 
+       @[ -f ./gmp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -12360,24 +11134,23 @@ mostlyclean-fileutils:
                  mostlyclean) \
          || exit 1
 
-@endif fileutils
+@endif gmp
 
-.PHONY: maybe-clean-fileutils clean-fileutils
-maybe-clean-fileutils:
-@if fileutils
-maybe-clean-fileutils: clean-fileutils
+.PHONY: maybe-clean-gmp clean-gmp
+maybe-clean-gmp:
+@if gmp
+maybe-clean-gmp: clean-gmp
 
-clean-fileutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
+clean-gmp: 
+       @[ -f ./gmp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -12385,24 +11158,23 @@ clean-fileutils:
                  clean) \
          || exit 1
 
-@endif fileutils
+@endif gmp
 
-.PHONY: maybe-distclean-fileutils distclean-fileutils
-maybe-distclean-fileutils:
-@if fileutils
-maybe-distclean-fileutils: distclean-fileutils
+.PHONY: maybe-distclean-gmp distclean-gmp
+maybe-distclean-gmp:
+@if gmp
+maybe-distclean-gmp: distclean-gmp
 
-distclean-fileutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
+distclean-gmp: 
+       @[ -f ./gmp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -12410,24 +11182,23 @@ distclean-fileutils:
                  distclean) \
          || exit 1
 
-@endif fileutils
+@endif gmp
 
-.PHONY: maybe-maintainer-clean-fileutils maintainer-clean-fileutils
-maybe-maintainer-clean-fileutils:
-@if fileutils
-maybe-maintainer-clean-fileutils: maintainer-clean-fileutils
+.PHONY: maybe-maintainer-clean-gmp maintainer-clean-gmp
+maybe-maintainer-clean-gmp:
+@if gmp
+maybe-maintainer-clean-gmp: maintainer-clean-gmp
 
-maintainer-clean-fileutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fileutils/Makefile ] || exit 0; \
+maintainer-clean-gmp: 
+       @[ -f ./gmp/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -12435,568 +11206,575 @@ maintainer-clean-fileutils:
                  maintainer-clean) \
          || exit 1
 
-@endif fileutils
+@endif gmp
 
 
 
-.PHONY: configure-findutils maybe-configure-findutils
-maybe-configure-findutils:
+.PHONY: configure-mpfr maybe-configure-mpfr
+maybe-configure-mpfr:
 @if gcc-bootstrap
-configure-findutils: stage_current
+configure-mpfr: 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 ; \
+@if mpfr
+maybe-configure-mpfr: configure-mpfr
+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)  \
-       echo Configuring in $(HOST_SUBDIR)/findutils; \
-       cd "$(HOST_SUBDIR)/findutils" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/mpfr; \
+       cd "$(HOST_SUBDIR)/mpfr" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/findutils/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/findutils"; \
-       libsrcdir="$$s/findutils"; \
+       srcdiroption="--srcdir=$${topdir}/mpfr"; \
+       libsrcdir="$$s/mpfr"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias} $${srcdiroption} --disable-shared @extra_mpfr_configure_flags@ \
          || 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
-
-
+@endif mpfr
 
 
-.PHONY: check-findutils maybe-check-findutils
-maybe-check-findutils:
-@if findutils
-maybe-check-findutils: check-findutils
 
-check-findutils:
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage1-mpfr maybe-configure-stage1-mpfr
+maybe-configure-stage1-mpfr:
+@if mpfr-bootstrap
+maybe-configure-stage1-mpfr: configure-stage1-mpfr
+configure-stage1-mpfr:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(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) \
-       (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
+       CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/mpfr ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+       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=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         $(STAGE1_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpfr_configure_flags@
+@endif mpfr-bootstrap
 
-install-findutils: installdirs
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage2-mpfr maybe-configure-stage2-mpfr
+maybe-configure-stage2-mpfr:
+@if mpfr-bootstrap
+maybe-configure-stage2-mpfr: configure-stage2-mpfr
+configure-stage2-mpfr:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(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) \
-       (cd $(HOST_SUBDIR)/findutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif findutils
-
-.PHONY: install-strip-findutils maybe-install-strip-findutils
-maybe-install-strip-findutils:
-@if findutils
-maybe-install-strip-findutils: install-strip-findutils
+       $(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)/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=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE2_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpfr_configure_flags@
+@endif mpfr-bootstrap
 
-install-strip-findutils: installdirs
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage3-mpfr maybe-configure-stage3-mpfr
+maybe-configure-stage3-mpfr:
+@if mpfr-bootstrap
+maybe-configure-stage3-mpfr: configure-stage3-mpfr
+configure-stage3-mpfr:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(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) \
-       (cd $(HOST_SUBDIR)/findutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif findutils
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-findutils info-findutils
-maybe-info-findutils:
-@if findutils
-maybe-info-findutils: info-findutils
+       $(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)/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=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE3_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpfr_configure_flags@
+@endif mpfr-bootstrap
 
-info-findutils: \
-    configure-findutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: configure-stage4-mpfr maybe-configure-stage4-mpfr
+maybe-configure-stage4-mpfr:
+@if mpfr-bootstrap
+maybe-configure-stage4-mpfr: configure-stage4-mpfr
+configure-stage4-mpfr:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(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) \
-       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
+       $(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)/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=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE4_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpfr_configure_flags@
+@endif mpfr-bootstrap
 
-dvi-findutils: \
-    configure-findutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: configure-stageprofile-mpfr maybe-configure-stageprofile-mpfr
+maybe-configure-stageprofile-mpfr:
+@if mpfr-bootstrap
+maybe-configure-stageprofile-mpfr: configure-stageprofile-mpfr
+configure-stageprofile-mpfr:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(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) \
-       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
+       $(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=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEprofile_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpfr_configure_flags@
+@endif mpfr-bootstrap
 
-pdf-findutils: \
-    configure-findutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: configure-stagefeedback-mpfr maybe-configure-stagefeedback-mpfr
+maybe-configure-stagefeedback-mpfr:
+@if mpfr-bootstrap
+maybe-configure-stagefeedback-mpfr: configure-stagefeedback-mpfr
+configure-stagefeedback-mpfr:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(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) \
-       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
+       $(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=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEfeedback_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpfr_configure_flags@
+@endif mpfr-bootstrap
 
-.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; \
+.PHONY: all-mpfr maybe-all-mpfr
+maybe-all-mpfr:
+@if gcc-bootstrap
+all-mpfr: stage_current
+@endif gcc-bootstrap
+@if mpfr
+TARGET-mpfr=all
+maybe-all-mpfr: all-mpfr
+all-mpfr: configure-mpfr
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/mpfr && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+               $(TARGET-mpfr))
+@endif mpfr
 
-@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; \
+.PHONY: all-stage1-mpfr maybe-all-stage1-mpfr
+.PHONY: clean-stage1-mpfr maybe-clean-stage1-mpfr
+maybe-all-stage1-mpfr:
+maybe-clean-stage1-mpfr:
+@if mpfr-bootstrap
+maybe-all-stage1-mpfr: all-stage1-mpfr
+all-stage1: all-stage1-mpfr
+TARGET-stage1-mpfr = $(TARGET-mpfr)
+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) \
-       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
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/mpfr && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE1_CFLAGS)" \
+               CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+               LIBCFLAGS="$(LIBCFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS)   \
+               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(TARGET-stage1-mpfr)
 
-@endif findutils
+maybe-clean-stage1-mpfr: clean-stage1-mpfr
+clean-stage1: clean-stage1-mpfr
+clean-stage1-mpfr:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-mpfr/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/mpfr && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+                clean
+@endif mpfr-bootstrap
 
-.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; \
+.PHONY: all-stage2-mpfr maybe-all-stage2-mpfr
+.PHONY: clean-stage2-mpfr maybe-clean-stage2-mpfr
+maybe-all-stage2-mpfr:
+maybe-clean-stage2-mpfr:
+@if mpfr-bootstrap
+maybe-all-stage2-mpfr: all-stage2-mpfr
+all-stage2: all-stage2-mpfr
+TARGET-stage2-mpfr = $(TARGET-mpfr)
+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) \
-       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
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/mpfr && \
+       $(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-mpfr)
 
-@endif findutils
+maybe-clean-stage2-mpfr: clean-stage2-mpfr
+clean-stage2: clean-stage2-mpfr
+clean-stage2-mpfr:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-mpfr/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/mpfr && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                clean
+@endif mpfr-bootstrap
 
-.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; \
+.PHONY: all-stage3-mpfr maybe-all-stage3-mpfr
+.PHONY: clean-stage3-mpfr maybe-clean-stage3-mpfr
+maybe-all-stage3-mpfr:
+maybe-clean-stage3-mpfr:
+@if mpfr-bootstrap
+maybe-all-stage3-mpfr: all-stage3-mpfr
+all-stage3: all-stage3-mpfr
+TARGET-stage3-mpfr = $(TARGET-mpfr)
+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) \
-       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
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/mpfr && \
+       $(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-mpfr)
 
-@endif findutils
+maybe-clean-stage3-mpfr: clean-stage3-mpfr
+clean-stage3: clean-stage3-mpfr
+clean-stage3-mpfr:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-mpfr/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/mpfr && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                clean
+@endif mpfr-bootstrap
 
-.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; \
+.PHONY: all-stage4-mpfr maybe-all-stage4-mpfr
+.PHONY: clean-stage4-mpfr maybe-clean-stage4-mpfr
+maybe-all-stage4-mpfr:
+maybe-clean-stage4-mpfr:
+@if mpfr-bootstrap
+maybe-all-stage4-mpfr: all-stage4-mpfr
+all-stage4: all-stage4-mpfr
+TARGET-stage4-mpfr = $(TARGET-mpfr)
+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) \
-       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
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/mpfr && \
+       $(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-mpfr)
 
-@endif findutils
+maybe-clean-stage4-mpfr: clean-stage4-mpfr
+clean-stage4: clean-stage4-mpfr
+clean-stage4-mpfr:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-mpfr/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/mpfr && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                clean
+@endif mpfr-bootstrap
 
-.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; \
+.PHONY: all-stageprofile-mpfr maybe-all-stageprofile-mpfr
+.PHONY: clean-stageprofile-mpfr maybe-clean-stageprofile-mpfr
+maybe-all-stageprofile-mpfr:
+maybe-clean-stageprofile-mpfr:
+@if mpfr-bootstrap
+maybe-all-stageprofile-mpfr: all-stageprofile-mpfr
+all-stageprofile: all-stageprofile-mpfr
+TARGET-stageprofile-mpfr = $(TARGET-mpfr)
+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) \
-       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
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/mpfr && \
+       $(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-mpfr)
 
+maybe-clean-stageprofile-mpfr: clean-stageprofile-mpfr
+clean-stageprofile: clean-stageprofile-mpfr
+clean-stageprofile-mpfr:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-mpfr/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/mpfr && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                clean
+@endif mpfr-bootstrap
 
 
-.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)
+.PHONY: all-stagefeedback-mpfr maybe-all-stagefeedback-mpfr
+.PHONY: clean-stagefeedback-mpfr maybe-clean-stagefeedback-mpfr
+maybe-all-stagefeedback-mpfr:
+maybe-clean-stagefeedback-mpfr:
+@if mpfr-bootstrap
+maybe-all-stagefeedback-mpfr: all-stagefeedback-mpfr
+all-stagefeedback: all-stagefeedback-mpfr
+TARGET-stagefeedback-mpfr = $(TARGET-mpfr)
+all-stagefeedback-mpfr: configure-stagefeedback-mpfr
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
        @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
-
-
-
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/mpfr && \
+       $(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-mpfr)
 
+maybe-clean-stagefeedback-mpfr: clean-stagefeedback-mpfr
+clean-stagefeedback: clean-stagefeedback-mpfr
+clean-stagefeedback-mpfr:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-mpfr/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/mpfr && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                clean
+@endif mpfr-bootstrap
 
-.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
+.PHONY: check-mpfr maybe-check-mpfr
+maybe-check-mpfr:
+@if mpfr
+maybe-check-mpfr: check-mpfr
 
-check-find:
+check-mpfr:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/find && \
+       (cd $(HOST_SUBDIR)/mpfr && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif find
+@endif mpfr
 
-.PHONY: install-find maybe-install-find
-maybe-install-find:
-@if find
-maybe-install-find: install-find
+.PHONY: install-mpfr maybe-install-mpfr
+maybe-install-mpfr:
+@if mpfr
+maybe-install-mpfr: install-mpfr
 
-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)
+install-mpfr:
 
-@endif find
+@endif mpfr
 
-.PHONY: install-strip-find maybe-install-strip-find
-maybe-install-strip-find:
-@if find
-maybe-install-strip-find: install-strip-find
+.PHONY: install-strip-mpfr maybe-install-strip-mpfr
+maybe-install-strip-mpfr:
+@if mpfr
+maybe-install-strip-mpfr: install-strip-mpfr
 
-install-strip-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-strip)
+install-strip-mpfr:
 
-@endif find
+@endif mpfr
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-find info-find
-maybe-info-find:
-@if find
-maybe-info-find: info-find
+.PHONY: maybe-info-mpfr info-mpfr
+maybe-info-mpfr:
+@if mpfr
+maybe-info-mpfr: info-mpfr
 
-info-find: \
-    configure-find 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
+info-mpfr: \
+    configure-mpfr 
+       @[ -f ./mpfr/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -13004,25 +11782,24 @@ info-find: \
                  info) \
          || exit 1
 
-@endif find
+@endif mpfr
 
-.PHONY: maybe-dvi-find dvi-find
-maybe-dvi-find:
-@if find
-maybe-dvi-find: dvi-find
+.PHONY: maybe-dvi-mpfr dvi-mpfr
+maybe-dvi-mpfr:
+@if mpfr
+maybe-dvi-mpfr: dvi-mpfr
 
-dvi-find: \
-    configure-find 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
+dvi-mpfr: \
+    configure-mpfr 
+       @[ -f ./mpfr/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -13030,25 +11807,24 @@ dvi-find: \
                  dvi) \
          || exit 1
 
-@endif find
+@endif mpfr
 
-.PHONY: maybe-pdf-find pdf-find
-maybe-pdf-find:
-@if find
-maybe-pdf-find: pdf-find
+.PHONY: maybe-pdf-mpfr pdf-mpfr
+maybe-pdf-mpfr:
+@if mpfr
+maybe-pdf-mpfr: pdf-mpfr
 
-pdf-find: \
-    configure-find 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
+pdf-mpfr: \
+    configure-mpfr 
+       @[ -f ./mpfr/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -13056,25 +11832,24 @@ pdf-find: \
                  pdf) \
          || exit 1
 
-@endif find
+@endif mpfr
 
-.PHONY: maybe-html-find html-find
-maybe-html-find:
-@if find
-maybe-html-find: html-find
+.PHONY: maybe-html-mpfr html-mpfr
+maybe-html-mpfr:
+@if mpfr
+maybe-html-mpfr: html-mpfr
 
-html-find: \
-    configure-find 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
+html-mpfr: \
+    configure-mpfr 
+       @[ -f ./mpfr/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -13082,25 +11857,24 @@ html-find: \
                  html) \
          || exit 1
 
-@endif find
+@endif mpfr
 
-.PHONY: maybe-TAGS-find TAGS-find
-maybe-TAGS-find:
-@if find
-maybe-TAGS-find: TAGS-find
+.PHONY: maybe-TAGS-mpfr TAGS-mpfr
+maybe-TAGS-mpfr:
+@if mpfr
+maybe-TAGS-mpfr: TAGS-mpfr
 
-TAGS-find: \
-    configure-find 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
+TAGS-mpfr: \
+    configure-mpfr 
+       @[ -f ./mpfr/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -13108,26 +11882,25 @@ TAGS-find: \
                  TAGS) \
          || exit 1
 
-@endif find
+@endif mpfr
 
-.PHONY: maybe-install-info-find install-info-find
-maybe-install-info-find:
-@if find
-maybe-install-info-find: install-info-find
+.PHONY: maybe-install-info-mpfr install-info-mpfr
+maybe-install-info-mpfr:
+@if mpfr
+maybe-install-info-mpfr: install-info-mpfr
 
-install-info-find: \
-    configure-find \
-    info-find 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
+install-info-mpfr: \
+    configure-mpfr \
+    info-mpfr 
+       @[ -f ./mpfr/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -13135,26 +11908,25 @@ install-info-find: \
                  install-info) \
          || exit 1
 
-@endif find
+@endif mpfr
 
-.PHONY: maybe-install-pdf-find install-pdf-find
-maybe-install-pdf-find:
-@if find
-maybe-install-pdf-find: install-pdf-find
+.PHONY: maybe-install-pdf-mpfr install-pdf-mpfr
+maybe-install-pdf-mpfr:
+@if mpfr
+maybe-install-pdf-mpfr: install-pdf-mpfr
 
-install-pdf-find: \
-    configure-find \
-    pdf-find 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
+install-pdf-mpfr: \
+    configure-mpfr \
+    pdf-mpfr 
+       @[ -f ./mpfr/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -13162,26 +11934,25 @@ install-pdf-find: \
                  install-pdf) \
          || exit 1
 
-@endif find
+@endif mpfr
 
-.PHONY: maybe-install-html-find install-html-find
-maybe-install-html-find:
-@if find
-maybe-install-html-find: install-html-find
+.PHONY: maybe-install-html-mpfr install-html-mpfr
+maybe-install-html-mpfr:
+@if mpfr
+maybe-install-html-mpfr: install-html-mpfr
 
-install-html-find: \
-    configure-find \
-    html-find 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
+install-html-mpfr: \
+    configure-mpfr \
+    html-mpfr 
+       @[ -f ./mpfr/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -13189,25 +11960,24 @@ install-html-find: \
                  install-html) \
          || exit 1
 
-@endif find
+@endif mpfr
 
-.PHONY: maybe-installcheck-find installcheck-find
-maybe-installcheck-find:
-@if find
-maybe-installcheck-find: installcheck-find
+.PHONY: maybe-installcheck-mpfr installcheck-mpfr
+maybe-installcheck-mpfr:
+@if mpfr
+maybe-installcheck-mpfr: installcheck-mpfr
 
-installcheck-find: \
-    configure-find 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
+installcheck-mpfr: \
+    configure-mpfr 
+       @[ -f ./mpfr/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -13215,24 +11985,23 @@ installcheck-find: \
                  installcheck) \
          || exit 1
 
-@endif find
+@endif mpfr
 
-.PHONY: maybe-mostlyclean-find mostlyclean-find
-maybe-mostlyclean-find:
-@if find
-maybe-mostlyclean-find: mostlyclean-find
+.PHONY: maybe-mostlyclean-mpfr mostlyclean-mpfr
+maybe-mostlyclean-mpfr:
+@if mpfr
+maybe-mostlyclean-mpfr: mostlyclean-mpfr
 
-mostlyclean-find: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
+mostlyclean-mpfr: 
+       @[ -f ./mpfr/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -13240,24 +12009,23 @@ mostlyclean-find:
                  mostlyclean) \
          || exit 1
 
-@endif find
+@endif mpfr
 
-.PHONY: maybe-clean-find clean-find
-maybe-clean-find:
-@if find
-maybe-clean-find: clean-find
+.PHONY: maybe-clean-mpfr clean-mpfr
+maybe-clean-mpfr:
+@if mpfr
+maybe-clean-mpfr: clean-mpfr
 
-clean-find: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
+clean-mpfr: 
+       @[ -f ./mpfr/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -13265,24 +12033,23 @@ clean-find:
                  clean) \
          || exit 1
 
-@endif find
+@endif mpfr
 
-.PHONY: maybe-distclean-find distclean-find
-maybe-distclean-find:
-@if find
-maybe-distclean-find: distclean-find
+.PHONY: maybe-distclean-mpfr distclean-mpfr
+maybe-distclean-mpfr:
+@if mpfr
+maybe-distclean-mpfr: distclean-mpfr
 
-distclean-find: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
+distclean-mpfr: 
+       @[ -f ./mpfr/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -13290,24 +12057,23 @@ distclean-find:
                  distclean) \
          || exit 1
 
-@endif find
+@endif mpfr
 
-.PHONY: maybe-maintainer-clean-find maintainer-clean-find
-maybe-maintainer-clean-find:
-@if find
-maybe-maintainer-clean-find: maintainer-clean-find
+.PHONY: maybe-maintainer-clean-mpfr maintainer-clean-mpfr
+maybe-maintainer-clean-mpfr:
+@if mpfr
+maybe-maintainer-clean-mpfr: maintainer-clean-mpfr
 
-maintainer-clean-find: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./find/Makefile ] || exit 0; \
+maintainer-clean-mpfr: 
+       @[ -f ./mpfr/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -13315,128 +12081,575 @@ maintainer-clean-find:
                  maintainer-clean) \
          || exit 1
 
-@endif find
+@endif mpfr
 
 
 
-.PHONY: configure-fixincludes maybe-configure-fixincludes
-maybe-configure-fixincludes:
+.PHONY: configure-mpc maybe-configure-mpc
+maybe-configure-mpc:
 @if gcc-bootstrap
-configure-fixincludes: stage_current
+configure-mpc: stage_current
 @endif gcc-bootstrap
-@if fixincludes
-maybe-configure-fixincludes: configure-fixincludes
-configure-fixincludes: 
-       @: $(MAKE); $(unstage)
+@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)/fixincludes/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \
+       test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/fixincludes; \
-       cd "$(HOST_SUBDIR)/fixincludes" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/mpc; \
+       cd "$(HOST_SUBDIR)/mpc" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/fixincludes"; \
-       libsrcdir="$$s/fixincludes"; \
+       srcdiroption="--srcdir=$${topdir}/mpc"; \
+       libsrcdir="$$s/mpc"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias} $${srcdiroption} --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ \
          || 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
-
-
+@endif mpc
 
 
-.PHONY: check-fixincludes maybe-check-fixincludes
-maybe-check-fixincludes:
-@if fixincludes
-maybe-check-fixincludes: check-fixincludes
 
-check-fixincludes:
-       @: $(MAKE); $(unstage)
+.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)/mpc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
        $(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
+       CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/mpc ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
+       cd $(HOST_SUBDIR)/mpc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/mpc"; \
+       libsrcdir="$$s/mpc"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         $(STAGE1_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
+@endif mpc-bootstrap
 
-install-fixincludes: installdirs
-       @: $(MAKE); $(unstage)
+.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)/mpc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/fixincludes && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif fixincludes
-
-.PHONY: install-strip-fixincludes maybe-install-strip-fixincludes
-maybe-install-strip-fixincludes:
-@if fixincludes
-maybe-install-strip-fixincludes: install-strip-fixincludes
+       $(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)/mpc ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
+       cd $(HOST_SUBDIR)/mpc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/mpc"; \
+       libsrcdir="$$s/mpc"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE2_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
+@endif mpc-bootstrap
 
-install-strip-fixincludes: installdirs
-       @: $(MAKE); $(unstage)
+.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)/mpc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/fixincludes && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif fixincludes
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-fixincludes info-fixincludes
-maybe-info-fixincludes:
-@if fixincludes
-maybe-info-fixincludes: info-fixincludes
+       $(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)/mpc ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
+       cd $(HOST_SUBDIR)/mpc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/mpc"; \
+       libsrcdir="$$s/mpc"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE3_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
+@endif mpc-bootstrap
 
-info-fixincludes: \
-    configure-fixincludes 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fixincludes/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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)/mpc
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/mpc/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)/mpc ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
+       cd $(HOST_SUBDIR)/mpc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/mpc"; \
+       libsrcdir="$$s/mpc"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(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)/mpc
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/mpc/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)/mpc ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
+       cd $(HOST_SUBDIR)/mpc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/mpc"; \
+       libsrcdir="$$s/mpc"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(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)/mpc
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/mpc/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)/mpc ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
+       cd $(HOST_SUBDIR)/mpc || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/mpc"; \
+       libsrcdir="$$s/mpc"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEfeedback_CONFIGURE_FLAGS) \
+         --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
+@endif mpc-bootstrap
+
+
+
+
+
+.PHONY: all-mpc maybe-all-mpc
+maybe-all-mpc:
+@if gcc-bootstrap
+all-mpc: stage_current
+@endif gcc-bootstrap
+@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)/mpc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+               $(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; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/mpc && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE1_CFLAGS)" \
+               CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+               LIBCFLAGS="$(LIBCFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS)   \
+               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(TARGET-stage1-mpc)
+
+maybe-clean-stage1-mpc: clean-stage1-mpc
+clean-stage1: clean-stage1-mpc
+clean-stage1-mpc:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-mpc/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/mpc && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+                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)/mpc && \
+       $(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-mpc)
+
+maybe-clean-stage2-mpc: clean-stage2-mpc
+clean-stage2: clean-stage2-mpc
+clean-stage2-mpc:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-mpc/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       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)/mpc && \
+       $(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-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)/stage3-mpc/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       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)/mpc && \
+       $(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-mpc)
+
+maybe-clean-stage4-mpc: clean-stage4-mpc
+clean-stage4: clean-stage4-mpc
+clean-stage4-mpc:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-mpc/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       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)/mpc && \
+       $(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-mpc)
+
+maybe-clean-stageprofile-mpc: clean-stageprofile-mpc
+clean-stageprofile: clean-stageprofile-mpc
+clean-stageprofile-mpc:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-mpc/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       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)/mpc && \
+       $(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-mpc)
+
+maybe-clean-stagefeedback-mpc: clean-stagefeedback-mpc
+clean-stagefeedback: clean-stagefeedback-mpc
+clean-stagefeedback-mpc:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-mpc/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/mpc && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                clean
+@endif mpc-bootstrap
+
+
+
+
+
+.PHONY: check-mpc maybe-check-mpc
+maybe-check-mpc:
+@if mpc
+maybe-check-mpc: check-mpc
+
+check-mpc:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/mpc && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif mpc
+
+.PHONY: install-mpc maybe-install-mpc
+maybe-install-mpc:
+@if mpc
+maybe-install-mpc: install-mpc
+
+install-mpc:
+
+@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-mpc info-mpc
+maybe-info-mpc:
+@if mpc
+maybe-info-mpc: info-mpc
+
+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 fixincludes" ; \
-       (cd $(HOST_SUBDIR)/fixincludes && \
+       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}" \
@@ -13444,25 +12657,24 @@ info-fixincludes: \
                  info) \
          || exit 1
 
-@endif fixincludes
+@endif mpc
 
-.PHONY: maybe-dvi-fixincludes dvi-fixincludes
-maybe-dvi-fixincludes:
-@if fixincludes
-maybe-dvi-fixincludes: dvi-fixincludes
+.PHONY: maybe-dvi-mpc dvi-mpc
+maybe-dvi-mpc:
+@if mpc
+maybe-dvi-mpc: dvi-mpc
 
-dvi-fixincludes: \
-    configure-fixincludes 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fixincludes/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 fixincludes" ; \
-       (cd $(HOST_SUBDIR)/fixincludes && \
+       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}" \
@@ -13470,25 +12682,24 @@ dvi-fixincludes: \
                  dvi) \
          || exit 1
 
-@endif fixincludes
+@endif mpc
 
-.PHONY: maybe-pdf-fixincludes pdf-fixincludes
-maybe-pdf-fixincludes:
-@if fixincludes
-maybe-pdf-fixincludes: pdf-fixincludes
+.PHONY: maybe-pdf-mpc pdf-mpc
+maybe-pdf-mpc:
+@if mpc
+maybe-pdf-mpc: pdf-mpc
 
-pdf-fixincludes: \
-    configure-fixincludes 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fixincludes/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 fixincludes" ; \
-       (cd $(HOST_SUBDIR)/fixincludes && \
+       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}" \
@@ -13496,25 +12707,24 @@ pdf-fixincludes: \
                  pdf) \
          || exit 1
 
-@endif fixincludes
+@endif mpc
 
-.PHONY: maybe-html-fixincludes html-fixincludes
-maybe-html-fixincludes:
-@if fixincludes
-maybe-html-fixincludes: html-fixincludes
+.PHONY: maybe-html-mpc html-mpc
+maybe-html-mpc:
+@if mpc
+maybe-html-mpc: html-mpc
 
-html-fixincludes: \
-    configure-fixincludes 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fixincludes/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 fixincludes" ; \
-       (cd $(HOST_SUBDIR)/fixincludes && \
+       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}" \
@@ -13522,36 +12732,50 @@ html-fixincludes: \
                  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
+@endif mpc
 
-.PHONY: maybe-install-info-fixincludes install-info-fixincludes
-maybe-install-info-fixincludes:
-@if fixincludes
-maybe-install-info-fixincludes: install-info-fixincludes
+.PHONY: maybe-TAGS-mpc TAGS-mpc
+maybe-TAGS-mpc:
+@if mpc
+maybe-TAGS-mpc: TAGS-mpc
 
-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; \
+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 install-info in fixincludes" ; \
-       (cd $(HOST_SUBDIR)/fixincludes && \
+       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}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 TAGS) \
+         || exit 1
+
+@endif mpc
+
+.PHONY: maybe-install-info-mpc install-info-mpc
+maybe-install-info-mpc:
+@if mpc
+maybe-install-info-mpc: install-info-mpc
+
+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 mpc" ; \
+       (cd $(HOST_SUBDIR)/mpc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -13559,26 +12783,25 @@ install-info-fixincludes: \
                  install-info) \
          || exit 1
 
-@endif fixincludes
+@endif mpc
 
-.PHONY: maybe-install-pdf-fixincludes install-pdf-fixincludes
-maybe-install-pdf-fixincludes:
-@if fixincludes
-maybe-install-pdf-fixincludes: install-pdf-fixincludes
+.PHONY: maybe-install-pdf-mpc install-pdf-mpc
+maybe-install-pdf-mpc:
+@if mpc
+maybe-install-pdf-mpc: install-pdf-mpc
 
-install-pdf-fixincludes: \
-    configure-fixincludes \
-    pdf-fixincludes 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fixincludes/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 fixincludes" ; \
-       (cd $(HOST_SUBDIR)/fixincludes && \
+       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}" \
@@ -13586,26 +12809,25 @@ install-pdf-fixincludes: \
                  install-pdf) \
          || exit 1
 
-@endif fixincludes
+@endif mpc
 
-.PHONY: maybe-install-html-fixincludes install-html-fixincludes
-maybe-install-html-fixincludes:
-@if fixincludes
-maybe-install-html-fixincludes: install-html-fixincludes
+.PHONY: maybe-install-html-mpc install-html-mpc
+maybe-install-html-mpc:
+@if mpc
+maybe-install-html-mpc: install-html-mpc
 
-install-html-fixincludes: \
-    configure-fixincludes \
-    html-fixincludes 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fixincludes/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 fixincludes" ; \
-       (cd $(HOST_SUBDIR)/fixincludes && \
+       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}" \
@@ -13613,25 +12835,24 @@ install-html-fixincludes: \
                  install-html) \
          || exit 1
 
-@endif fixincludes
+@endif mpc
 
-.PHONY: maybe-installcheck-fixincludes installcheck-fixincludes
-maybe-installcheck-fixincludes:
-@if fixincludes
-maybe-installcheck-fixincludes: installcheck-fixincludes
+.PHONY: maybe-installcheck-mpc installcheck-mpc
+maybe-installcheck-mpc:
+@if mpc
+maybe-installcheck-mpc: installcheck-mpc
 
-installcheck-fixincludes: \
-    configure-fixincludes 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fixincludes/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 fixincludes" ; \
-       (cd $(HOST_SUBDIR)/fixincludes && \
+       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}" \
@@ -13639,24 +12860,23 @@ installcheck-fixincludes: \
                  installcheck) \
          || exit 1
 
-@endif fixincludes
+@endif mpc
 
-.PHONY: maybe-mostlyclean-fixincludes mostlyclean-fixincludes
-maybe-mostlyclean-fixincludes:
-@if fixincludes
-maybe-mostlyclean-fixincludes: mostlyclean-fixincludes
+.PHONY: maybe-mostlyclean-mpc mostlyclean-mpc
+maybe-mostlyclean-mpc:
+@if mpc
+maybe-mostlyclean-mpc: mostlyclean-mpc
 
-mostlyclean-fixincludes: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fixincludes/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 fixincludes" ; \
-       (cd $(HOST_SUBDIR)/fixincludes && \
+       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}" \
@@ -13664,24 +12884,23 @@ mostlyclean-fixincludes:
                  mostlyclean) \
          || exit 1
 
-@endif fixincludes
+@endif mpc
 
-.PHONY: maybe-clean-fixincludes clean-fixincludes
-maybe-clean-fixincludes:
-@if fixincludes
-maybe-clean-fixincludes: clean-fixincludes
+.PHONY: maybe-clean-mpc clean-mpc
+maybe-clean-mpc:
+@if mpc
+maybe-clean-mpc: clean-mpc
 
-clean-fixincludes: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fixincludes/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 fixincludes" ; \
-       (cd $(HOST_SUBDIR)/fixincludes && \
+       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}" \
@@ -13689,24 +12908,23 @@ clean-fixincludes:
                  clean) \
          || exit 1
 
-@endif fixincludes
+@endif mpc
 
-.PHONY: maybe-distclean-fixincludes distclean-fixincludes
-maybe-distclean-fixincludes:
-@if fixincludes
-maybe-distclean-fixincludes: distclean-fixincludes
+.PHONY: maybe-distclean-mpc distclean-mpc
+maybe-distclean-mpc:
+@if mpc
+maybe-distclean-mpc: distclean-mpc
 
-distclean-fixincludes: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fixincludes/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 fixincludes" ; \
-       (cd $(HOST_SUBDIR)/fixincludes && \
+       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}" \
@@ -13714,24 +12932,23 @@ distclean-fixincludes:
                  distclean) \
          || exit 1
 
-@endif fixincludes
+@endif mpc
 
-.PHONY: maybe-maintainer-clean-fixincludes maintainer-clean-fixincludes
-maybe-maintainer-clean-fixincludes:
-@if fixincludes
-maybe-maintainer-clean-fixincludes: maintainer-clean-fixincludes
+.PHONY: maybe-maintainer-clean-mpc maintainer-clean-mpc
+maybe-maintainer-clean-mpc:
+@if mpc
+maybe-maintainer-clean-mpc: maintainer-clean-mpc
 
-maintainer-clean-fixincludes: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./fixincludes/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 fixincludes" ; \
-       (cd $(HOST_SUBDIR)/fixincludes && \
+       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}" \
@@ -13739,131 +12956,575 @@ maintainer-clean-fixincludes:
                  maintainer-clean) \
          || exit 1
 
-@endif fixincludes
+@endif mpc
 
 
 
-.PHONY: configure-flex maybe-configure-flex
-maybe-configure-flex:
+.PHONY: configure-ppl maybe-configure-ppl
+maybe-configure-ppl:
 @if gcc-bootstrap
-configure-flex: stage_current
+configure-ppl: stage_current
 @endif gcc-bootstrap
-@if flex
-maybe-configure-flex: configure-flex
-configure-flex: 
-       @: $(MAKE); $(unstage)
+@if ppl
+maybe-configure-ppl: configure-ppl
+configure-ppl: 
        @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 ; \
+       test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/flex; \
-       cd "$(HOST_SUBDIR)/flex" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/ppl; \
+       cd "$(HOST_SUBDIR)/ppl" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/flex/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/ppl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/flex"; \
-       libsrcdir="$$s/flex"; \
+       srcdiroption="--srcdir=$${topdir}/ppl"; \
+       libsrcdir="$$s/ppl"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias} $${srcdiroption} --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/ \
          || exit 1
-@endif flex
+@endif ppl
 
 
 
+.PHONY: configure-stage1-ppl maybe-configure-stage1-ppl
+maybe-configure-stage1-ppl:
+@if ppl-bootstrap
+maybe-configure-stage1-ppl: configure-stage1-ppl
+configure-stage1-ppl:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/ppl/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)/ppl ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
+       cd $(HOST_SUBDIR)/ppl || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/ppl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/ppl"; \
+       libsrcdir="$$s/ppl"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         $(STAGE1_CONFIGURE_FLAGS) \
+         --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
+@endif ppl-bootstrap
 
+.PHONY: configure-stage2-ppl maybe-configure-stage2-ppl
+maybe-configure-stage2-ppl:
+@if ppl-bootstrap
+maybe-configure-stage2-ppl: configure-stage2-ppl
+configure-stage2-ppl:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/ppl/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)/ppl ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
+       cd $(HOST_SUBDIR)/ppl || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/ppl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/ppl"; \
+       libsrcdir="$$s/ppl"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE2_CONFIGURE_FLAGS) \
+         --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
+@endif ppl-bootstrap
 
-.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)
+.PHONY: configure-stage3-ppl maybe-configure-stage3-ppl
+maybe-configure-stage3-ppl:
+@if ppl-bootstrap
+maybe-configure-stage3-ppl: configure-stage3-ppl
+configure-stage3-ppl:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl
        @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
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/ppl/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)/ppl ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
+       cd $(HOST_SUBDIR)/ppl || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/ppl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/ppl"; \
+       libsrcdir="$$s/ppl"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE3_CONFIGURE_FLAGS) \
+         --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
+@endif ppl-bootstrap
 
+.PHONY: configure-stage4-ppl maybe-configure-stage4-ppl
+maybe-configure-stage4-ppl:
+@if ppl-bootstrap
+maybe-configure-stage4-ppl: configure-stage4-ppl
+configure-stage4-ppl:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/ppl/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)/ppl ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
+       cd $(HOST_SUBDIR)/ppl || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/ppl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/ppl"; \
+       libsrcdir="$$s/ppl"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE4_CONFIGURE_FLAGS) \
+         --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
+@endif ppl-bootstrap
 
+.PHONY: configure-stageprofile-ppl maybe-configure-stageprofile-ppl
+maybe-configure-stageprofile-ppl:
+@if ppl-bootstrap
+maybe-configure-stageprofile-ppl: configure-stageprofile-ppl
+configure-stageprofile-ppl:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/ppl/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)/ppl ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
+       cd $(HOST_SUBDIR)/ppl || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/ppl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/ppl"; \
+       libsrcdir="$$s/ppl"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEprofile_CONFIGURE_FLAGS) \
+         --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
+@endif ppl-bootstrap
 
+.PHONY: configure-stagefeedback-ppl maybe-configure-stagefeedback-ppl
+maybe-configure-stagefeedback-ppl:
+@if ppl-bootstrap
+maybe-configure-stagefeedback-ppl: configure-stagefeedback-ppl
+configure-stagefeedback-ppl:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/ppl/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)/ppl ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
+       cd $(HOST_SUBDIR)/ppl || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/ppl/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/ppl"; \
+       libsrcdir="$$s/ppl"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEfeedback_CONFIGURE_FLAGS) \
+         --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
+@endif ppl-bootstrap
 
-.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)
+.PHONY: all-ppl maybe-all-ppl
+maybe-all-ppl:
+@if gcc-bootstrap
+all-ppl: stage_current
+@endif gcc-bootstrap
+@if ppl
+TARGET-ppl=all
+maybe-all-ppl: all-ppl
+all-ppl: configure-ppl
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/flex && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/ppl && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+               $(TARGET-ppl))
+@endif ppl
 
-@endif flex
 
-.PHONY: install-strip-flex maybe-install-strip-flex
-maybe-install-strip-flex:
-@if flex
-maybe-install-strip-flex: install-strip-flex
 
-install-strip-flex: installdirs
-       @: $(MAKE); $(unstage)
+.PHONY: all-stage1-ppl maybe-all-stage1-ppl
+.PHONY: clean-stage1-ppl maybe-clean-stage1-ppl
+maybe-all-stage1-ppl:
+maybe-clean-stage1-ppl:
+@if ppl-bootstrap
+maybe-all-stage1-ppl: all-stage1-ppl
+all-stage1: all-stage1-ppl
+TARGET-stage1-ppl = $(TARGET-ppl)
+all-stage1-ppl: configure-stage1-ppl
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/flex && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif flex
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/ppl && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE1_CFLAGS)" \
+               CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+               LIBCFLAGS="$(LIBCFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS)   \
+               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(TARGET-stage1-ppl)
 
-# Other targets (info, dvi, pdf, etc.)
+maybe-clean-stage1-ppl: clean-stage1-ppl
+clean-stage1: clean-stage1-ppl
+clean-stage1-ppl:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-ppl/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/ppl && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+                clean
+@endif ppl-bootstrap
 
-.PHONY: maybe-info-flex info-flex
-maybe-info-flex:
-@if flex
-maybe-info-flex: info-flex
 
-info-flex: \
-    configure-flex 
+.PHONY: all-stage2-ppl maybe-all-stage2-ppl
+.PHONY: clean-stage2-ppl maybe-clean-stage2-ppl
+maybe-all-stage2-ppl:
+maybe-clean-stage2-ppl:
+@if ppl-bootstrap
+maybe-all-stage2-ppl: all-stage2-ppl
+all-stage2: all-stage2-ppl
+TARGET-stage2-ppl = $(TARGET-ppl)
+all-stage2-ppl: configure-stage2-ppl
+       @[ $(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)/ppl && \
+       $(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-ppl)
+
+maybe-clean-stage2-ppl: clean-stage2-ppl
+clean-stage2: clean-stage2-ppl
+clean-stage2-ppl:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage2-ppl/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/ppl && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                clean
+@endif ppl-bootstrap
+
+
+.PHONY: all-stage3-ppl maybe-all-stage3-ppl
+.PHONY: clean-stage3-ppl maybe-clean-stage3-ppl
+maybe-all-stage3-ppl:
+maybe-clean-stage3-ppl:
+@if ppl-bootstrap
+maybe-all-stage3-ppl: all-stage3-ppl
+all-stage3: all-stage3-ppl
+TARGET-stage3-ppl = $(TARGET-ppl)
+all-stage3-ppl: configure-stage3-ppl
+       @[ $(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)/ppl && \
+       $(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-ppl)
+
+maybe-clean-stage3-ppl: clean-stage3-ppl
+clean-stage3: clean-stage3-ppl
+clean-stage3-ppl:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage3-ppl/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/ppl && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                clean
+@endif ppl-bootstrap
+
+
+.PHONY: all-stage4-ppl maybe-all-stage4-ppl
+.PHONY: clean-stage4-ppl maybe-clean-stage4-ppl
+maybe-all-stage4-ppl:
+maybe-clean-stage4-ppl:
+@if ppl-bootstrap
+maybe-all-stage4-ppl: all-stage4-ppl
+all-stage4: all-stage4-ppl
+TARGET-stage4-ppl = $(TARGET-ppl)
+all-stage4-ppl: configure-stage4-ppl
+       @[ $(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)/ppl && \
+       $(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-ppl)
+
+maybe-clean-stage4-ppl: clean-stage4-ppl
+clean-stage4: clean-stage4-ppl
+clean-stage4-ppl:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage4-ppl/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/ppl && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                clean
+@endif ppl-bootstrap
+
+
+.PHONY: all-stageprofile-ppl maybe-all-stageprofile-ppl
+.PHONY: clean-stageprofile-ppl maybe-clean-stageprofile-ppl
+maybe-all-stageprofile-ppl:
+maybe-clean-stageprofile-ppl:
+@if ppl-bootstrap
+maybe-all-stageprofile-ppl: all-stageprofile-ppl
+all-stageprofile: all-stageprofile-ppl
+TARGET-stageprofile-ppl = $(TARGET-ppl)
+all-stageprofile-ppl: configure-stageprofile-ppl
+       @[ $(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)/ppl && \
+       $(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-ppl)
+
+maybe-clean-stageprofile-ppl: clean-stageprofile-ppl
+clean-stageprofile: clean-stageprofile-ppl
+clean-stageprofile-ppl:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stageprofile-ppl/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/ppl && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                clean
+@endif ppl-bootstrap
+
+
+.PHONY: all-stagefeedback-ppl maybe-all-stagefeedback-ppl
+.PHONY: clean-stagefeedback-ppl maybe-clean-stagefeedback-ppl
+maybe-all-stagefeedback-ppl:
+maybe-clean-stagefeedback-ppl:
+@if ppl-bootstrap
+maybe-all-stagefeedback-ppl: all-stagefeedback-ppl
+all-stagefeedback: all-stagefeedback-ppl
+TARGET-stagefeedback-ppl = $(TARGET-ppl)
+all-stagefeedback-ppl: configure-stagefeedback-ppl
+       @[ $(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)/ppl && \
+       $(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-ppl)
+
+maybe-clean-stagefeedback-ppl: clean-stagefeedback-ppl
+clean-stagefeedback: clean-stagefeedback-ppl
+clean-stagefeedback-ppl:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-ppl/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/ppl && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                clean
+@endif ppl-bootstrap
+
+
+
+
+
+.PHONY: check-ppl maybe-check-ppl
+maybe-check-ppl:
+@if ppl
+maybe-check-ppl: check-ppl
+
+check-ppl:
        @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/ppl && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
+
+@endif ppl
+
+.PHONY: install-ppl maybe-install-ppl
+maybe-install-ppl:
+@if ppl
+maybe-install-ppl: install-ppl
+
+install-ppl:
+
+@endif ppl
+
+.PHONY: install-strip-ppl maybe-install-strip-ppl
+maybe-install-strip-ppl:
+@if ppl
+maybe-install-strip-ppl: install-strip-ppl
+
+install-strip-ppl:
+
+@endif ppl
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-ppl info-ppl
+maybe-info-ppl:
+@if ppl
+maybe-info-ppl: info-ppl
+
+info-ppl: \
+    configure-ppl 
+       @[ -f ./ppl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       echo "Doing info in ppl" ; \
+       (cd $(HOST_SUBDIR)/ppl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -13871,25 +13532,24 @@ info-flex: \
                  info) \
          || exit 1
 
-@endif flex
+@endif ppl
 
-.PHONY: maybe-dvi-flex dvi-flex
-maybe-dvi-flex:
-@if flex
-maybe-dvi-flex: dvi-flex
+.PHONY: maybe-dvi-ppl dvi-ppl
+maybe-dvi-ppl:
+@if ppl
+maybe-dvi-ppl: dvi-ppl
 
-dvi-flex: \
-    configure-flex 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
+dvi-ppl: \
+    configure-ppl 
+       @[ -f ./ppl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       echo "Doing dvi in ppl" ; \
+       (cd $(HOST_SUBDIR)/ppl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -13897,25 +13557,24 @@ dvi-flex: \
                  dvi) \
          || exit 1
 
-@endif flex
+@endif ppl
 
-.PHONY: maybe-pdf-flex pdf-flex
-maybe-pdf-flex:
-@if flex
-maybe-pdf-flex: pdf-flex
+.PHONY: maybe-pdf-ppl pdf-ppl
+maybe-pdf-ppl:
+@if ppl
+maybe-pdf-ppl: pdf-ppl
 
-pdf-flex: \
-    configure-flex 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
+pdf-ppl: \
+    configure-ppl 
+       @[ -f ./ppl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       echo "Doing pdf in ppl" ; \
+       (cd $(HOST_SUBDIR)/ppl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -13923,25 +13582,24 @@ pdf-flex: \
                  pdf) \
          || exit 1
 
-@endif flex
+@endif ppl
 
-.PHONY: maybe-html-flex html-flex
-maybe-html-flex:
-@if flex
-maybe-html-flex: html-flex
+.PHONY: maybe-html-ppl html-ppl
+maybe-html-ppl:
+@if ppl
+maybe-html-ppl: html-ppl
 
-html-flex: \
-    configure-flex 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
+html-ppl: \
+    configure-ppl 
+       @[ -f ./ppl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       echo "Doing html in ppl" ; \
+       (cd $(HOST_SUBDIR)/ppl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -13949,25 +13607,24 @@ html-flex: \
                  html) \
          || exit 1
 
-@endif flex
+@endif ppl
 
-.PHONY: maybe-TAGS-flex TAGS-flex
-maybe-TAGS-flex:
-@if flex
-maybe-TAGS-flex: TAGS-flex
+.PHONY: maybe-TAGS-ppl TAGS-ppl
+maybe-TAGS-ppl:
+@if ppl
+maybe-TAGS-ppl: TAGS-ppl
 
-TAGS-flex: \
-    configure-flex 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
+TAGS-ppl: \
+    configure-ppl 
+       @[ -f ./ppl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       echo "Doing TAGS in ppl" ; \
+       (cd $(HOST_SUBDIR)/ppl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -13975,26 +13632,25 @@ TAGS-flex: \
                  TAGS) \
          || exit 1
 
-@endif flex
+@endif ppl
 
-.PHONY: maybe-install-info-flex install-info-flex
-maybe-install-info-flex:
-@if flex
-maybe-install-info-flex: install-info-flex
+.PHONY: maybe-install-info-ppl install-info-ppl
+maybe-install-info-ppl:
+@if ppl
+maybe-install-info-ppl: install-info-ppl
 
-install-info-flex: \
-    configure-flex \
-    info-flex 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
+install-info-ppl: \
+    configure-ppl \
+    info-ppl 
+       @[ -f ./ppl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       echo "Doing install-info in ppl" ; \
+       (cd $(HOST_SUBDIR)/ppl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -14002,26 +13658,25 @@ install-info-flex: \
                  install-info) \
          || exit 1
 
-@endif flex
+@endif ppl
 
-.PHONY: maybe-install-pdf-flex install-pdf-flex
-maybe-install-pdf-flex:
-@if flex
-maybe-install-pdf-flex: install-pdf-flex
+.PHONY: maybe-install-pdf-ppl install-pdf-ppl
+maybe-install-pdf-ppl:
+@if ppl
+maybe-install-pdf-ppl: install-pdf-ppl
 
-install-pdf-flex: \
-    configure-flex \
-    pdf-flex 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
+install-pdf-ppl: \
+    configure-ppl \
+    pdf-ppl 
+       @[ -f ./ppl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       echo "Doing install-pdf in ppl" ; \
+       (cd $(HOST_SUBDIR)/ppl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -14029,26 +13684,25 @@ install-pdf-flex: \
                  install-pdf) \
          || exit 1
 
-@endif flex
+@endif ppl
 
-.PHONY: maybe-install-html-flex install-html-flex
-maybe-install-html-flex:
-@if flex
-maybe-install-html-flex: install-html-flex
+.PHONY: maybe-install-html-ppl install-html-ppl
+maybe-install-html-ppl:
+@if ppl
+maybe-install-html-ppl: install-html-ppl
 
-install-html-flex: \
-    configure-flex \
-    html-flex 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
+install-html-ppl: \
+    configure-ppl \
+    html-ppl 
+       @[ -f ./ppl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       echo "Doing install-html in ppl" ; \
+       (cd $(HOST_SUBDIR)/ppl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -14056,25 +13710,24 @@ install-html-flex: \
                  install-html) \
          || exit 1
 
-@endif flex
+@endif ppl
 
-.PHONY: maybe-installcheck-flex installcheck-flex
-maybe-installcheck-flex:
-@if flex
-maybe-installcheck-flex: installcheck-flex
+.PHONY: maybe-installcheck-ppl installcheck-ppl
+maybe-installcheck-ppl:
+@if ppl
+maybe-installcheck-ppl: installcheck-ppl
 
-installcheck-flex: \
-    configure-flex 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
+installcheck-ppl: \
+    configure-ppl 
+       @[ -f ./ppl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       echo "Doing installcheck in ppl" ; \
+       (cd $(HOST_SUBDIR)/ppl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -14082,24 +13735,23 @@ installcheck-flex: \
                  installcheck) \
          || exit 1
 
-@endif flex
+@endif ppl
 
-.PHONY: maybe-mostlyclean-flex mostlyclean-flex
-maybe-mostlyclean-flex:
-@if flex
-maybe-mostlyclean-flex: mostlyclean-flex
+.PHONY: maybe-mostlyclean-ppl mostlyclean-ppl
+maybe-mostlyclean-ppl:
+@if ppl
+maybe-mostlyclean-ppl: mostlyclean-ppl
 
-mostlyclean-flex: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
+mostlyclean-ppl: 
+       @[ -f ./ppl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       echo "Doing mostlyclean in ppl" ; \
+       (cd $(HOST_SUBDIR)/ppl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -14107,24 +13759,23 @@ mostlyclean-flex:
                  mostlyclean) \
          || exit 1
 
-@endif flex
+@endif ppl
 
-.PHONY: maybe-clean-flex clean-flex
-maybe-clean-flex:
-@if flex
-maybe-clean-flex: clean-flex
+.PHONY: maybe-clean-ppl clean-ppl
+maybe-clean-ppl:
+@if ppl
+maybe-clean-ppl: clean-ppl
 
-clean-flex: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
+clean-ppl: 
+       @[ -f ./ppl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       echo "Doing clean in ppl" ; \
+       (cd $(HOST_SUBDIR)/ppl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -14132,24 +13783,23 @@ clean-flex:
                  clean) \
          || exit 1
 
-@endif flex
+@endif ppl
 
-.PHONY: maybe-distclean-flex distclean-flex
-maybe-distclean-flex:
-@if flex
-maybe-distclean-flex: distclean-flex
+.PHONY: maybe-distclean-ppl distclean-ppl
+maybe-distclean-ppl:
+@if ppl
+maybe-distclean-ppl: distclean-ppl
 
-distclean-flex: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
+distclean-ppl: 
+       @[ -f ./ppl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       echo "Doing distclean in ppl" ; \
+       (cd $(HOST_SUBDIR)/ppl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -14157,24 +13807,23 @@ distclean-flex:
                  distclean) \
          || exit 1
 
-@endif flex
+@endif ppl
 
-.PHONY: maybe-maintainer-clean-flex maintainer-clean-flex
-maybe-maintainer-clean-flex:
-@if flex
-maybe-maintainer-clean-flex: maintainer-clean-flex
+.PHONY: maybe-maintainer-clean-ppl maintainer-clean-ppl
+maybe-maintainer-clean-ppl:
+@if ppl
+maybe-maintainer-clean-ppl: maintainer-clean-ppl
 
-maintainer-clean-flex: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./flex/Makefile ] || exit 0; \
+maintainer-clean-ppl: 
+       @[ -f ./ppl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
+       echo "Doing maintainer-clean in ppl" ; \
+       (cd $(HOST_SUBDIR)/ppl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -14182,274 +13831,280 @@ maintainer-clean-flex:
                  maintainer-clean) \
          || exit 1
 
-@endif flex
+@endif ppl
 
 
 
-.PHONY: configure-gas maybe-configure-gas
-maybe-configure-gas:
+.PHONY: configure-cloog maybe-configure-cloog
+maybe-configure-cloog:
 @if gcc-bootstrap
-configure-gas: stage_current
+configure-cloog: stage_current
 @endif gcc-bootstrap
-@if gas
-maybe-configure-gas: configure-gas
-configure-gas: 
+@if cloog
+maybe-configure-cloog: configure-cloog
+configure-cloog: 
        @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; \
+       test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
+       $(HOST_EXPORTS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+       echo Configuring in $(HOST_SUBDIR)/cloog; \
+       cd "$(HOST_SUBDIR)/cloog" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
+       srcdiroption="--srcdir=$${topdir}/cloog"; \
+       libsrcdir="$$s/cloog"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias} $${srcdiroption} --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl \
          || exit 1
-@endif gas
+@endif cloog
 
 
 
-.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:
+.PHONY: configure-stage1-cloog maybe-configure-stage1-cloog
+maybe-configure-stage1-cloog:
+@if cloog-bootstrap
+maybe-configure-stage1-cloog: configure-stage1-cloog
+configure-stage1-cloog:
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/cloog/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; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/cloog ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
+       cd $(HOST_SUBDIR)/cloog || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
+       srcdiroption="--srcdir=$${topdir}/cloog"; \
+       libsrcdir="$$s/cloog"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption} \
-         $(STAGE1_CONFIGURE_FLAGS)
-@endif gas-bootstrap
+         $(STAGE1_CONFIGURE_FLAGS) \
+         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl
+@endif cloog-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:
+.PHONY: configure-stage2-cloog maybe-configure-stage2-cloog
+maybe-configure-stage2-cloog:
+@if cloog-bootstrap
+maybe-configure-stage2-cloog: configure-stage2-cloog
+configure-stage2-cloog:
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/cloog/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; \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/cloog ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
+       cd $(HOST_SUBDIR)/cloog || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
+       srcdiroption="--srcdir=$${topdir}/cloog"; \
+       libsrcdir="$$s/cloog"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE2_CONFIGURE_FLAGS)
-@endif gas-bootstrap
+         $(STAGE2_CONFIGURE_FLAGS) \
+         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl
+@endif cloog-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:
+.PHONY: configure-stage3-cloog maybe-configure-stage3-cloog
+maybe-configure-stage3-cloog:
+@if cloog-bootstrap
+maybe-configure-stage3-cloog: configure-stage3-cloog
+configure-stage3-cloog:
        @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/cloog/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)/gas ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
-       cd $(HOST_SUBDIR)/gas || exit 1; \
+       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/cloog ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
+       cd $(HOST_SUBDIR)/cloog || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
+       srcdiroption="--srcdir=$${topdir}/cloog"; \
+       libsrcdir="$$s/cloog"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE3_CONFIGURE_FLAGS)
-@endif gas-bootstrap
+         $(STAGE3_CONFIGURE_FLAGS) \
+         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl
+@endif cloog-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:
+.PHONY: configure-stage4-cloog maybe-configure-stage4-cloog
+maybe-configure-stage4-cloog:
+@if cloog-bootstrap
+maybe-configure-stage4-cloog: configure-stage4-cloog
+configure-stage4-cloog:
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/cloog/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; \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/cloog ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
+       cd $(HOST_SUBDIR)/cloog || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
+       srcdiroption="--srcdir=$${topdir}/cloog"; \
+       libsrcdir="$$s/cloog"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE4_CONFIGURE_FLAGS)
-@endif gas-bootstrap
+         $(STAGE4_CONFIGURE_FLAGS) \
+         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl
+@endif cloog-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:
+.PHONY: configure-stageprofile-cloog maybe-configure-stageprofile-cloog
+maybe-configure-stageprofile-cloog:
+@if cloog-bootstrap
+maybe-configure-stageprofile-cloog: configure-stageprofile-cloog
+configure-stageprofile-cloog:
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/cloog/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; \
+       LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+       echo Configuring stage profile in $(HOST_SUBDIR)/cloog ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
+       cd $(HOST_SUBDIR)/cloog || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
+       srcdiroption="--srcdir=$${topdir}/cloog"; \
+       libsrcdir="$$s/cloog"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEprofile_CONFIGURE_FLAGS)
-@endif gas-bootstrap
+         $(STAGEprofile_CONFIGURE_FLAGS) \
+         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl
+@endif cloog-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:
+.PHONY: configure-stagefeedback-cloog maybe-configure-stagefeedback-cloog
+maybe-configure-stagefeedback-cloog:
+@if cloog-bootstrap
+maybe-configure-stagefeedback-cloog: configure-stagefeedback-cloog
+configure-stagefeedback-cloog:
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/cloog/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; \
+       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/cloog ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
+       cd $(HOST_SUBDIR)/cloog || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gas"; \
-       libsrcdir="$$s/gas"; \
+       srcdiroption="--srcdir=$${topdir}/cloog"; \
+       libsrcdir="$$s/cloog"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif gas-bootstrap
+         $(STAGEfeedback_CONFIGURE_FLAGS) \
+         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl
+@endif cloog-bootstrap
 
 
 
 
 
-.PHONY: all-gas maybe-all-gas
-maybe-all-gas:
+.PHONY: all-cloog maybe-all-cloog
+maybe-all-cloog:
 @if gcc-bootstrap
-all-gas: stage_current
+all-cloog: stage_current
 @endif gcc-bootstrap
-@if gas
-TARGET-gas=all
-maybe-all-gas: all-gas
-all-gas: configure-gas
+@if cloog
+TARGET-cloog=all
+maybe-all-cloog: all-cloog
+all-cloog: configure-cloog
        @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
+       $(HOST_EXPORTS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+       (cd $(HOST_SUBDIR)/cloog && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" \
+               $(TARGET-cloog))
+@endif cloog
 
 
 
-.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
+.PHONY: all-stage1-cloog maybe-all-stage1-cloog
+.PHONY: clean-stage1-cloog maybe-clean-stage1-cloog
+maybe-all-stage1-cloog:
+maybe-clean-stage1-cloog:
+@if cloog-bootstrap
+maybe-all-stage1-cloog: all-stage1-cloog
+all-stage1: all-stage1-cloog
+TARGET-stage1-cloog = $(TARGET-cloog)
+all-stage1-cloog: configure-stage1-cloog
        @[ $(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 && \
+       $(HOST_EXPORTS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+       cd $(HOST_SUBDIR)/cloog && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -14457,41 +14112,41 @@ all-stage1-gas: configure-stage1-gas
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
+               $(EXTRA_HOST_FLAGS)  CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" \
                TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-gas)
+               $(TARGET-stage1-cloog)
 
-maybe-clean-stage1-gas: clean-stage1-gas
-clean-stage1: clean-stage1-gas
-clean-stage1-gas:
+maybe-clean-stage1-cloog: clean-stage1-cloog
+clean-stage1: clean-stage1-cloog
+clean-stage1-cloog:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage1-gas/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage1-cloog/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(HOST_SUBDIR)/gas && \
+       cd $(HOST_SUBDIR)/cloog && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
-@endif gas-bootstrap
+               CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" clean
+@endif cloog-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
+.PHONY: all-stage2-cloog maybe-all-stage2-cloog
+.PHONY: clean-stage2-cloog maybe-clean-stage2-cloog
+maybe-all-stage2-cloog:
+maybe-clean-stage2-cloog:
+@if cloog-bootstrap
+maybe-all-stage2-cloog: all-stage2-cloog
+all-stage2: all-stage2-cloog
+TARGET-stage2-cloog = $(TARGET-cloog)
+all-stage2-cloog: configure-stage2-cloog
        @[ $(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 && \
+       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+       cd $(HOST_SUBDIR)/cloog && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -14499,42 +14154,42 @@ all-stage2-gas: configure-stage2-gas
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" \
                TFLAGS="$(STAGE2_TFLAGS)" \
-               $(TARGET-stage2-gas)
+               $(TARGET-stage2-cloog)
 
-maybe-clean-stage2-gas: clean-stage2-gas
-clean-stage2: clean-stage2-gas
-clean-stage2-gas:
+maybe-clean-stage2-cloog: clean-stage2-cloog
+clean-stage2: clean-stage2-cloog
+clean-stage2-cloog:
        @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage2-gas/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage2-cloog/Makefile ] || exit 0; \
          $(MAKE) stage2-start; \
        fi; \
-       cd $(HOST_SUBDIR)/gas && \
+       cd $(HOST_SUBDIR)/cloog && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gas-bootstrap
+               CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" clean
+@endif cloog-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
+.PHONY: all-stage3-cloog maybe-all-stage3-cloog
+.PHONY: clean-stage3-cloog maybe-clean-stage3-cloog
+maybe-all-stage3-cloog:
+maybe-clean-stage3-cloog:
+@if cloog-bootstrap
+maybe-all-stage3-cloog: all-stage3-cloog
+all-stage3: all-stage3-cloog
+TARGET-stage3-cloog = $(TARGET-cloog)
+all-stage3-cloog: configure-stage3-cloog
        @[ $(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 && \
+       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+       cd $(HOST_SUBDIR)/cloog && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -14542,42 +14197,42 @@ all-stage3-gas: configure-stage3-gas
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" \
                TFLAGS="$(STAGE3_TFLAGS)" \
-               $(TARGET-stage3-gas)
+               $(TARGET-stage3-cloog)
 
-maybe-clean-stage3-gas: clean-stage3-gas
-clean-stage3: clean-stage3-gas
-clean-stage3-gas:
+maybe-clean-stage3-cloog: clean-stage3-cloog
+clean-stage3: clean-stage3-cloog
+clean-stage3-cloog:
        @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage3-gas/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage3-cloog/Makefile ] || exit 0; \
          $(MAKE) stage3-start; \
        fi; \
-       cd $(HOST_SUBDIR)/gas && \
+       cd $(HOST_SUBDIR)/cloog && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gas-bootstrap
+               CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" clean
+@endif cloog-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
+.PHONY: all-stage4-cloog maybe-all-stage4-cloog
+.PHONY: clean-stage4-cloog maybe-clean-stage4-cloog
+maybe-all-stage4-cloog:
+maybe-clean-stage4-cloog:
+@if cloog-bootstrap
+maybe-all-stage4-cloog: all-stage4-cloog
+all-stage4: all-stage4-cloog
+TARGET-stage4-cloog = $(TARGET-cloog)
+all-stage4-cloog: configure-stage4-cloog
        @[ $(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 && \
+       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+       cd $(HOST_SUBDIR)/cloog && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -14585,42 +14240,42 @@ all-stage4-gas: configure-stage4-gas
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" \
                TFLAGS="$(STAGE4_TFLAGS)" \
-               $(TARGET-stage4-gas)
+               $(TARGET-stage4-cloog)
 
-maybe-clean-stage4-gas: clean-stage4-gas
-clean-stage4: clean-stage4-gas
-clean-stage4-gas:
+maybe-clean-stage4-cloog: clean-stage4-cloog
+clean-stage4: clean-stage4-cloog
+clean-stage4-cloog:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage4-gas/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage4-cloog/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       cd $(HOST_SUBDIR)/gas && \
+       cd $(HOST_SUBDIR)/cloog && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gas-bootstrap
+               CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" clean
+@endif cloog-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
+.PHONY: all-stageprofile-cloog maybe-all-stageprofile-cloog
+.PHONY: clean-stageprofile-cloog maybe-clean-stageprofile-cloog
+maybe-all-stageprofile-cloog:
+maybe-clean-stageprofile-cloog:
+@if cloog-bootstrap
+maybe-all-stageprofile-cloog: all-stageprofile-cloog
+all-stageprofile: all-stageprofile-cloog
+TARGET-stageprofile-cloog = $(TARGET-cloog)
+all-stageprofile-cloog: configure-stageprofile-cloog
        @[ $(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 && \
+       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+       cd $(HOST_SUBDIR)/cloog && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -14628,42 +14283,42 @@ all-stageprofile-gas: configure-stageprofile-gas
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" \
                TFLAGS="$(STAGEprofile_TFLAGS)" \
-               $(TARGET-stageprofile-gas)
+               $(TARGET-stageprofile-cloog)
 
-maybe-clean-stageprofile-gas: clean-stageprofile-gas
-clean-stageprofile: clean-stageprofile-gas
-clean-stageprofile-gas:
+maybe-clean-stageprofile-cloog: clean-stageprofile-cloog
+clean-stageprofile: clean-stageprofile-cloog
+clean-stageprofile-cloog:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stageprofile-gas/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageprofile-cloog/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       cd $(HOST_SUBDIR)/gas && \
+       cd $(HOST_SUBDIR)/cloog && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gas-bootstrap
+               CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" clean
+@endif cloog-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
+.PHONY: all-stagefeedback-cloog maybe-all-stagefeedback-cloog
+.PHONY: clean-stagefeedback-cloog maybe-clean-stagefeedback-cloog
+maybe-all-stagefeedback-cloog:
+maybe-clean-stagefeedback-cloog:
+@if cloog-bootstrap
+maybe-all-stagefeedback-cloog: all-stagefeedback-cloog
+all-stagefeedback: all-stagefeedback-cloog
+TARGET-stagefeedback-cloog = $(TARGET-cloog)
+all-stagefeedback-cloog: configure-stagefeedback-cloog
        @[ $(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 && \
+       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
+       cd $(HOST_SUBDIR)/cloog && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -14671,92 +14326,80 @@ all-stagefeedback-gas: configure-stagefeedback-gas
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" \
                TFLAGS="$(STAGEfeedback_TFLAGS)" \
-               $(TARGET-stagefeedback-gas)
+               $(TARGET-stagefeedback-cloog)
 
-maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
-clean-stagefeedback: clean-stagefeedback-gas
-clean-stagefeedback-gas:
+maybe-clean-stagefeedback-cloog: clean-stagefeedback-cloog
+clean-stagefeedback: clean-stagefeedback-cloog
+clean-stagefeedback-cloog:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-gas/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stagefeedback-cloog/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       cd $(HOST_SUBDIR)/gas && \
+       cd $(HOST_SUBDIR)/cloog && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gas-bootstrap
+               CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" clean
+@endif cloog-bootstrap
 
 
 
 
 
-.PHONY: check-gas maybe-check-gas
-maybe-check-gas:
-@if gas
-maybe-check-gas: check-gas
+.PHONY: check-cloog maybe-check-cloog
+maybe-check-cloog:
+@if cloog
+maybe-check-cloog: check-cloog
 
-check-gas:
+check-cloog:
        @: $(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)
+       (cd $(HOST_SUBDIR)/cloog && \
+         $(MAKE) $(FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" check)
 
-@endif gas
+@endif cloog
 
-.PHONY: install-gas maybe-install-gas
-maybe-install-gas:
-@if gas
-maybe-install-gas: install-gas
+.PHONY: install-cloog maybe-install-cloog
+maybe-install-cloog:
+@if cloog
+maybe-install-cloog: install-cloog
 
-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)
+install-cloog:
 
-@endif gas
+@endif cloog
 
-.PHONY: install-strip-gas maybe-install-strip-gas
-maybe-install-strip-gas:
-@if gas
-maybe-install-strip-gas: install-strip-gas
+.PHONY: install-strip-cloog maybe-install-strip-cloog
+maybe-install-strip-cloog:
+@if cloog
+maybe-install-strip-cloog: install-strip-cloog
 
-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)
+install-strip-cloog:
 
-@endif gas
+@endif cloog
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-gas info-gas
-maybe-info-gas:
-@if gas
-maybe-info-gas: info-gas
+.PHONY: maybe-info-cloog info-cloog
+maybe-info-cloog:
+@if cloog
+maybe-info-cloog: info-cloog
 
-info-gas: \
-    configure-gas 
-       @[ -f ./gas/Makefile ] || exit 0; \
+info-cloog: \
+    configure-cloog 
+       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
+       echo "Doing info in cloog" ; \
+       (cd $(HOST_SUBDIR)/cloog && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -14764,24 +14407,24 @@ info-gas: \
                  info) \
          || exit 1
 
-@endif gas
+@endif cloog
 
-.PHONY: maybe-dvi-gas dvi-gas
-maybe-dvi-gas:
-@if gas
-maybe-dvi-gas: dvi-gas
+.PHONY: maybe-dvi-cloog dvi-cloog
+maybe-dvi-cloog:
+@if cloog
+maybe-dvi-cloog: dvi-cloog
 
-dvi-gas: \
-    configure-gas 
-       @[ -f ./gas/Makefile ] || exit 0; \
+dvi-cloog: \
+    configure-cloog 
+       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
+       echo "Doing dvi in cloog" ; \
+       (cd $(HOST_SUBDIR)/cloog && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -14789,24 +14432,24 @@ dvi-gas: \
                  dvi) \
          || exit 1
 
-@endif gas
+@endif cloog
 
-.PHONY: maybe-pdf-gas pdf-gas
-maybe-pdf-gas:
-@if gas
-maybe-pdf-gas: pdf-gas
+.PHONY: maybe-pdf-cloog pdf-cloog
+maybe-pdf-cloog:
+@if cloog
+maybe-pdf-cloog: pdf-cloog
 
-pdf-gas: \
-    configure-gas 
-       @[ -f ./gas/Makefile ] || exit 0; \
+pdf-cloog: \
+    configure-cloog 
+       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
+       echo "Doing pdf in cloog" ; \
+       (cd $(HOST_SUBDIR)/cloog && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -14814,24 +14457,24 @@ pdf-gas: \
                  pdf) \
          || exit 1
 
-@endif gas
+@endif cloog
 
-.PHONY: maybe-html-gas html-gas
-maybe-html-gas:
-@if gas
-maybe-html-gas: html-gas
+.PHONY: maybe-html-cloog html-cloog
+maybe-html-cloog:
+@if cloog
+maybe-html-cloog: html-cloog
 
-html-gas: \
-    configure-gas 
-       @[ -f ./gas/Makefile ] || exit 0; \
+html-cloog: \
+    configure-cloog 
+       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
+       echo "Doing html in cloog" ; \
+       (cd $(HOST_SUBDIR)/cloog && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -14839,24 +14482,24 @@ html-gas: \
                  html) \
          || exit 1
 
-@endif gas
+@endif cloog
 
-.PHONY: maybe-TAGS-gas TAGS-gas
-maybe-TAGS-gas:
-@if gas
-maybe-TAGS-gas: TAGS-gas
+.PHONY: maybe-TAGS-cloog TAGS-cloog
+maybe-TAGS-cloog:
+@if cloog
+maybe-TAGS-cloog: TAGS-cloog
 
-TAGS-gas: \
-    configure-gas 
-       @[ -f ./gas/Makefile ] || exit 0; \
+TAGS-cloog: \
+    configure-cloog 
+       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
+       echo "Doing TAGS in cloog" ; \
+       (cd $(HOST_SUBDIR)/cloog && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -14864,25 +14507,25 @@ TAGS-gas: \
                  TAGS) \
          || exit 1
 
-@endif gas
+@endif cloog
 
-.PHONY: maybe-install-info-gas install-info-gas
-maybe-install-info-gas:
-@if gas
-maybe-install-info-gas: install-info-gas
+.PHONY: maybe-install-info-cloog install-info-cloog
+maybe-install-info-cloog:
+@if cloog
+maybe-install-info-cloog: install-info-cloog
 
-install-info-gas: \
-    configure-gas \
-    info-gas 
-       @[ -f ./gas/Makefile ] || exit 0; \
+install-info-cloog: \
+    configure-cloog \
+    info-cloog 
+       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
+       echo "Doing install-info in cloog" ; \
+       (cd $(HOST_SUBDIR)/cloog && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -14890,25 +14533,25 @@ install-info-gas: \
                  install-info) \
          || exit 1
 
-@endif gas
+@endif cloog
 
-.PHONY: maybe-install-pdf-gas install-pdf-gas
-maybe-install-pdf-gas:
-@if gas
-maybe-install-pdf-gas: install-pdf-gas
+.PHONY: maybe-install-pdf-cloog install-pdf-cloog
+maybe-install-pdf-cloog:
+@if cloog
+maybe-install-pdf-cloog: install-pdf-cloog
 
-install-pdf-gas: \
-    configure-gas \
-    pdf-gas 
-       @[ -f ./gas/Makefile ] || exit 0; \
+install-pdf-cloog: \
+    configure-cloog \
+    pdf-cloog 
+       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
+       echo "Doing install-pdf in cloog" ; \
+       (cd $(HOST_SUBDIR)/cloog && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -14916,25 +14559,25 @@ install-pdf-gas: \
                  install-pdf) \
          || exit 1
 
-@endif gas
+@endif cloog
 
-.PHONY: maybe-install-html-gas install-html-gas
-maybe-install-html-gas:
-@if gas
-maybe-install-html-gas: install-html-gas
+.PHONY: maybe-install-html-cloog install-html-cloog
+maybe-install-html-cloog:
+@if cloog
+maybe-install-html-cloog: install-html-cloog
 
-install-html-gas: \
-    configure-gas \
-    html-gas 
-       @[ -f ./gas/Makefile ] || exit 0; \
+install-html-cloog: \
+    configure-cloog \
+    html-cloog 
+       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
+       echo "Doing install-html in cloog" ; \
+       (cd $(HOST_SUBDIR)/cloog && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -14942,24 +14585,24 @@ install-html-gas: \
                  install-html) \
          || exit 1
 
-@endif gas
+@endif cloog
 
-.PHONY: maybe-installcheck-gas installcheck-gas
-maybe-installcheck-gas:
-@if gas
-maybe-installcheck-gas: installcheck-gas
+.PHONY: maybe-installcheck-cloog installcheck-cloog
+maybe-installcheck-cloog:
+@if cloog
+maybe-installcheck-cloog: installcheck-cloog
 
-installcheck-gas: \
-    configure-gas 
-       @[ -f ./gas/Makefile ] || exit 0; \
+installcheck-cloog: \
+    configure-cloog 
+       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
+       echo "Doing installcheck in cloog" ; \
+       (cd $(HOST_SUBDIR)/cloog && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -14967,23 +14610,23 @@ installcheck-gas: \
                  installcheck) \
          || exit 1
 
-@endif gas
+@endif cloog
 
-.PHONY: maybe-mostlyclean-gas mostlyclean-gas
-maybe-mostlyclean-gas:
-@if gas
-maybe-mostlyclean-gas: mostlyclean-gas
+.PHONY: maybe-mostlyclean-cloog mostlyclean-cloog
+maybe-mostlyclean-cloog:
+@if cloog
+maybe-mostlyclean-cloog: mostlyclean-cloog
 
-mostlyclean-gas: 
-       @[ -f ./gas/Makefile ] || exit 0; \
+mostlyclean-cloog: 
+       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
+       echo "Doing mostlyclean in cloog" ; \
+       (cd $(HOST_SUBDIR)/cloog && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -14991,23 +14634,23 @@ mostlyclean-gas:
                  mostlyclean) \
          || exit 1
 
-@endif gas
+@endif cloog
 
-.PHONY: maybe-clean-gas clean-gas
-maybe-clean-gas:
-@if gas
-maybe-clean-gas: clean-gas
+.PHONY: maybe-clean-cloog clean-cloog
+maybe-clean-cloog:
+@if cloog
+maybe-clean-cloog: clean-cloog
 
-clean-gas: 
-       @[ -f ./gas/Makefile ] || exit 0; \
+clean-cloog: 
+       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
+       echo "Doing clean in cloog" ; \
+       (cd $(HOST_SUBDIR)/cloog && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -15015,23 +14658,23 @@ clean-gas:
                  clean) \
          || exit 1
 
-@endif gas
+@endif cloog
 
-.PHONY: maybe-distclean-gas distclean-gas
-maybe-distclean-gas:
-@if gas
-maybe-distclean-gas: distclean-gas
+.PHONY: maybe-distclean-cloog distclean-cloog
+maybe-distclean-cloog:
+@if cloog
+maybe-distclean-cloog: distclean-cloog
 
-distclean-gas: 
-       @[ -f ./gas/Makefile ] || exit 0; \
+distclean-cloog: 
+       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
+       echo "Doing distclean in cloog" ; \
+       (cd $(HOST_SUBDIR)/cloog && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -15039,23 +14682,23 @@ distclean-gas:
                  distclean) \
          || exit 1
 
-@endif gas
+@endif cloog
 
-.PHONY: maybe-maintainer-clean-gas maintainer-clean-gas
-maybe-maintainer-clean-gas:
-@if gas
-maybe-maintainer-clean-gas: maintainer-clean-gas
+.PHONY: maybe-maintainer-clean-cloog maintainer-clean-cloog
+maybe-maintainer-clean-cloog:
+@if cloog
+maybe-maintainer-clean-cloog: maintainer-clean-cloog
 
-maintainer-clean-gas: 
-       @[ -f ./gas/Makefile ] || exit 0; \
+maintainer-clean-cloog: 
+       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in gas" ; \
-       (cd $(HOST_SUBDIR)/gas && \
+       echo "Doing maintainer-clean in cloog" ; \
+       (cd $(HOST_SUBDIR)/cloog && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -15063,274 +14706,280 @@ maintainer-clean-gas:
                  maintainer-clean) \
          || exit 1
 
-@endif gas
+@endif cloog
 
 
 
-.PHONY: configure-gcc maybe-configure-gcc
-maybe-configure-gcc:
+.PHONY: configure-libelf maybe-configure-libelf
+maybe-configure-libelf:
 @if gcc-bootstrap
-configure-gcc: stage_current
+configure-libelf: stage_current
 @endif gcc-bootstrap
-@if gcc
-maybe-configure-gcc: configure-gcc
-configure-gcc: 
+@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)/gcc/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
+       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/gcc; \
-       cd "$(HOST_SUBDIR)/gcc" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libelf; \
+       cd "$(HOST_SUBDIR)/libelf" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
+       srcdiroption="--srcdir=$${topdir}/libelf"; \
+       libsrcdir="$$s/libelf"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias} $${srcdiroption} --disable-shared \
          || exit 1
-@endif gcc
+@endif libelf
 
 
 
-.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:
+.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)/gcc
+       @$(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)/gcc/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
        $(HOST_EXPORTS) \
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
-       cd $(HOST_SUBDIR)/gcc || exit 1; \
+       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)/gcc/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
+       srcdiroption="--srcdir=$${topdir}/libelf"; \
+       libsrcdir="$$s/libelf"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption} \
-         $(STAGE1_CONFIGURE_FLAGS)
-@endif gcc-bootstrap
+         $(STAGE1_CONFIGURE_FLAGS) \
+         --disable-shared
+@endif libelf-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:
+.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)/gcc
+       @$(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)/gcc/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/gcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
-       cd $(HOST_SUBDIR)/gcc || exit 1; \
+       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)/gcc/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
+       srcdiroption="--srcdir=$${topdir}/libelf"; \
+       libsrcdir="$$s/libelf"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE2_CONFIGURE_FLAGS)
-@endif gcc-bootstrap
+         $(STAGE2_CONFIGURE_FLAGS) \
+         --disable-shared
+@endif libelf-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:
+.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)/gcc
+       @$(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)/gcc/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/gcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
-       cd $(HOST_SUBDIR)/gcc || exit 1; \
+       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)/gcc/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
+       srcdiroption="--srcdir=$${topdir}/libelf"; \
+       libsrcdir="$$s/libelf"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE3_CONFIGURE_FLAGS)
-@endif gcc-bootstrap
+         $(STAGE3_CONFIGURE_FLAGS) \
+         --disable-shared
+@endif libelf-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:
+.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)/gcc
+       @$(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)/gcc/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/gcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
-       cd $(HOST_SUBDIR)/gcc || exit 1; \
+       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)/gcc/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
+       srcdiroption="--srcdir=$${topdir}/libelf"; \
+       libsrcdir="$$s/libelf"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE4_CONFIGURE_FLAGS)
-@endif gcc-bootstrap
+         $(STAGE4_CONFIGURE_FLAGS) \
+         --disable-shared
+@endif libelf-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:
+.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)/gcc
+       @$(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)/gcc/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/gcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
-       cd $(HOST_SUBDIR)/gcc || exit 1; \
+       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)/gcc/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
+       srcdiroption="--srcdir=$${topdir}/libelf"; \
+       libsrcdir="$$s/libelf"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEprofile_CONFIGURE_FLAGS)
-@endif gcc-bootstrap
+         $(STAGEprofile_CONFIGURE_FLAGS) \
+         --disable-shared
+@endif libelf-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:
+.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)/gcc
+       @$(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)/gcc/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/gcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
-       cd $(HOST_SUBDIR)/gcc || exit 1; \
+       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)/gcc/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gcc"; \
-       libsrcdir="$$s/gcc"; \
+       srcdiroption="--srcdir=$${topdir}/libelf"; \
+       libsrcdir="$$s/libelf"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif gcc-bootstrap
+         $(STAGEfeedback_CONFIGURE_FLAGS) \
+         --disable-shared
+@endif libelf-bootstrap
 
 
 
 
 
-.PHONY: all-gcc maybe-all-gcc
-maybe-all-gcc:
+.PHONY: all-libelf maybe-all-libelf
+maybe-all-libelf:
 @if gcc-bootstrap
-all-gcc: stage_current
+all-libelf: stage_current
 @endif gcc-bootstrap
-@if gcc
-TARGET-gcc=all
-maybe-all-gcc: all-gcc
-all-gcc: configure-gcc
+@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)/gcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) \
-               $(TARGET-gcc))
-@endif gcc
+       (cd $(HOST_SUBDIR)/libelf && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+               $(TARGET-libelf))
+@endif libelf
 
 
 
-.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
+.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)/gcc && \
+       cd $(HOST_SUBDIR)/libelf && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -15338,41 +14987,41 @@ all-stage1-gcc: configure-stage1-gcc
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)  $(EXTRA_GCC_FLAGS) \
+               $(EXTRA_HOST_FLAGS)   \
                TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-gcc)
+               $(TARGET-stage1-libelf)
 
-maybe-clean-stage1-gcc: clean-stage1-gcc
-clean-stage1: clean-stage1-gcc
-clean-stage1-gcc:
+maybe-clean-stage1-libelf: clean-stage1-libelf
+clean-stage1: clean-stage1-libelf
+clean-stage1-libelf:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage1-gcc/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage1-libelf/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(HOST_SUBDIR)/gcc && \
+       cd $(HOST_SUBDIR)/libelf && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
+                clean
+@endif libelf-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
+.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)/gcc && \
+       cd $(HOST_SUBDIR)/libelf && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -15380,42 +15029,42 @@ all-stage2-gcc: configure-stage2-gcc
                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) \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE2_TFLAGS)" \
-               $(TARGET-stage2-gcc)
+               $(TARGET-stage2-libelf)
 
-maybe-clean-stage2-gcc: clean-stage2-gcc
-clean-stage2: clean-stage2-gcc
-clean-stage2-gcc:
+maybe-clean-stage2-libelf: clean-stage2-libelf
+clean-stage2: clean-stage2-libelf
+clean-stage2-libelf:
        @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage2-gcc/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage2-libelf/Makefile ] || exit 0; \
          $(MAKE) stage2-start; \
        fi; \
-       cd $(HOST_SUBDIR)/gcc && \
+       cd $(HOST_SUBDIR)/libelf && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
+                clean
+@endif libelf-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
+.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)/gcc && \
+       cd $(HOST_SUBDIR)/libelf && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -15423,42 +15072,42 @@ all-stage3-gcc: configure-stage3-gcc
                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) \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE3_TFLAGS)" \
-               $(TARGET-stage3-gcc)
+               $(TARGET-stage3-libelf)
 
-maybe-clean-stage3-gcc: clean-stage3-gcc
-clean-stage3: clean-stage3-gcc
-clean-stage3-gcc:
+maybe-clean-stage3-libelf: clean-stage3-libelf
+clean-stage3: clean-stage3-libelf
+clean-stage3-libelf:
        @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage3-gcc/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage3-libelf/Makefile ] || exit 0; \
          $(MAKE) stage3-start; \
        fi; \
-       cd $(HOST_SUBDIR)/gcc && \
+       cd $(HOST_SUBDIR)/libelf && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
+                clean
+@endif libelf-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
+.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)/gcc && \
+       cd $(HOST_SUBDIR)/libelf && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -15466,42 +15115,42 @@ all-stage4-gcc: configure-stage4-gcc
                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) \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE4_TFLAGS)" \
-               $(TARGET-stage4-gcc)
+               $(TARGET-stage4-libelf)
 
-maybe-clean-stage4-gcc: clean-stage4-gcc
-clean-stage4: clean-stage4-gcc
-clean-stage4-gcc:
+maybe-clean-stage4-libelf: clean-stage4-libelf
+clean-stage4: clean-stage4-libelf
+clean-stage4-libelf:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage4-gcc/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage4-libelf/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       cd $(HOST_SUBDIR)/gcc && \
+       cd $(HOST_SUBDIR)/libelf && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
+                clean
+@endif libelf-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
+.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)/gcc && \
+       cd $(HOST_SUBDIR)/libelf && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -15509,42 +15158,42 @@ all-stageprofile-gcc: configure-stageprofile-gcc
                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) \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEprofile_TFLAGS)" \
-               $(TARGET-stageprofile-gcc)
+               $(TARGET-stageprofile-libelf)
 
-maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
-clean-stageprofile: clean-stageprofile-gcc
-clean-stageprofile-gcc:
+maybe-clean-stageprofile-libelf: clean-stageprofile-libelf
+clean-stageprofile: clean-stageprofile-libelf
+clean-stageprofile-libelf:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stageprofile-gcc/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageprofile-libelf/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       cd $(HOST_SUBDIR)/gcc && \
+       cd $(HOST_SUBDIR)/libelf && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
+                clean
+@endif libelf-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
+.PHONY: all-stagefeedback-libelf maybe-all-stagefeedback-libelf
+.PHONY: clean-stagefeedback-libelf maybe-clean-stagefeedback-libelf
+maybe-all-stagefeedback-libelf:
+maybe-clean-stagefeedback-libelf:
+@if libelf-bootstrap
+maybe-all-stagefeedback-libelf: all-stagefeedback-libelf
+all-stagefeedback: all-stagefeedback-libelf
+TARGET-stagefeedback-libelf = $(TARGET-libelf)
+all-stagefeedback-libelf: configure-stagefeedback-libelf
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gcc && \
+       cd $(HOST_SUBDIR)/libelf && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -15552,92 +15201,80 @@ all-stagefeedback-gcc: configure-stagefeedback-gcc
                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) \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEfeedback_TFLAGS)" \
-               $(TARGET-stagefeedback-gcc)
+               $(TARGET-stagefeedback-libelf)
 
-maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
-clean-stagefeedback: clean-stagefeedback-gcc
-clean-stagefeedback-gcc:
+maybe-clean-stagefeedback-libelf: clean-stagefeedback-libelf
+clean-stagefeedback: clean-stagefeedback-libelf
+clean-stagefeedback-libelf:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-gcc/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stagefeedback-libelf/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       cd $(HOST_SUBDIR)/gcc && \
+       cd $(HOST_SUBDIR)/libelf && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
+                clean
+@endif libelf-bootstrap
 
 
 
 
 
-.PHONY: check-gcc maybe-check-gcc
-maybe-check-gcc:
-@if gcc
-maybe-check-gcc: check-gcc
+.PHONY: check-libelf maybe-check-libelf
+maybe-check-libelf:
+@if libelf
+maybe-check-libelf: check-libelf
 
-check-gcc:
+check-libelf:
        @: $(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)
+       (cd $(HOST_SUBDIR)/libelf && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif gcc
+@endif libelf
 
-.PHONY: install-gcc maybe-install-gcc
-maybe-install-gcc:
-@if gcc
-maybe-install-gcc: install-gcc
+.PHONY: install-libelf maybe-install-libelf
+maybe-install-libelf:
+@if libelf
+maybe-install-libelf: install-libelf
 
-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)
+install-libelf:
 
-@endif gcc
+@endif libelf
 
-.PHONY: install-strip-gcc maybe-install-strip-gcc
-maybe-install-strip-gcc:
-@if gcc
-maybe-install-strip-gcc: install-strip-gcc
+.PHONY: install-strip-libelf maybe-install-strip-libelf
+maybe-install-strip-libelf:
+@if libelf
+maybe-install-strip-libelf: install-strip-libelf
 
-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)
+install-strip-libelf:
 
-@endif gcc
+@endif libelf
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-gcc info-gcc
-maybe-info-gcc:
-@if gcc
-maybe-info-gcc: info-gcc
+.PHONY: maybe-info-libelf info-libelf
+maybe-info-libelf:
+@if libelf
+maybe-info-libelf: info-libelf
 
-info-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/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) $(EXTRA_GCC_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in gcc" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
+       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}" \
@@ -15645,24 +15282,24 @@ info-gcc: \
                  info) \
          || exit 1
 
-@endif gcc
+@endif libelf
 
-.PHONY: maybe-dvi-gcc dvi-gcc
-maybe-dvi-gcc:
-@if gcc
-maybe-dvi-gcc: dvi-gcc
+.PHONY: maybe-dvi-libelf dvi-libelf
+maybe-dvi-libelf:
+@if libelf
+maybe-dvi-libelf: dvi-libelf
 
-dvi-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/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) $(EXTRA_GCC_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in gcc" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
+       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}" \
@@ -15670,24 +15307,24 @@ dvi-gcc: \
                  dvi) \
          || exit 1
 
-@endif gcc
+@endif libelf
 
-.PHONY: maybe-pdf-gcc pdf-gcc
-maybe-pdf-gcc:
-@if gcc
-maybe-pdf-gcc: pdf-gcc
+.PHONY: maybe-pdf-libelf pdf-libelf
+maybe-pdf-libelf:
+@if libelf
+maybe-pdf-libelf: pdf-libelf
 
-pdf-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/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) $(EXTRA_GCC_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in gcc" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
+       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}" \
@@ -15695,24 +15332,24 @@ pdf-gcc: \
                  pdf) \
          || exit 1
 
-@endif gcc
+@endif libelf
 
-.PHONY: maybe-html-gcc html-gcc
-maybe-html-gcc:
-@if gcc
-maybe-html-gcc: html-gcc
+.PHONY: maybe-html-libelf html-libelf
+maybe-html-libelf:
+@if libelf
+maybe-html-libelf: html-libelf
 
-html-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/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) $(EXTRA_GCC_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in gcc" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
+       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}" \
@@ -15720,24 +15357,24 @@ html-gcc: \
                  html) \
          || exit 1
 
-@endif gcc
+@endif libelf
 
-.PHONY: maybe-TAGS-gcc TAGS-gcc
-maybe-TAGS-gcc:
-@if gcc
-maybe-TAGS-gcc: TAGS-gcc
+.PHONY: maybe-TAGS-libelf TAGS-libelf
+maybe-TAGS-libelf:
+@if libelf
+maybe-TAGS-libelf: TAGS-libelf
 
-TAGS-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/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) $(EXTRA_GCC_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in gcc" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
+       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}" \
@@ -15745,25 +15382,25 @@ TAGS-gcc: \
                  TAGS) \
          || exit 1
 
-@endif gcc
+@endif libelf
 
-.PHONY: maybe-install-info-gcc install-info-gcc
-maybe-install-info-gcc:
-@if gcc
-maybe-install-info-gcc: install-info-gcc
+.PHONY: maybe-install-info-libelf install-info-libelf
+maybe-install-info-libelf:
+@if libelf
+maybe-install-info-libelf: install-info-libelf
 
-install-info-gcc: \
-    configure-gcc \
-    info-gcc 
-       @[ -f ./gcc/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) $(EXTRA_GCC_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in gcc" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
+       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}" \
@@ -15771,25 +15408,25 @@ install-info-gcc: \
                  install-info) \
          || exit 1
 
-@endif gcc
+@endif libelf
 
-.PHONY: maybe-install-pdf-gcc install-pdf-gcc
-maybe-install-pdf-gcc:
-@if gcc
-maybe-install-pdf-gcc: install-pdf-gcc
+.PHONY: maybe-install-pdf-libelf install-pdf-libelf
+maybe-install-pdf-libelf:
+@if libelf
+maybe-install-pdf-libelf: install-pdf-libelf
 
-install-pdf-gcc: \
-    configure-gcc \
-    pdf-gcc 
-       @[ -f ./gcc/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) $(EXTRA_GCC_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in gcc" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
+       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}" \
@@ -15797,25 +15434,25 @@ install-pdf-gcc: \
                  install-pdf) \
          || exit 1
 
-@endif gcc
+@endif libelf
 
-.PHONY: maybe-install-html-gcc install-html-gcc
-maybe-install-html-gcc:
-@if gcc
-maybe-install-html-gcc: install-html-gcc
+.PHONY: maybe-install-html-libelf install-html-libelf
+maybe-install-html-libelf:
+@if libelf
+maybe-install-html-libelf: install-html-libelf
 
-install-html-gcc: \
-    configure-gcc \
-    html-gcc 
-       @[ -f ./gcc/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) $(EXTRA_GCC_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in gcc" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
+       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}" \
@@ -15823,24 +15460,24 @@ install-html-gcc: \
                  install-html) \
          || exit 1
 
-@endif gcc
+@endif libelf
 
-.PHONY: maybe-installcheck-gcc installcheck-gcc
-maybe-installcheck-gcc:
-@if gcc
-maybe-installcheck-gcc: installcheck-gcc
+.PHONY: maybe-installcheck-libelf installcheck-libelf
+maybe-installcheck-libelf:
+@if libelf
+maybe-installcheck-libelf: installcheck-libelf
 
-installcheck-gcc: \
-    configure-gcc 
-       @[ -f ./gcc/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) $(EXTRA_GCC_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in gcc" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
+       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}" \
@@ -15848,23 +15485,23 @@ installcheck-gcc: \
                  installcheck) \
          || exit 1
 
-@endif gcc
+@endif libelf
 
-.PHONY: maybe-mostlyclean-gcc mostlyclean-gcc
-maybe-mostlyclean-gcc:
-@if gcc
-maybe-mostlyclean-gcc: mostlyclean-gcc
+.PHONY: maybe-mostlyclean-libelf mostlyclean-libelf
+maybe-mostlyclean-libelf:
+@if libelf
+maybe-mostlyclean-libelf: mostlyclean-libelf
 
-mostlyclean-gcc: 
-       @[ -f ./gcc/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) $(EXTRA_GCC_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in gcc" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
+       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}" \
@@ -15872,23 +15509,23 @@ mostlyclean-gcc:
                  mostlyclean) \
          || exit 1
 
-@endif gcc
+@endif libelf
 
-.PHONY: maybe-clean-gcc clean-gcc
-maybe-clean-gcc:
-@if gcc
-maybe-clean-gcc: clean-gcc
+.PHONY: maybe-clean-libelf clean-libelf
+maybe-clean-libelf:
+@if libelf
+maybe-clean-libelf: clean-libelf
 
-clean-gcc: 
-       @[ -f ./gcc/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) $(EXTRA_GCC_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in gcc" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
+       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}" \
@@ -15896,23 +15533,23 @@ clean-gcc:
                  clean) \
          || exit 1
 
-@endif gcc
+@endif libelf
 
-.PHONY: maybe-distclean-gcc distclean-gcc
-maybe-distclean-gcc:
-@if gcc
-maybe-distclean-gcc: distclean-gcc
+.PHONY: maybe-distclean-libelf distclean-libelf
+maybe-distclean-libelf:
+@if libelf
+maybe-distclean-libelf: distclean-libelf
 
-distclean-gcc: 
-       @[ -f ./gcc/Makefile ] || exit 0; \
+distclean-libelf: 
+       @[ -f ./libelf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in gcc" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
+       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}" \
@@ -15920,23 +15557,23 @@ distclean-gcc:
                  distclean) \
          || exit 1
 
-@endif gcc
+@endif libelf
 
-.PHONY: maybe-maintainer-clean-gcc maintainer-clean-gcc
-maybe-maintainer-clean-gcc:
-@if gcc
-maybe-maintainer-clean-gcc: maintainer-clean-gcc
+.PHONY: maybe-maintainer-clean-libelf maintainer-clean-libelf
+maybe-maintainer-clean-libelf:
+@if libelf
+maybe-maintainer-clean-libelf: maintainer-clean-libelf
 
-maintainer-clean-gcc: 
-       @[ -f ./gcc/Makefile ] || exit 0; \
+maintainer-clean-libelf: 
+       @[ -f ./libelf/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in gcc" ; \
-       (cd $(HOST_SUBDIR)/gcc && \
+       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}" \
@@ -15944,568 +15581,581 @@ maintainer-clean-gcc:
                  maintainer-clean) \
          || exit 1
 
-@endif gcc
+@endif libelf
 
 
 
-.PHONY: configure-gawk maybe-configure-gawk
-maybe-configure-gawk:
+.PHONY: configure-gold maybe-configure-gold
+maybe-configure-gold:
 @if gcc-bootstrap
-configure-gawk: stage_current
+configure-gold: stage_current
 @endif gcc-bootstrap
-@if gawk
-maybe-configure-gawk: configure-gawk
-configure-gawk: 
-       @: $(MAKE); $(unstage)
+@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)/gawk/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gawk ; \
+       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/gawk; \
-       cd "$(HOST_SUBDIR)/gawk" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gold; \
+       cd "$(HOST_SUBDIR)/gold" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gawk/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gawk"; \
-       libsrcdir="$$s/gawk"; \
+       srcdiroption="--srcdir=$${topdir}/gold"; \
+       libsrcdir="$$s/gold"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif gawk
-
-
+@endif gold
 
 
 
-.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)
+.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; \
-       $(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
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
+       $(HOST_EXPORTS) \
+       CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/gold ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gold"; \
+       libsrcdir="$$s/gold"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif gold-bootstrap
 
-check-gawk:
-       @: $(MAKE); $(unstage)
+.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) \
-       (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
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/gold ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gold"; \
+       libsrcdir="$$s/gold"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif gold-bootstrap
 
-install-gawk: installdirs
-       @: $(MAKE); $(unstage)
+.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) \
-       (cd $(HOST_SUBDIR)/gawk && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif gawk
-
-.PHONY: install-strip-gawk maybe-install-strip-gawk
-maybe-install-strip-gawk:
-@if gawk
-maybe-install-strip-gawk: install-strip-gawk
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/gold ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gold"; \
+       libsrcdir="$$s/gold"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif gold-bootstrap
 
-install-strip-gawk: installdirs
-       @: $(MAKE); $(unstage)
+.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) \
-       (cd $(HOST_SUBDIR)/gawk && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif gawk
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-gawk info-gawk
-maybe-info-gawk:
-@if gawk
-maybe-info-gawk: info-gawk
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/gold ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gold"; \
+       libsrcdir="$$s/gold"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif gold-bootstrap
 
-info-gawk: \
-    configure-gawk 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage profile in $(HOST_SUBDIR)/gold ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gold"; \
+       libsrcdir="$$s/gold"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif gold-bootstrap
 
-dvi-gawk: \
-    configure-gawk 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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
+       $(POSTSTAGE1_HOST_EXPORTS) \
+       CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
+       CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
+       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/gold ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
+       cd $(HOST_SUBDIR)/gold || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/gold"; \
+       libsrcdir="$$s/gold"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif gold-bootstrap
 
-.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; \
+.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) \
-       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
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gold && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+               $(TARGET-gold))
+@endif gold
 
-@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; \
+.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; \
-       $(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
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/gold && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGE1_CFLAGS)" \
+               CXXFLAGS="$(STAGE1_CXXFLAGS)" \
+               LIBCFLAGS="$(LIBCFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS)   \
+               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(TARGET-stage1-gold)
 
-@endif gawk
+maybe-clean-stage1-gold: clean-stage1-gold
+clean-stage1: clean-stage1-gold
+clean-stage1-gold:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stage1-gold/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/gold && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+                clean
+@endif gold-bootstrap
 
-.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; \
+.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) \
-       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
+       $(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)
 
-@endif gawk
+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: 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; \
+.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) \
-       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
+       $(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 gawk
+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-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; \
+.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 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
+       $(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 gawk
+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-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; \
+.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 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
+       $(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-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)
+.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)/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
-
-
-
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       $(HOST_EXPORTS) \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/gold && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(STAGEfeedback_CFLAGS)" \
+               CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
+               LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
+               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               $(TARGET-stagefeedback-gold)
 
+maybe-clean-stagefeedback-gold: clean-stagefeedback-gold
+clean-stagefeedback: clean-stagefeedback-gold
+clean-stagefeedback-gold:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
+       else \
+         [ -f $(HOST_SUBDIR)/stagefeedback-gold/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(HOST_SUBDIR)/gold && \
+       $(MAKE) $(EXTRA_HOST_FLAGS)  \
+               $(POSTSTAGE1_FLAGS_TO_PASS)  \
+                clean
+@endif gold-bootstrap
 
-.PHONY: 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
+.PHONY: check-gold maybe-check-gold
+maybe-check-gold:
+@if gold
+maybe-check-gold: check-gold
 
-check-gettext:
+check-gold:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gettext && \
+       (cd $(HOST_SUBDIR)/gold && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif gettext
+@endif gold
 
-.PHONY: install-gettext maybe-install-gettext
-maybe-install-gettext:
-@if gettext
-maybe-install-gettext: install-gettext
+.PHONY: install-gold maybe-install-gold
+maybe-install-gold:
+@if gold
+maybe-install-gold: install-gold
 
-install-gettext: installdirs
+install-gold: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gettext && \
+       (cd $(HOST_SUBDIR)/gold && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif gettext
+@endif gold
 
-.PHONY: install-strip-gettext maybe-install-strip-gettext
-maybe-install-strip-gettext:
-@if gettext
-maybe-install-strip-gettext: install-strip-gettext
+.PHONY: install-strip-gold maybe-install-strip-gold
+maybe-install-strip-gold:
+@if gold
+maybe-install-strip-gold: install-strip-gold
 
-install-strip-gettext: installdirs
+install-strip-gold: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gettext && \
+       (cd $(HOST_SUBDIR)/gold && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif gettext
+@endif gold
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-gettext info-gettext
-maybe-info-gettext:
-@if gettext
-maybe-info-gettext: info-gettext
+.PHONY: maybe-info-gold info-gold
+maybe-info-gold:
+@if gold
+maybe-info-gold: info-gold
 
-info-gettext: \
-    configure-gettext 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
+       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}" \
@@ -16513,25 +16163,24 @@ info-gettext: \
                  info) \
          || exit 1
 
-@endif gettext
+@endif gold
 
-.PHONY: maybe-dvi-gettext dvi-gettext
-maybe-dvi-gettext:
-@if gettext
-maybe-dvi-gettext: dvi-gettext
+.PHONY: maybe-dvi-gold dvi-gold
+maybe-dvi-gold:
+@if gold
+maybe-dvi-gold: dvi-gold
 
-dvi-gettext: \
-    configure-gettext 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
+       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}" \
@@ -16539,25 +16188,24 @@ dvi-gettext: \
                  dvi) \
          || exit 1
 
-@endif gettext
+@endif gold
 
-.PHONY: maybe-pdf-gettext pdf-gettext
-maybe-pdf-gettext:
-@if gettext
-maybe-pdf-gettext: pdf-gettext
+.PHONY: maybe-pdf-gold pdf-gold
+maybe-pdf-gold:
+@if gold
+maybe-pdf-gold: pdf-gold
 
-pdf-gettext: \
-    configure-gettext 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
+       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}" \
@@ -16565,25 +16213,24 @@ pdf-gettext: \
                  pdf) \
          || exit 1
 
-@endif gettext
+@endif gold
 
-.PHONY: maybe-html-gettext html-gettext
-maybe-html-gettext:
-@if gettext
-maybe-html-gettext: html-gettext
+.PHONY: maybe-html-gold html-gold
+maybe-html-gold:
+@if gold
+maybe-html-gold: html-gold
 
-html-gettext: \
-    configure-gettext 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
+       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}" \
@@ -16591,25 +16238,24 @@ html-gettext: \
                  html) \
          || exit 1
 
-@endif gettext
+@endif gold
 
-.PHONY: maybe-TAGS-gettext TAGS-gettext
-maybe-TAGS-gettext:
-@if gettext
-maybe-TAGS-gettext: TAGS-gettext
+.PHONY: maybe-TAGS-gold TAGS-gold
+maybe-TAGS-gold:
+@if gold
+maybe-TAGS-gold: TAGS-gold
 
-TAGS-gettext: \
-    configure-gettext 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
+       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}" \
@@ -16617,26 +16263,25 @@ TAGS-gettext: \
                  TAGS) \
          || exit 1
 
-@endif gettext
+@endif gold
 
-.PHONY: maybe-install-info-gettext install-info-gettext
-maybe-install-info-gettext:
-@if gettext
-maybe-install-info-gettext: install-info-gettext
+.PHONY: maybe-install-info-gold install-info-gold
+maybe-install-info-gold:
+@if gold
+maybe-install-info-gold: install-info-gold
 
-install-info-gettext: \
-    configure-gettext \
-    info-gettext 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
+       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}" \
@@ -16644,26 +16289,25 @@ install-info-gettext: \
                  install-info) \
          || exit 1
 
-@endif gettext
+@endif gold
 
-.PHONY: maybe-install-pdf-gettext install-pdf-gettext
-maybe-install-pdf-gettext:
-@if gettext
-maybe-install-pdf-gettext: install-pdf-gettext
+.PHONY: maybe-install-pdf-gold install-pdf-gold
+maybe-install-pdf-gold:
+@if gold
+maybe-install-pdf-gold: install-pdf-gold
 
-install-pdf-gettext: \
-    configure-gettext \
-    pdf-gettext 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
+       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}" \
@@ -16671,26 +16315,25 @@ install-pdf-gettext: \
                  install-pdf) \
          || exit 1
 
-@endif gettext
+@endif gold
 
-.PHONY: maybe-install-html-gettext install-html-gettext
-maybe-install-html-gettext:
-@if gettext
-maybe-install-html-gettext: install-html-gettext
+.PHONY: maybe-install-html-gold install-html-gold
+maybe-install-html-gold:
+@if gold
+maybe-install-html-gold: install-html-gold
 
-install-html-gettext: \
-    configure-gettext \
-    html-gettext 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
+       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}" \
@@ -16698,25 +16341,24 @@ install-html-gettext: \
                  install-html) \
          || exit 1
 
-@endif gettext
+@endif gold
 
-.PHONY: maybe-installcheck-gettext installcheck-gettext
-maybe-installcheck-gettext:
-@if gettext
-maybe-installcheck-gettext: installcheck-gettext
+.PHONY: maybe-installcheck-gold installcheck-gold
+maybe-installcheck-gold:
+@if gold
+maybe-installcheck-gold: installcheck-gold
 
-installcheck-gettext: \
-    configure-gettext 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
+       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}" \
@@ -16724,24 +16366,23 @@ installcheck-gettext: \
                  installcheck) \
          || exit 1
 
-@endif gettext
+@endif gold
 
-.PHONY: maybe-mostlyclean-gettext mostlyclean-gettext
-maybe-mostlyclean-gettext:
-@if gettext
-maybe-mostlyclean-gettext: mostlyclean-gettext
+.PHONY: maybe-mostlyclean-gold mostlyclean-gold
+maybe-mostlyclean-gold:
+@if gold
+maybe-mostlyclean-gold: mostlyclean-gold
 
-mostlyclean-gettext: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
+       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}" \
@@ -16749,24 +16390,23 @@ mostlyclean-gettext:
                  mostlyclean) \
          || exit 1
 
-@endif gettext
+@endif gold
 
-.PHONY: maybe-clean-gettext clean-gettext
-maybe-clean-gettext:
-@if gettext
-maybe-clean-gettext: clean-gettext
+.PHONY: maybe-clean-gold clean-gold
+maybe-clean-gold:
+@if gold
+maybe-clean-gold: clean-gold
 
-clean-gettext: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
+       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}" \
@@ -16774,24 +16414,23 @@ clean-gettext:
                  clean) \
          || exit 1
 
-@endif gettext
+@endif gold
 
-.PHONY: maybe-distclean-gettext distclean-gettext
-maybe-distclean-gettext:
-@if gettext
-maybe-distclean-gettext: distclean-gettext
+.PHONY: maybe-distclean-gold distclean-gold
+maybe-distclean-gold:
+@if gold
+maybe-distclean-gold: distclean-gold
 
-distclean-gettext: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
+       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}" \
@@ -16799,24 +16438,23 @@ distclean-gettext:
                  distclean) \
          || exit 1
 
-@endif gettext
+@endif gold
 
-.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-gold maintainer-clean-gold
+maybe-maintainer-clean-gold:
+@if gold
+maybe-maintainer-clean-gold: maintainer-clean-gold
 
-maintainer-clean-gettext: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gettext/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 gettext" ; \
-       (cd $(HOST_SUBDIR)/gettext && \
+       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}" \
@@ -16824,575 +16462,128 @@ maintainer-clean-gettext:
                  maintainer-clean) \
          || exit 1
 
-@endif gettext
+@endif gold
 
 
 
-.PHONY: configure-gmp maybe-configure-gmp
-maybe-configure-gmp:
+.PHONY: configure-gprof maybe-configure-gprof
+maybe-configure-gprof:
 @if gcc-bootstrap
-configure-gmp: stage_current
+configure-gprof: stage_current
 @endif gcc-bootstrap
-@if gmp
-maybe-configure-gmp: configure-gmp
-configure-gmp: 
+@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)/gmp/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
+       test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/gmp; \
-       cd "$(HOST_SUBDIR)/gmp" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gprof; \
+       cd "$(HOST_SUBDIR)/gprof" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gprof/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gmp"; \
-       libsrcdir="$$s/gmp"; \
+       srcdiroption="--srcdir=$${topdir}/gprof"; \
+       libsrcdir="$$s/gprof"; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} --disable-shared \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif gmp
+@endif gprof
 
 
 
-.PHONY: configure-stage1-gmp maybe-configure-stage1-gmp
-maybe-configure-stage1-gmp:
-@if gmp-bootstrap
-maybe-configure-stage1-gmp: configure-stage1-gmp
-configure-stage1-gmp:
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(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) \
-       CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/gmp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
-       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} \
-         $(STAGE1_CONFIGURE_FLAGS) \
-         --disable-shared
-@endif gmp-bootstrap
 
-.PHONY: configure-stage2-gmp maybe-configure-stage2-gmp
-maybe-configure-stage2-gmp:
-@if gmp-bootstrap
-maybe-configure-stage2-gmp: configure-stage2-gmp
-configure-stage2-gmp:
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(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) \
-       CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/gmp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
-       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_CONFIGURE_FLAGS) \
-         --disable-shared
-@endif gmp-bootstrap
-
-.PHONY: configure-stage3-gmp maybe-configure-stage3-gmp
-maybe-configure-stage3-gmp:
-@if gmp-bootstrap
-maybe-configure-stage3-gmp: configure-stage3-gmp
-configure-stage3-gmp:
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(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) \
-       CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/gmp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
-       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) \
-         $(STAGE3_CONFIGURE_FLAGS) \
-         --disable-shared
-@endif gmp-bootstrap
-
-.PHONY: configure-stage4-gmp maybe-configure-stage4-gmp
-maybe-configure-stage4-gmp:
-@if gmp-bootstrap
-maybe-configure-stage4-gmp: configure-stage4-gmp
-configure-stage4-gmp:
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(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) \
-       CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/gmp ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
-       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) \
-         $(STAGE4_CONFIGURE_FLAGS) \
-         --disable-shared
-@endif gmp-bootstrap
-
-.PHONY: configure-stageprofile-gmp maybe-configure-stageprofile-gmp
-maybe-configure-stageprofile-gmp:
-@if gmp-bootstrap
-maybe-configure-stageprofile-gmp: configure-stageprofile-gmp
-configure-stageprofile-gmp:
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(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="$(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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEprofile_CONFIGURE_FLAGS) \
-         --disable-shared
-@endif gmp-bootstrap
-
-.PHONY: configure-stagefeedback-gmp maybe-configure-stagefeedback-gmp
-maybe-configure-stagefeedback-gmp:
-@if gmp-bootstrap
-maybe-configure-stagefeedback-gmp: configure-stagefeedback-gmp
-configure-stagefeedback-gmp:
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(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="$(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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-         --target=none-${host_vendor}-${host_os} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEfeedback_CONFIGURE_FLAGS) \
-         --disable-shared
-@endif gmp-bootstrap
-
-
-
-
-
-.PHONY: all-gmp maybe-all-gmp
-maybe-all-gmp:
-@if gcc-bootstrap
-all-gmp: stage_current
-@endif gcc-bootstrap
-@if gmp
-TARGET-gmp=all
-maybe-all-gmp: all-gmp
-all-gmp: configure-gmp
+
+.PHONY: all-gprof maybe-all-gprof
+maybe-all-gprof:
+@if gcc-bootstrap
+all-gprof: stage_current
+@endif gcc-bootstrap
+@if gprof
+TARGET-gprof=all
+maybe-all-gprof: all-gprof
+all-gprof: configure-gprof
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/gmp && \
+       (cd $(HOST_SUBDIR)/gprof && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-gmp))
-@endif gmp
-
-
-
-.PHONY: all-stage1-gmp maybe-all-stage1-gmp
-.PHONY: clean-stage1-gmp maybe-clean-stage1-gmp
-maybe-all-stage1-gmp:
-maybe-clean-stage1-gmp:
-@if gmp-bootstrap
-maybe-all-stage1-gmp: all-stage1-gmp
-all-stage1: all-stage1-gmp
-TARGET-stage1-gmp = $(TARGET-gmp)
-all-stage1-gmp: configure-stage1-gmp
-       @[ $(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)/gmp && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" \
-               CXXFLAGS="$(STAGE1_CXXFLAGS)" \
-               LIBCFLAGS="$(LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-gmp)
-
-maybe-clean-stage1-gmp: clean-stage1-gmp
-clean-stage1: clean-stage1-gmp
-clean-stage1-gmp:
-       @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage1-gmp/Makefile ] || exit 0; \
-         $(MAKE) stage1-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
-@endif gmp-bootstrap
-
-
-.PHONY: all-stage2-gmp maybe-all-stage2-gmp
-.PHONY: clean-stage2-gmp maybe-clean-stage2-gmp
-maybe-all-stage2-gmp:
-maybe-clean-stage2-gmp:
-@if gmp-bootstrap
-maybe-all-stage2-gmp: all-stage2-gmp
-all-stage2: all-stage2-gmp
-TARGET-stage2-gmp = $(TARGET-gmp)
-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)  \
-       cd $(HOST_SUBDIR)/gmp && \
-       $(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-gmp)
-
-maybe-clean-stage2-gmp: clean-stage2-gmp
-clean-stage2: clean-stage2-gmp
-clean-stage2-gmp:
-       @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage2-gmp/Makefile ] || exit 0; \
-         $(MAKE) stage2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gmp-bootstrap
-
-
-.PHONY: all-stage3-gmp maybe-all-stage3-gmp
-.PHONY: clean-stage3-gmp maybe-clean-stage3-gmp
-maybe-all-stage3-gmp:
-maybe-clean-stage3-gmp:
-@if gmp-bootstrap
-maybe-all-stage3-gmp: all-stage3-gmp
-all-stage3: all-stage3-gmp
-TARGET-stage3-gmp = $(TARGET-gmp)
-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)  \
-       cd $(HOST_SUBDIR)/gmp && \
-       $(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-gmp)
-
-maybe-clean-stage3-gmp: clean-stage3-gmp
-clean-stage3: clean-stage3-gmp
-clean-stage3-gmp:
-       @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage3-gmp/Makefile ] || exit 0; \
-         $(MAKE) stage3-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gmp-bootstrap
+               $(TARGET-gprof))
+@endif gprof
 
 
-.PHONY: all-stage4-gmp maybe-all-stage4-gmp
-.PHONY: clean-stage4-gmp maybe-clean-stage4-gmp
-maybe-all-stage4-gmp:
-maybe-clean-stage4-gmp:
-@if gmp-bootstrap
-maybe-all-stage4-gmp: all-stage4-gmp
-all-stage4: all-stage4-gmp
-TARGET-stage4-gmp = $(TARGET-gmp)
-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)  \
-       cd $(HOST_SUBDIR)/gmp && \
-       $(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-gmp)
 
-maybe-clean-stage4-gmp: clean-stage4-gmp
-clean-stage4: clean-stage4-gmp
-clean-stage4-gmp:
-       @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage4-gmp/Makefile ] || exit 0; \
-         $(MAKE) stage4-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gmp-bootstrap
 
+.PHONY: check-gprof maybe-check-gprof
+maybe-check-gprof:
+@if gprof
+maybe-check-gprof: check-gprof
 
-.PHONY: all-stageprofile-gmp maybe-all-stageprofile-gmp
-.PHONY: clean-stageprofile-gmp maybe-clean-stageprofile-gmp
-maybe-all-stageprofile-gmp:
-maybe-clean-stageprofile-gmp:
-@if gmp-bootstrap
-maybe-all-stageprofile-gmp: all-stageprofile-gmp
-all-stageprofile: all-stageprofile-gmp
-TARGET-stageprofile-gmp = $(TARGET-gmp)
-all-stageprofile-gmp: configure-stageprofile-gmp
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+check-gprof:
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEprofile_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gmp && \
-       $(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-gmp)
+       (cd $(HOST_SUBDIR)/gprof && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
 
-maybe-clean-stageprofile-gmp: clean-stageprofile-gmp
-clean-stageprofile: clean-stageprofile-gmp
-clean-stageprofile-gmp:
-       @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageprofile-gmp/Makefile ] || exit 0; \
-         $(MAKE) stageprofile-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gmp-bootstrap
+@endif gprof
 
+.PHONY: install-gprof maybe-install-gprof
+maybe-install-gprof:
+@if gprof
+maybe-install-gprof: install-gprof
 
-.PHONY: all-stagefeedback-gmp maybe-all-stagefeedback-gmp
-.PHONY: clean-stagefeedback-gmp maybe-clean-stagefeedback-gmp
-maybe-all-stagefeedback-gmp:
-maybe-clean-stagefeedback-gmp:
-@if gmp-bootstrap
-maybe-all-stagefeedback-gmp: all-stagefeedback-gmp
-all-stagefeedback: all-stagefeedback-gmp
-TARGET-stagefeedback-gmp = $(TARGET-gmp)
-all-stagefeedback-gmp: configure-stagefeedback-gmp
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+install-gprof: installdirs
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gmp && \
-       $(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-gmp)
-
-maybe-clean-stagefeedback-gmp: clean-stagefeedback-gmp
-clean-stagefeedback: clean-stagefeedback-gmp
-clean-stagefeedback-gmp:
-       @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-gmp/Makefile ] || exit 0; \
-         $(MAKE) stagefeedback-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif gmp-bootstrap
-
-
-
+       (cd $(HOST_SUBDIR)/gprof && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
+@endif gprof
 
-.PHONY: check-gmp maybe-check-gmp
-maybe-check-gmp:
-@if gmp
-maybe-check-gmp: check-gmp
+.PHONY: install-strip-gprof maybe-install-strip-gprof
+maybe-install-strip-gprof:
+@if gprof
+maybe-install-strip-gprof: install-strip-gprof
 
-check-gmp:
+install-strip-gprof: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gmp && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif gmp
-
-.PHONY: install-gmp maybe-install-gmp
-maybe-install-gmp:
-@if gmp
-maybe-install-gmp: install-gmp
-
-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:
+       (cd $(HOST_SUBDIR)/gprof && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif gmp
+@endif gprof
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-gmp info-gmp
-maybe-info-gmp:
-@if gmp
-maybe-info-gmp: info-gmp
+.PHONY: maybe-info-gprof info-gprof
+maybe-info-gprof:
+@if gprof
+maybe-info-gprof: info-gprof
 
-info-gmp: \
-    configure-gmp 
-       @[ -f ./gmp/Makefile ] || exit 0; \
+info-gprof: \
+    configure-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in gmp" ; \
-       (cd $(HOST_SUBDIR)/gmp && \
+       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}" \
@@ -17400,24 +16591,25 @@ info-gmp: \
                  info) \
          || exit 1
 
-@endif gmp
+@endif gprof
 
-.PHONY: maybe-dvi-gmp dvi-gmp
-maybe-dvi-gmp:
-@if gmp
-maybe-dvi-gmp: dvi-gmp
+.PHONY: maybe-dvi-gprof dvi-gprof
+maybe-dvi-gprof:
+@if gprof
+maybe-dvi-gprof: dvi-gprof
 
-dvi-gmp: \
-    configure-gmp 
-       @[ -f ./gmp/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+dvi-gprof: \
+    configure-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in gmp" ; \
-       (cd $(HOST_SUBDIR)/gmp && \
+       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}" \
@@ -17425,24 +16617,25 @@ dvi-gmp: \
                  dvi) \
          || exit 1
 
-@endif gmp
+@endif gprof
 
-.PHONY: maybe-pdf-gmp pdf-gmp
-maybe-pdf-gmp:
-@if gmp
-maybe-pdf-gmp: pdf-gmp
+.PHONY: maybe-pdf-gprof pdf-gprof
+maybe-pdf-gprof:
+@if gprof
+maybe-pdf-gprof: pdf-gprof
 
-pdf-gmp: \
-    configure-gmp 
-       @[ -f ./gmp/Makefile ] || exit 0; \
+pdf-gprof: \
+    configure-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in gmp" ; \
-       (cd $(HOST_SUBDIR)/gmp && \
+       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}" \
@@ -17450,24 +16643,25 @@ pdf-gmp: \
                  pdf) \
          || exit 1
 
-@endif gmp
+@endif gprof
 
-.PHONY: maybe-html-gmp html-gmp
-maybe-html-gmp:
-@if gmp
-maybe-html-gmp: html-gmp
+.PHONY: maybe-html-gprof html-gprof
+maybe-html-gprof:
+@if gprof
+maybe-html-gprof: html-gprof
 
-html-gmp: \
-    configure-gmp 
-       @[ -f ./gmp/Makefile ] || exit 0; \
+html-gprof: \
+    configure-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in gmp" ; \
-       (cd $(HOST_SUBDIR)/gmp && \
+       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}" \
@@ -17475,24 +16669,25 @@ html-gmp: \
                  html) \
          || exit 1
 
-@endif gmp
+@endif gprof
 
-.PHONY: maybe-TAGS-gmp TAGS-gmp
-maybe-TAGS-gmp:
-@if gmp
-maybe-TAGS-gmp: TAGS-gmp
+.PHONY: maybe-TAGS-gprof TAGS-gprof
+maybe-TAGS-gprof:
+@if gprof
+maybe-TAGS-gprof: TAGS-gprof
 
-TAGS-gmp: \
-    configure-gmp 
-       @[ -f ./gmp/Makefile ] || exit 0; \
+TAGS-gprof: \
+    configure-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in gmp" ; \
-       (cd $(HOST_SUBDIR)/gmp && \
+       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}" \
@@ -17500,25 +16695,26 @@ TAGS-gmp: \
                  TAGS) \
          || exit 1
 
-@endif gmp
+@endif gprof
 
-.PHONY: maybe-install-info-gmp install-info-gmp
-maybe-install-info-gmp:
-@if gmp
-maybe-install-info-gmp: install-info-gmp
+.PHONY: maybe-install-info-gprof install-info-gprof
+maybe-install-info-gprof:
+@if gprof
+maybe-install-info-gprof: install-info-gprof
 
-install-info-gmp: \
-    configure-gmp \
-    info-gmp 
-       @[ -f ./gmp/Makefile ] || exit 0; \
+install-info-gprof: \
+    configure-gprof \
+    info-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in gmp" ; \
-       (cd $(HOST_SUBDIR)/gmp && \
+       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}" \
@@ -17526,25 +16722,26 @@ install-info-gmp: \
                  install-info) \
          || exit 1
 
-@endif gmp
+@endif gprof
 
-.PHONY: maybe-install-pdf-gmp install-pdf-gmp
-maybe-install-pdf-gmp:
-@if gmp
-maybe-install-pdf-gmp: install-pdf-gmp
+.PHONY: maybe-install-pdf-gprof install-pdf-gprof
+maybe-install-pdf-gprof:
+@if gprof
+maybe-install-pdf-gprof: install-pdf-gprof
 
-install-pdf-gmp: \
-    configure-gmp \
-    pdf-gmp 
-       @[ -f ./gmp/Makefile ] || exit 0; \
+install-pdf-gprof: \
+    configure-gprof \
+    pdf-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in gmp" ; \
-       (cd $(HOST_SUBDIR)/gmp && \
+       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}" \
@@ -17552,25 +16749,26 @@ install-pdf-gmp: \
                  install-pdf) \
          || exit 1
 
-@endif gmp
+@endif gprof
 
-.PHONY: maybe-install-html-gmp install-html-gmp
-maybe-install-html-gmp:
-@if gmp
-maybe-install-html-gmp: install-html-gmp
+.PHONY: maybe-install-html-gprof install-html-gprof
+maybe-install-html-gprof:
+@if gprof
+maybe-install-html-gprof: install-html-gprof
 
-install-html-gmp: \
-    configure-gmp \
-    html-gmp 
-       @[ -f ./gmp/Makefile ] || exit 0; \
+install-html-gprof: \
+    configure-gprof \
+    html-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in gmp" ; \
-       (cd $(HOST_SUBDIR)/gmp && \
+       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}" \
@@ -17578,24 +16776,25 @@ install-html-gmp: \
                  install-html) \
          || exit 1
 
-@endif gmp
+@endif gprof
 
-.PHONY: maybe-installcheck-gmp installcheck-gmp
-maybe-installcheck-gmp:
-@if gmp
-maybe-installcheck-gmp: installcheck-gmp
+.PHONY: maybe-installcheck-gprof installcheck-gprof
+maybe-installcheck-gprof:
+@if gprof
+maybe-installcheck-gprof: installcheck-gprof
 
-installcheck-gmp: \
-    configure-gmp 
-       @[ -f ./gmp/Makefile ] || exit 0; \
+installcheck-gprof: \
+    configure-gprof 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in gmp" ; \
-       (cd $(HOST_SUBDIR)/gmp && \
+       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}" \
@@ -17603,23 +16802,24 @@ installcheck-gmp: \
                  installcheck) \
          || exit 1
 
-@endif gmp
+@endif gprof
 
-.PHONY: maybe-mostlyclean-gmp mostlyclean-gmp
-maybe-mostlyclean-gmp:
-@if gmp
-maybe-mostlyclean-gmp: mostlyclean-gmp
+.PHONY: maybe-mostlyclean-gprof mostlyclean-gprof
+maybe-mostlyclean-gprof:
+@if gprof
+maybe-mostlyclean-gprof: mostlyclean-gprof
 
-mostlyclean-gmp: 
-       @[ -f ./gmp/Makefile ] || exit 0; \
+mostlyclean-gprof: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in gmp" ; \
-       (cd $(HOST_SUBDIR)/gmp && \
+       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}" \
@@ -17627,23 +16827,24 @@ mostlyclean-gmp:
                  mostlyclean) \
          || exit 1
 
-@endif gmp
+@endif gprof
 
-.PHONY: maybe-clean-gmp clean-gmp
-maybe-clean-gmp:
-@if gmp
-maybe-clean-gmp: clean-gmp
+.PHONY: maybe-clean-gprof clean-gprof
+maybe-clean-gprof:
+@if gprof
+maybe-clean-gprof: clean-gprof
 
-clean-gmp: 
-       @[ -f ./gmp/Makefile ] || exit 0; \
+clean-gprof: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in gmp" ; \
-       (cd $(HOST_SUBDIR)/gmp && \
+       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}" \
@@ -17651,23 +16852,24 @@ clean-gmp:
                  clean) \
          || exit 1
 
-@endif gmp
+@endif gprof
 
-.PHONY: maybe-distclean-gmp distclean-gmp
-maybe-distclean-gmp:
-@if gmp
-maybe-distclean-gmp: distclean-gmp
+.PHONY: maybe-distclean-gprof distclean-gprof
+maybe-distclean-gprof:
+@if gprof
+maybe-distclean-gprof: distclean-gprof
 
-distclean-gmp: 
-       @[ -f ./gmp/Makefile ] || exit 0; \
+distclean-gprof: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in gmp" ; \
-       (cd $(HOST_SUBDIR)/gmp && \
+       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}" \
@@ -17675,23 +16877,24 @@ distclean-gmp:
                  distclean) \
          || exit 1
 
-@endif gmp
+@endif gprof
 
-.PHONY: maybe-maintainer-clean-gmp maintainer-clean-gmp
-maybe-maintainer-clean-gmp:
-@if gmp
-maybe-maintainer-clean-gmp: maintainer-clean-gmp
+.PHONY: maybe-maintainer-clean-gprof maintainer-clean-gprof
+maybe-maintainer-clean-gprof:
+@if gprof
+maybe-maintainer-clean-gprof: maintainer-clean-gprof
 
-maintainer-clean-gmp: 
-       @[ -f ./gmp/Makefile ] || exit 0; \
+maintainer-clean-gprof: 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gprof/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in gmp" ; \
-       (cd $(HOST_SUBDIR)/gmp && \
+       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}" \
@@ -17699,280 +16902,274 @@ maintainer-clean-gmp:
                  maintainer-clean) \
          || exit 1
 
-@endif gmp
+@endif gprof
 
 
 
-.PHONY: configure-mpfr maybe-configure-mpfr
-maybe-configure-mpfr:
+.PHONY: configure-intl maybe-configure-intl
+maybe-configure-intl:
 @if gcc-bootstrap
-configure-mpfr: stage_current
+configure-intl: stage_current
 @endif gcc-bootstrap
-@if mpfr
-maybe-configure-mpfr: configure-mpfr
-configure-mpfr: 
+@if intl
+maybe-configure-intl: configure-intl
+configure-intl: 
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
+       test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/mpfr; \
-       cd "$(HOST_SUBDIR)/mpfr" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/intl; \
+       cd "$(HOST_SUBDIR)/intl" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpfr"; \
-       libsrcdir="$$s/mpfr"; \
+       srcdiroption="--srcdir=$${topdir}/intl"; \
+       libsrcdir="$$s/intl"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} --disable-shared @extra_mpfr_configure_flags@ \
+         --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif mpfr
+@endif intl
 
 
 
-.PHONY: configure-stage1-mpfr maybe-configure-stage1-mpfr
-maybe-configure-stage1-mpfr:
-@if mpfr-bootstrap
-maybe-configure-stage1-mpfr: configure-stage1-mpfr
-configure-stage1-mpfr:
+.PHONY: configure-stage1-intl maybe-configure-stage1-intl
+maybe-configure-stage1-intl:
+@if intl-bootstrap
+maybe-configure-stage1-intl: configure-stage1-intl
+configure-stage1-intl:
        @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
+       @$(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)/mpfr/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
        $(HOST_EXPORTS) \
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/mpfr ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
-       cd $(HOST_SUBDIR)/mpfr || exit 1; \
+       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)/mpfr/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpfr"; \
-       libsrcdir="$$s/mpfr"; \
+       srcdiroption="--srcdir=$${topdir}/intl"; \
+       libsrcdir="$$s/intl"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption} \
-         $(STAGE1_CONFIGURE_FLAGS) \
-         --disable-shared @extra_mpfr_configure_flags@
-@endif mpfr-bootstrap
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif intl-bootstrap
 
-.PHONY: configure-stage2-mpfr maybe-configure-stage2-mpfr
-maybe-configure-stage2-mpfr:
-@if mpfr-bootstrap
-maybe-configure-stage2-mpfr: configure-stage2-mpfr
-configure-stage2-mpfr:
+.PHONY: configure-stage2-intl maybe-configure-stage2-intl
+maybe-configure-stage2-intl:
+@if intl-bootstrap
+maybe-configure-stage2-intl: configure-stage2-intl
+configure-stage2-intl:
        @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
+       @$(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)/mpfr/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/intl/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)/mpfr ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
-       cd $(HOST_SUBDIR)/mpfr || exit 1; \
+       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)/mpfr/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpfr"; \
-       libsrcdir="$$s/mpfr"; \
+       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_CONFIGURE_FLAGS) \
-         --disable-shared @extra_mpfr_configure_flags@
-@endif mpfr-bootstrap
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif intl-bootstrap
 
-.PHONY: configure-stage3-mpfr maybe-configure-stage3-mpfr
-maybe-configure-stage3-mpfr:
-@if mpfr-bootstrap
-maybe-configure-stage3-mpfr: configure-stage3-mpfr
-configure-stage3-mpfr:
+.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)/mpfr
+       @$(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)/mpfr/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/intl/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)/mpfr ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
-       cd $(HOST_SUBDIR)/mpfr || exit 1; \
+       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)/mpfr/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpfr"; \
-       libsrcdir="$$s/mpfr"; \
+       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) \
-         $(STAGE3_CONFIGURE_FLAGS) \
-         --disable-shared @extra_mpfr_configure_flags@
-@endif mpfr-bootstrap
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif intl-bootstrap
 
-.PHONY: configure-stage4-mpfr maybe-configure-stage4-mpfr
-maybe-configure-stage4-mpfr:
-@if mpfr-bootstrap
-maybe-configure-stage4-mpfr: configure-stage4-mpfr
-configure-stage4-mpfr:
+.PHONY: configure-stage4-intl maybe-configure-stage4-intl
+maybe-configure-stage4-intl:
+@if intl-bootstrap
+maybe-configure-stage4-intl: configure-stage4-intl
+configure-stage4-intl:
        @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
+       @$(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)/mpfr/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/intl/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)/mpfr ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
-       cd $(HOST_SUBDIR)/mpfr || exit 1; \
+       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)/mpfr/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpfr"; \
-       libsrcdir="$$s/mpfr"; \
+       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) \
-         $(STAGE4_CONFIGURE_FLAGS) \
-         --disable-shared @extra_mpfr_configure_flags@
-@endif mpfr-bootstrap
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif intl-bootstrap
 
-.PHONY: configure-stageprofile-mpfr maybe-configure-stageprofile-mpfr
-maybe-configure-stageprofile-mpfr:
-@if mpfr-bootstrap
-maybe-configure-stageprofile-mpfr: configure-stageprofile-mpfr
-configure-stageprofile-mpfr:
+.PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl
+maybe-configure-stageprofile-intl:
+@if intl-bootstrap
+maybe-configure-stageprofile-intl: configure-stageprofile-intl
+configure-stageprofile-intl:
        @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
+       @$(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)/mpfr/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/intl/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)/mpfr ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
-       cd $(HOST_SUBDIR)/mpfr || exit 1; \
+       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)/mpfr/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpfr"; \
-       libsrcdir="$$s/mpfr"; \
+       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) \
-         $(STAGEprofile_CONFIGURE_FLAGS) \
-         --disable-shared @extra_mpfr_configure_flags@
-@endif mpfr-bootstrap
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif intl-bootstrap
 
-.PHONY: configure-stagefeedback-mpfr maybe-configure-stagefeedback-mpfr
-maybe-configure-stagefeedback-mpfr:
-@if mpfr-bootstrap
-maybe-configure-stagefeedback-mpfr: configure-stagefeedback-mpfr
-configure-stagefeedback-mpfr:
+.PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl
+maybe-configure-stagefeedback-intl:
+@if intl-bootstrap
+maybe-configure-stagefeedback-intl: configure-stagefeedback-intl
+configure-stagefeedback-intl:
        @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
+       @$(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)/mpfr/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/intl/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)/mpfr ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
-       cd $(HOST_SUBDIR)/mpfr || exit 1; \
+       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)/mpfr/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpfr"; \
-       libsrcdir="$$s/mpfr"; \
+       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) \
-         $(STAGEfeedback_CONFIGURE_FLAGS) \
-         --disable-shared @extra_mpfr_configure_flags@
-@endif mpfr-bootstrap
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif intl-bootstrap
 
 
 
 
 
-.PHONY: all-mpfr maybe-all-mpfr
-maybe-all-mpfr:
+.PHONY: all-intl maybe-all-intl
+maybe-all-intl:
 @if gcc-bootstrap
-all-mpfr: stage_current
+all-intl: stage_current
 @endif gcc-bootstrap
-@if mpfr
-TARGET-mpfr=all
-maybe-all-mpfr: all-mpfr
-all-mpfr: configure-mpfr
+@if intl
+TARGET-intl=all
+maybe-all-intl: all-intl
+all-intl: configure-intl
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/mpfr && \
+       (cd $(HOST_SUBDIR)/intl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-mpfr))
-@endif mpfr
+               $(TARGET-intl))
+@endif intl
 
 
 
-.PHONY: all-stage1-mpfr maybe-all-stage1-mpfr
-.PHONY: clean-stage1-mpfr maybe-clean-stage1-mpfr
-maybe-all-stage1-mpfr:
-maybe-clean-stage1-mpfr:
-@if mpfr-bootstrap
-maybe-all-stage1-mpfr: all-stage1-mpfr
-all-stage1: all-stage1-mpfr
-TARGET-stage1-mpfr = $(TARGET-mpfr)
-all-stage1-mpfr: configure-stage1-mpfr
+.PHONY: all-stage1-intl maybe-all-stage1-intl
+.PHONY: clean-stage1-intl maybe-clean-stage1-intl
+maybe-all-stage1-intl:
+maybe-clean-stage1-intl:
+@if intl-bootstrap
+maybe-all-stage1-intl: all-stage1-intl
+all-stage1: all-stage1-intl
+TARGET-stage1-intl = $(TARGET-intl)
+all-stage1-intl: configure-stage1-intl
        @[ $(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)/mpfr && \
+       cd $(HOST_SUBDIR)/intl && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -17982,39 +17179,39 @@ all-stage1-mpfr: configure-stage1-mpfr
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS)   \
                TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-mpfr)
+               $(TARGET-stage1-intl)
 
-maybe-clean-stage1-mpfr: clean-stage1-mpfr
-clean-stage1: clean-stage1-mpfr
-clean-stage1-mpfr:
+maybe-clean-stage1-intl: clean-stage1-intl
+clean-stage1: clean-stage1-intl
+clean-stage1-intl:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage1-mpfr/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage1-intl/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(HOST_SUBDIR)/mpfr && \
+       cd $(HOST_SUBDIR)/intl && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                 clean
-@endif mpfr-bootstrap
+@endif intl-bootstrap
 
 
-.PHONY: all-stage2-mpfr maybe-all-stage2-mpfr
-.PHONY: clean-stage2-mpfr maybe-clean-stage2-mpfr
-maybe-all-stage2-mpfr:
-maybe-clean-stage2-mpfr:
-@if mpfr-bootstrap
-maybe-all-stage2-mpfr: all-stage2-mpfr
-all-stage2: all-stage2-mpfr
-TARGET-stage2-mpfr = $(TARGET-mpfr)
-all-stage2-mpfr: configure-stage2-mpfr
+.PHONY: all-stage2-intl maybe-all-stage2-intl
+.PHONY: clean-stage2-intl maybe-clean-stage2-intl
+maybe-all-stage2-intl:
+maybe-clean-stage2-intl:
+@if intl-bootstrap
+maybe-all-stage2-intl: all-stage2-intl
+all-stage2: all-stage2-intl
+TARGET-stage2-intl = $(TARGET-intl)
+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)  \
-       cd $(HOST_SUBDIR)/mpfr && \
+       cd $(HOST_SUBDIR)/intl && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -18024,40 +17221,40 @@ all-stage2-mpfr: configure-stage2-mpfr
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE2_TFLAGS)" \
-               $(TARGET-stage2-mpfr)
+               $(TARGET-stage2-intl)
 
-maybe-clean-stage2-mpfr: clean-stage2-mpfr
-clean-stage2: clean-stage2-mpfr
-clean-stage2-mpfr:
+maybe-clean-stage2-intl: clean-stage2-intl
+clean-stage2: clean-stage2-intl
+clean-stage2-intl:
        @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage2-mpfr/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage2-intl/Makefile ] || exit 0; \
          $(MAKE) stage2-start; \
        fi; \
-       cd $(HOST_SUBDIR)/mpfr && \
+       cd $(HOST_SUBDIR)/intl && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif mpfr-bootstrap
+@endif intl-bootstrap
 
 
-.PHONY: all-stage3-mpfr maybe-all-stage3-mpfr
-.PHONY: clean-stage3-mpfr maybe-clean-stage3-mpfr
-maybe-all-stage3-mpfr:
-maybe-clean-stage3-mpfr:
-@if mpfr-bootstrap
-maybe-all-stage3-mpfr: all-stage3-mpfr
-all-stage3: all-stage3-mpfr
-TARGET-stage3-mpfr = $(TARGET-mpfr)
-all-stage3-mpfr: configure-stage3-mpfr
+.PHONY: all-stage3-intl maybe-all-stage3-intl
+.PHONY: clean-stage3-intl maybe-clean-stage3-intl
+maybe-all-stage3-intl:
+maybe-clean-stage3-intl:
+@if intl-bootstrap
+maybe-all-stage3-intl: all-stage3-intl
+all-stage3: all-stage3-intl
+TARGET-stage3-intl = $(TARGET-intl)
+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)  \
-       cd $(HOST_SUBDIR)/mpfr && \
+       cd $(HOST_SUBDIR)/intl && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -18067,40 +17264,40 @@ all-stage3-mpfr: configure-stage3-mpfr
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE3_TFLAGS)" \
-               $(TARGET-stage3-mpfr)
+               $(TARGET-stage3-intl)
 
-maybe-clean-stage3-mpfr: clean-stage3-mpfr
-clean-stage3: clean-stage3-mpfr
-clean-stage3-mpfr:
+maybe-clean-stage3-intl: clean-stage3-intl
+clean-stage3: clean-stage3-intl
+clean-stage3-intl:
        @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage3-mpfr/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage3-intl/Makefile ] || exit 0; \
          $(MAKE) stage3-start; \
        fi; \
-       cd $(HOST_SUBDIR)/mpfr && \
+       cd $(HOST_SUBDIR)/intl && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif mpfr-bootstrap
+@endif intl-bootstrap
 
 
-.PHONY: all-stage4-mpfr maybe-all-stage4-mpfr
-.PHONY: clean-stage4-mpfr maybe-clean-stage4-mpfr
-maybe-all-stage4-mpfr:
-maybe-clean-stage4-mpfr:
-@if mpfr-bootstrap
-maybe-all-stage4-mpfr: all-stage4-mpfr
-all-stage4: all-stage4-mpfr
-TARGET-stage4-mpfr = $(TARGET-mpfr)
-all-stage4-mpfr: configure-stage4-mpfr
+.PHONY: all-stage4-intl maybe-all-stage4-intl
+.PHONY: clean-stage4-intl maybe-clean-stage4-intl
+maybe-all-stage4-intl:
+maybe-clean-stage4-intl:
+@if intl-bootstrap
+maybe-all-stage4-intl: all-stage4-intl
+all-stage4: all-stage4-intl
+TARGET-stage4-intl = $(TARGET-intl)
+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)  \
-       cd $(HOST_SUBDIR)/mpfr && \
+       cd $(HOST_SUBDIR)/intl && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -18110,40 +17307,40 @@ all-stage4-mpfr: configure-stage4-mpfr
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE4_TFLAGS)" \
-               $(TARGET-stage4-mpfr)
+               $(TARGET-stage4-intl)
 
-maybe-clean-stage4-mpfr: clean-stage4-mpfr
-clean-stage4: clean-stage4-mpfr
-clean-stage4-mpfr:
+maybe-clean-stage4-intl: clean-stage4-intl
+clean-stage4: clean-stage4-intl
+clean-stage4-intl:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage4-mpfr/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage4-intl/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       cd $(HOST_SUBDIR)/mpfr && \
+       cd $(HOST_SUBDIR)/intl && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif mpfr-bootstrap
+@endif intl-bootstrap
 
 
-.PHONY: all-stageprofile-mpfr maybe-all-stageprofile-mpfr
-.PHONY: clean-stageprofile-mpfr maybe-clean-stageprofile-mpfr
-maybe-all-stageprofile-mpfr:
-maybe-clean-stageprofile-mpfr:
-@if mpfr-bootstrap
-maybe-all-stageprofile-mpfr: all-stageprofile-mpfr
-all-stageprofile: all-stageprofile-mpfr
-TARGET-stageprofile-mpfr = $(TARGET-mpfr)
-all-stageprofile-mpfr: configure-stageprofile-mpfr
+.PHONY: all-stageprofile-intl maybe-all-stageprofile-intl
+.PHONY: clean-stageprofile-intl maybe-clean-stageprofile-intl
+maybe-all-stageprofile-intl:
+maybe-clean-stageprofile-intl:
+@if intl-bootstrap
+maybe-all-stageprofile-intl: all-stageprofile-intl
+all-stageprofile: all-stageprofile-intl
+TARGET-stageprofile-intl = $(TARGET-intl)
+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)  \
-       cd $(HOST_SUBDIR)/mpfr && \
+       cd $(HOST_SUBDIR)/intl && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -18153,40 +17350,40 @@ all-stageprofile-mpfr: configure-stageprofile-mpfr
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEprofile_TFLAGS)" \
-               $(TARGET-stageprofile-mpfr)
+               $(TARGET-stageprofile-intl)
 
-maybe-clean-stageprofile-mpfr: clean-stageprofile-mpfr
-clean-stageprofile: clean-stageprofile-mpfr
-clean-stageprofile-mpfr:
+maybe-clean-stageprofile-intl: clean-stageprofile-intl
+clean-stageprofile: clean-stageprofile-intl
+clean-stageprofile-intl:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stageprofile-mpfr/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageprofile-intl/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       cd $(HOST_SUBDIR)/mpfr && \
+       cd $(HOST_SUBDIR)/intl && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif mpfr-bootstrap
+@endif intl-bootstrap
 
 
-.PHONY: all-stagefeedback-mpfr maybe-all-stagefeedback-mpfr
-.PHONY: clean-stagefeedback-mpfr maybe-clean-stagefeedback-mpfr
-maybe-all-stagefeedback-mpfr:
-maybe-clean-stagefeedback-mpfr:
-@if mpfr-bootstrap
-maybe-all-stagefeedback-mpfr: all-stagefeedback-mpfr
-all-stagefeedback: all-stagefeedback-mpfr
-TARGET-stagefeedback-mpfr = $(TARGET-mpfr)
-all-stagefeedback-mpfr: configure-stagefeedback-mpfr
+.PHONY: all-stagefeedback-intl maybe-all-stagefeedback-intl
+.PHONY: clean-stagefeedback-intl maybe-clean-stagefeedback-intl
+maybe-all-stagefeedback-intl:
+maybe-clean-stagefeedback-intl:
+@if intl-bootstrap
+maybe-all-stagefeedback-intl: all-stagefeedback-intl
+all-stagefeedback: all-stagefeedback-intl
+TARGET-stagefeedback-intl = $(TARGET-intl)
+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)  \
-       cd $(HOST_SUBDIR)/mpfr && \
+       cd $(HOST_SUBDIR)/intl && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -18196,78 +17393,90 @@ all-stagefeedback-mpfr: configure-stagefeedback-mpfr
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEfeedback_TFLAGS)" \
-               $(TARGET-stagefeedback-mpfr)
+               $(TARGET-stagefeedback-intl)
 
-maybe-clean-stagefeedback-mpfr: clean-stagefeedback-mpfr
-clean-stagefeedback: clean-stagefeedback-mpfr
-clean-stagefeedback-mpfr:
+maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
+clean-stagefeedback: clean-stagefeedback-intl
+clean-stagefeedback-intl:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-mpfr/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stagefeedback-intl/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       cd $(HOST_SUBDIR)/mpfr && \
+       cd $(HOST_SUBDIR)/intl && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif mpfr-bootstrap
+@endif intl-bootstrap
 
 
 
 
 
-.PHONY: check-mpfr maybe-check-mpfr
-maybe-check-mpfr:
-@if mpfr
-maybe-check-mpfr: check-mpfr
+.PHONY: check-intl maybe-check-intl
+maybe-check-intl:
+@if intl
+maybe-check-intl: check-intl
 
-check-mpfr:
+check-intl:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/mpfr && \
+       (cd $(HOST_SUBDIR)/intl && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif mpfr
+@endif intl
 
-.PHONY: install-mpfr maybe-install-mpfr
-maybe-install-mpfr:
-@if mpfr
-maybe-install-mpfr: install-mpfr
+.PHONY: install-intl maybe-install-intl
+maybe-install-intl:
+@if intl
+maybe-install-intl: install-intl
 
-install-mpfr:
+install-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)
 
-@endif mpfr
+@endif intl
 
-.PHONY: install-strip-mpfr maybe-install-strip-mpfr
-maybe-install-strip-mpfr:
-@if mpfr
-maybe-install-strip-mpfr: install-strip-mpfr
+.PHONY: install-strip-intl maybe-install-strip-intl
+maybe-install-strip-intl:
+@if intl
+maybe-install-strip-intl: install-strip-intl
 
-install-strip-mpfr:
+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 mpfr
+@endif intl
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-mpfr info-mpfr
-maybe-info-mpfr:
-@if mpfr
-maybe-info-mpfr: info-mpfr
+.PHONY: maybe-info-intl info-intl
+maybe-info-intl:
+@if intl
+maybe-info-intl: info-intl
 
-info-mpfr: \
-    configure-mpfr 
-       @[ -f ./mpfr/Makefile ] || exit 0; \
+info-intl: \
+    configure-intl 
+       @[ -f ./intl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpfr" ; \
-       (cd $(HOST_SUBDIR)/mpfr && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -18275,24 +17484,24 @@ info-mpfr: \
                  info) \
          || exit 1
 
-@endif mpfr
+@endif intl
 
-.PHONY: maybe-dvi-mpfr dvi-mpfr
-maybe-dvi-mpfr:
-@if mpfr
-maybe-dvi-mpfr: dvi-mpfr
+.PHONY: maybe-dvi-intl dvi-intl
+maybe-dvi-intl:
+@if intl
+maybe-dvi-intl: dvi-intl
 
-dvi-mpfr: \
-    configure-mpfr 
-       @[ -f ./mpfr/Makefile ] || exit 0; \
+dvi-intl: \
+    configure-intl 
+       @[ -f ./intl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpfr" ; \
-       (cd $(HOST_SUBDIR)/mpfr && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -18300,24 +17509,24 @@ dvi-mpfr: \
                  dvi) \
          || exit 1
 
-@endif mpfr
+@endif intl
 
-.PHONY: maybe-pdf-mpfr pdf-mpfr
-maybe-pdf-mpfr:
-@if mpfr
-maybe-pdf-mpfr: pdf-mpfr
+.PHONY: maybe-pdf-intl pdf-intl
+maybe-pdf-intl:
+@if intl
+maybe-pdf-intl: pdf-intl
 
-pdf-mpfr: \
-    configure-mpfr 
-       @[ -f ./mpfr/Makefile ] || exit 0; \
+pdf-intl: \
+    configure-intl 
+       @[ -f ./intl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpfr" ; \
-       (cd $(HOST_SUBDIR)/mpfr && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -18325,24 +17534,24 @@ pdf-mpfr: \
                  pdf) \
          || exit 1
 
-@endif mpfr
+@endif intl
 
-.PHONY: maybe-html-mpfr html-mpfr
-maybe-html-mpfr:
-@if mpfr
-maybe-html-mpfr: html-mpfr
+.PHONY: maybe-html-intl html-intl
+maybe-html-intl:
+@if intl
+maybe-html-intl: html-intl
 
-html-mpfr: \
-    configure-mpfr 
-       @[ -f ./mpfr/Makefile ] || exit 0; \
+html-intl: \
+    configure-intl 
+       @[ -f ./intl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpfr" ; \
-       (cd $(HOST_SUBDIR)/mpfr && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -18350,24 +17559,24 @@ html-mpfr: \
                  html) \
          || exit 1
 
-@endif mpfr
+@endif intl
 
-.PHONY: maybe-TAGS-mpfr TAGS-mpfr
-maybe-TAGS-mpfr:
-@if mpfr
-maybe-TAGS-mpfr: TAGS-mpfr
+.PHONY: maybe-TAGS-intl TAGS-intl
+maybe-TAGS-intl:
+@if intl
+maybe-TAGS-intl: TAGS-intl
 
-TAGS-mpfr: \
-    configure-mpfr 
-       @[ -f ./mpfr/Makefile ] || exit 0; \
+TAGS-intl: \
+    configure-intl 
+       @[ -f ./intl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpfr" ; \
-       (cd $(HOST_SUBDIR)/mpfr && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -18375,25 +17584,25 @@ TAGS-mpfr: \
                  TAGS) \
          || exit 1
 
-@endif mpfr
+@endif intl
 
-.PHONY: maybe-install-info-mpfr install-info-mpfr
-maybe-install-info-mpfr:
-@if mpfr
-maybe-install-info-mpfr: install-info-mpfr
+.PHONY: maybe-install-info-intl install-info-intl
+maybe-install-info-intl:
+@if intl
+maybe-install-info-intl: install-info-intl
 
-install-info-mpfr: \
-    configure-mpfr \
-    info-mpfr 
-       @[ -f ./mpfr/Makefile ] || exit 0; \
+install-info-intl: \
+    configure-intl \
+    info-intl 
+       @[ -f ./intl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpfr" ; \
-       (cd $(HOST_SUBDIR)/mpfr && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -18401,25 +17610,25 @@ install-info-mpfr: \
                  install-info) \
          || exit 1
 
-@endif mpfr
+@endif intl
 
-.PHONY: maybe-install-pdf-mpfr install-pdf-mpfr
-maybe-install-pdf-mpfr:
-@if mpfr
-maybe-install-pdf-mpfr: install-pdf-mpfr
+.PHONY: maybe-install-pdf-intl install-pdf-intl
+maybe-install-pdf-intl:
+@if intl
+maybe-install-pdf-intl: install-pdf-intl
 
-install-pdf-mpfr: \
-    configure-mpfr \
-    pdf-mpfr 
-       @[ -f ./mpfr/Makefile ] || exit 0; \
+install-pdf-intl: \
+    configure-intl \
+    pdf-intl 
+       @[ -f ./intl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpfr" ; \
-       (cd $(HOST_SUBDIR)/mpfr && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -18427,25 +17636,25 @@ install-pdf-mpfr: \
                  install-pdf) \
          || exit 1
 
-@endif mpfr
+@endif intl
 
-.PHONY: maybe-install-html-mpfr install-html-mpfr
-maybe-install-html-mpfr:
-@if mpfr
-maybe-install-html-mpfr: install-html-mpfr
+.PHONY: maybe-install-html-intl install-html-intl
+maybe-install-html-intl:
+@if intl
+maybe-install-html-intl: install-html-intl
 
-install-html-mpfr: \
-    configure-mpfr \
-    html-mpfr 
-       @[ -f ./mpfr/Makefile ] || exit 0; \
+install-html-intl: \
+    configure-intl \
+    html-intl 
+       @[ -f ./intl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpfr" ; \
-       (cd $(HOST_SUBDIR)/mpfr && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -18453,24 +17662,24 @@ install-html-mpfr: \
                  install-html) \
          || exit 1
 
-@endif mpfr
+@endif intl
 
-.PHONY: maybe-installcheck-mpfr installcheck-mpfr
-maybe-installcheck-mpfr:
-@if mpfr
-maybe-installcheck-mpfr: installcheck-mpfr
+.PHONY: maybe-installcheck-intl installcheck-intl
+maybe-installcheck-intl:
+@if intl
+maybe-installcheck-intl: installcheck-intl
 
-installcheck-mpfr: \
-    configure-mpfr 
-       @[ -f ./mpfr/Makefile ] || exit 0; \
+installcheck-intl: \
+    configure-intl 
+       @[ -f ./intl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpfr" ; \
-       (cd $(HOST_SUBDIR)/mpfr && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -18478,23 +17687,23 @@ installcheck-mpfr: \
                  installcheck) \
          || exit 1
 
-@endif mpfr
+@endif intl
 
-.PHONY: maybe-mostlyclean-mpfr mostlyclean-mpfr
-maybe-mostlyclean-mpfr:
-@if mpfr
-maybe-mostlyclean-mpfr: mostlyclean-mpfr
+.PHONY: maybe-mostlyclean-intl mostlyclean-intl
+maybe-mostlyclean-intl:
+@if intl
+maybe-mostlyclean-intl: mostlyclean-intl
 
-mostlyclean-mpfr: 
-       @[ -f ./mpfr/Makefile ] || exit 0; \
+mostlyclean-intl: 
+       @[ -f ./intl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpfr" ; \
-       (cd $(HOST_SUBDIR)/mpfr && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -18502,23 +17711,23 @@ mostlyclean-mpfr:
                  mostlyclean) \
          || exit 1
 
-@endif mpfr
+@endif intl
 
-.PHONY: maybe-clean-mpfr clean-mpfr
-maybe-clean-mpfr:
-@if mpfr
-maybe-clean-mpfr: clean-mpfr
+.PHONY: maybe-clean-intl clean-intl
+maybe-clean-intl:
+@if intl
+maybe-clean-intl: clean-intl
 
-clean-mpfr: 
-       @[ -f ./mpfr/Makefile ] || exit 0; \
+clean-intl: 
+       @[ -f ./intl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpfr" ; \
-       (cd $(HOST_SUBDIR)/mpfr && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -18526,23 +17735,23 @@ clean-mpfr:
                  clean) \
          || exit 1
 
-@endif mpfr
+@endif intl
 
-.PHONY: maybe-distclean-mpfr distclean-mpfr
-maybe-distclean-mpfr:
-@if mpfr
-maybe-distclean-mpfr: distclean-mpfr
+.PHONY: maybe-distclean-intl distclean-intl
+maybe-distclean-intl:
+@if intl
+maybe-distclean-intl: distclean-intl
 
-distclean-mpfr: 
-       @[ -f ./mpfr/Makefile ] || exit 0; \
+distclean-intl: 
+       @[ -f ./intl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpfr" ; \
-       (cd $(HOST_SUBDIR)/mpfr && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -18550,23 +17759,23 @@ distclean-mpfr:
                  distclean) \
          || exit 1
 
-@endif mpfr
+@endif intl
 
-.PHONY: maybe-maintainer-clean-mpfr maintainer-clean-mpfr
-maybe-maintainer-clean-mpfr:
-@if mpfr
-maybe-maintainer-clean-mpfr: maintainer-clean-mpfr
+.PHONY: maybe-maintainer-clean-intl maintainer-clean-intl
+maybe-maintainer-clean-intl:
+@if intl
+maybe-maintainer-clean-intl: maintainer-clean-intl
 
-maintainer-clean-mpfr: 
-       @[ -f ./mpfr/Makefile ] || exit 0; \
+maintainer-clean-intl: 
+       @[ -f ./intl/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; 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 mpfr" ; \
-       (cd $(HOST_SUBDIR)/mpfr && \
+       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}" \
                  "RANLIB=$${RANLIB}" \
@@ -18574,850 +17783,839 @@ maintainer-clean-mpfr:
                  maintainer-clean) \
          || exit 1
 
-@endif mpfr
+@endif intl
 
 
 
-.PHONY: configure-mpc maybe-configure-mpc
-maybe-configure-mpc:
+.PHONY: configure-tcl maybe-configure-tcl
+maybe-configure-tcl:
 @if gcc-bootstrap
-configure-mpc: stage_current
+configure-tcl: stage_current
 @endif gcc-bootstrap
-@if mpc
-maybe-configure-mpc: configure-mpc
-configure-mpc: 
+@if tcl
+maybe-configure-tcl: configure-tcl
+configure-tcl: 
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
+       test ! -f $(HOST_SUBDIR)/tcl/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tcl ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/mpc; \
-       cd "$(HOST_SUBDIR)/mpc" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/tcl; \
+       cd "$(HOST_SUBDIR)/tcl" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/tcl/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/mpc"; \
-       libsrcdir="$$s/mpc"; \
+       srcdiroption="--srcdir=$${topdir}/tcl"; \
+       libsrcdir="$$s/tcl"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ \
+         --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif mpc
+@endif tcl
 
 
 
-.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)/mpc
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE1_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/mpc/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)/mpc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
-       cd $(HOST_SUBDIR)/mpc || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/mpc"; \
-       libsrcdir="$$s/mpc"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         $(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)/mpc
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/mpc/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)/mpc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
-       cd $(HOST_SUBDIR)/mpc || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/mpc"; \
-       libsrcdir="$$s/mpc"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(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)/mpc
+.PHONY: all-tcl maybe-all-tcl
+maybe-all-tcl:
+@if gcc-bootstrap
+all-tcl: stage_current
+@endif gcc-bootstrap
+@if tcl
+TARGET-tcl=all
+maybe-all-tcl: all-tcl
+all-tcl: configure-tcl
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE3_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/mpc/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)/mpc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
-       cd $(HOST_SUBDIR)/mpc || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/mpc"; \
-       libsrcdir="$$s/mpc"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE3_CONFIGURE_FLAGS) \
-         --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
-@endif mpc-bootstrap
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/tcl && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+               $(TARGET-tcl))
+@endif tcl
 
-.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)/mpc
+
+
+
+.PHONY: check-tcl maybe-check-tcl
+maybe-check-tcl:
+@if tcl
+maybe-check-tcl: check-tcl
+
+check-tcl:
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE4_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/mpc/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)/mpc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
-       cd $(HOST_SUBDIR)/mpc || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/mpc"; \
-       libsrcdir="$$s/mpc"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE4_CONFIGURE_FLAGS) \
-         --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
-@endif mpc-bootstrap
+       (cd $(HOST_SUBDIR)/tcl && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
 
-.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)/mpc
+@endif tcl
+
+.PHONY: install-tcl maybe-install-tcl
+maybe-install-tcl:
+@if tcl
+maybe-install-tcl: install-tcl
+
+install-tcl: installdirs
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/mpc/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)/mpc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
-       cd $(HOST_SUBDIR)/mpc || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/mpc"; \
-       libsrcdir="$$s/mpc"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEprofile_CONFIGURE_FLAGS) \
-         --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
-@endif mpc-bootstrap
+       (cd $(HOST_SUBDIR)/tcl && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-.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)/mpc
+@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; \
-       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/mpc/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)/mpc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \
-       cd $(HOST_SUBDIR)/mpc || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/mpc"; \
-       libsrcdir="$$s/mpc"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEfeedback_CONFIGURE_FLAGS) \
-         --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
-@endif mpc-bootstrap
-
+       (cd $(HOST_SUBDIR)/tcl && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
+@endif tcl
 
+# Other targets (info, dvi, pdf, etc.)
 
+.PHONY: maybe-info-tcl info-tcl
+maybe-info-tcl:
+@if tcl
+maybe-info-tcl: info-tcl
 
-.PHONY: all-mpc maybe-all-mpc
-maybe-all-mpc:
-@if gcc-bootstrap
-all-mpc: stage_current
-@endif gcc-bootstrap
-@if mpc
-TARGET-mpc=all
-maybe-all-mpc: all-mpc
-all-mpc: configure-mpc
-       @r=`${PWD_COMMAND}`; export r; \
+info-tcl: \
+    configure-tcl 
+       @: $(MAKE); $(unstage)
+       @[ -f ./tcl/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/mpc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-mpc))
-@endif mpc
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       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}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 info) \
+         || exit 1
 
+@endif tcl
 
+.PHONY: maybe-dvi-tcl dvi-tcl
+maybe-dvi-tcl:
+@if tcl
+maybe-dvi-tcl: dvi-tcl
 
-.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; \
+dvi-tcl: \
+    configure-tcl 
+       @: $(MAKE); $(unstage)
+       @[ -f ./tcl/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE1_TFLAGS)"; \
-       $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/mpc && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" \
-               CXXFLAGS="$(STAGE1_CXXFLAGS)" \
-               LIBCFLAGS="$(LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-mpc)
+       $(HOST_EXPORTS) \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       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}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 dvi) \
+         || exit 1
 
-maybe-clean-stage1-mpc: clean-stage1-mpc
-clean-stage1: clean-stage1-mpc
-clean-stage1-mpc:
-       @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage1-mpc/Makefile ] || exit 0; \
-         $(MAKE) stage1-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/mpc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
-@endif mpc-bootstrap
+@endif tcl
 
+.PHONY: maybe-pdf-tcl pdf-tcl
+maybe-pdf-tcl:
+@if tcl
+maybe-pdf-tcl: pdf-tcl
 
-.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; \
+pdf-tcl: \
+    configure-tcl 
+       @: $(MAKE); $(unstage)
+       @[ -f ./tcl/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/mpc && \
-       $(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-mpc)
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       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}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 pdf) \
+         || exit 1
 
-maybe-clean-stage2-mpc: clean-stage2-mpc
-clean-stage2: clean-stage2-mpc
-clean-stage2-mpc:
-       @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage2-mpc/Makefile ] || exit 0; \
-         $(MAKE) stage2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/mpc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif mpc-bootstrap
+@endif tcl
 
+.PHONY: maybe-html-tcl html-tcl
+maybe-html-tcl:
+@if tcl
+maybe-html-tcl: html-tcl
 
-.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; \
+html-tcl: \
+    configure-tcl 
+       @: $(MAKE); $(unstage)
+       @[ -f ./tcl/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE3_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/mpc && \
-       $(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-mpc)
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       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}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 html) \
+         || exit 1
 
-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)/stage3-mpc/Makefile ] || exit 0; \
-         $(MAKE) stage3-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/mpc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif mpc-bootstrap
+@endif tcl
 
+.PHONY: maybe-TAGS-tcl TAGS-tcl
+maybe-TAGS-tcl:
+@if tcl
+maybe-TAGS-tcl: TAGS-tcl
 
-.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; \
+TAGS-tcl: \
+    configure-tcl 
+       @: $(MAKE); $(unstage)
+       @[ -f ./tcl/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE4_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/mpc && \
-       $(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-mpc)
-
-maybe-clean-stage4-mpc: clean-stage4-mpc
-clean-stage4: clean-stage4-mpc
-clean-stage4-mpc:
-       @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage4-mpc/Makefile ] || exit 0; \
-         $(MAKE) stage4-start; \
-       fi; \
-       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)/mpc && \
-       $(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-mpc)
-
-maybe-clean-stageprofile-mpc: clean-stageprofile-mpc
-clean-stageprofile: clean-stageprofile-mpc
-clean-stageprofile-mpc:
-       @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageprofile-mpc/Makefile ] || exit 0; \
-         $(MAKE) stageprofile-start; \
-       fi; \
-       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)/mpc && \
-       $(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-mpc)
-
-maybe-clean-stagefeedback-mpc: clean-stagefeedback-mpc
-clean-stagefeedback: clean-stagefeedback-mpc
-clean-stagefeedback-mpc:
-       @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-mpc/Makefile ] || exit 0; \
-         $(MAKE) stagefeedback-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/mpc && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif mpc-bootstrap
-
-
-
+       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: check-mpc maybe-check-mpc
-maybe-check-mpc:
-@if mpc
-maybe-check-mpc: check-mpc
+.PHONY: maybe-install-info-tcl install-info-tcl
+maybe-install-info-tcl:
+@if tcl
+maybe-install-info-tcl: install-info-tcl
 
-check-mpc:
+install-info-tcl: \
+    configure-tcl \
+    info-tcl 
        @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/mpc && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif mpc
-
-.PHONY: install-mpc maybe-install-mpc
-maybe-install-mpc:
-@if mpc
-maybe-install-mpc: install-mpc
-
-install-mpc:
-
-@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-mpc info-mpc
-maybe-info-mpc:
-@if mpc
-maybe-info-mpc: info-mpc
-
-info-mpc: \
-    configure-mpc 
-       @[ -f ./mpc/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 info in mpc" ; \
-       (cd $(HOST_SUBDIR)/mpc && \
+       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}" \
-                 info) \
+                 install-info) \
          || exit 1
 
-@endif mpc
+@endif tcl
 
-.PHONY: maybe-dvi-mpc dvi-mpc
-maybe-dvi-mpc:
-@if mpc
-maybe-dvi-mpc: dvi-mpc
+.PHONY: maybe-install-pdf-tcl install-pdf-tcl
+maybe-install-pdf-tcl:
+@if tcl
+maybe-install-pdf-tcl: install-pdf-tcl
 
-dvi-mpc: \
-    configure-mpc 
-       @[ -f ./mpc/Makefile ] || exit 0; \
+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 dvi in mpc" ; \
-       (cd $(HOST_SUBDIR)/mpc && \
+       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}" \
-                 dvi) \
+                 install-pdf) \
          || exit 1
 
-@endif mpc
+@endif tcl
 
-.PHONY: maybe-pdf-mpc pdf-mpc
-maybe-pdf-mpc:
-@if mpc
-maybe-pdf-mpc: pdf-mpc
+.PHONY: maybe-install-html-tcl install-html-tcl
+maybe-install-html-tcl:
+@if tcl
+maybe-install-html-tcl: install-html-tcl
 
-pdf-mpc: \
-    configure-mpc 
-       @[ -f ./mpc/Makefile ] || exit 0; \
+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 pdf in mpc" ; \
-       (cd $(HOST_SUBDIR)/mpc && \
+       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}" \
-                 pdf) \
+                 install-html) \
          || exit 1
 
-@endif mpc
+@endif tcl
 
-.PHONY: maybe-html-mpc html-mpc
-maybe-html-mpc:
-@if mpc
-maybe-html-mpc: html-mpc
+.PHONY: maybe-installcheck-tcl installcheck-tcl
+maybe-installcheck-tcl:
+@if tcl
+maybe-installcheck-tcl: installcheck-tcl
 
-html-mpc: \
-    configure-mpc 
-       @[ -f ./mpc/Makefile ] || exit 0; \
+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 html in mpc" ; \
-       (cd $(HOST_SUBDIR)/mpc && \
+       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}" \
-                 html) \
+                 installcheck) \
          || exit 1
 
-@endif mpc
+@endif tcl
 
-.PHONY: maybe-TAGS-mpc TAGS-mpc
-maybe-TAGS-mpc:
-@if mpc
-maybe-TAGS-mpc: TAGS-mpc
+.PHONY: maybe-mostlyclean-tcl mostlyclean-tcl
+maybe-mostlyclean-tcl:
+@if tcl
+maybe-mostlyclean-tcl: mostlyclean-tcl
 
-TAGS-mpc: \
-    configure-mpc 
-       @[ -f ./mpc/Makefile ] || exit 0; \
+# 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 TAGS in mpc" ; \
-       (cd $(HOST_SUBDIR)/mpc && \
+       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}" \
-                 TAGS) \
+                 clean) \
          || exit 1
 
-@endif mpc
+@endif tcl
 
-.PHONY: maybe-install-info-mpc install-info-mpc
-maybe-install-info-mpc:
-@if mpc
-maybe-install-info-mpc: install-info-mpc
+.PHONY: maybe-distclean-tcl distclean-tcl
+maybe-distclean-tcl:
+@if tcl
+maybe-distclean-tcl: distclean-tcl
 
-install-info-mpc: \
-    configure-mpc \
-    info-mpc 
-       @[ -f ./mpc/Makefile ] || exit 0; \
+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 install-info in mpc" ; \
-       (cd $(HOST_SUBDIR)/mpc && \
+       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}" \
-                 install-info) \
+                 distclean) \
          || exit 1
 
-@endif mpc
+@endif tcl
 
-.PHONY: maybe-install-pdf-mpc install-pdf-mpc
-maybe-install-pdf-mpc:
-@if mpc
-maybe-install-pdf-mpc: install-pdf-mpc
+.PHONY: maybe-maintainer-clean-tcl maintainer-clean-tcl
+maybe-maintainer-clean-tcl:
+@if tcl
+maybe-maintainer-clean-tcl: maintainer-clean-tcl
 
-install-pdf-mpc: \
-    configure-mpc \
-    pdf-mpc 
-       @[ -f ./mpc/Makefile ] || exit 0; \
+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 install-pdf in mpc" ; \
-       (cd $(HOST_SUBDIR)/mpc && \
+       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}" \
-                 install-pdf) \
+                 maintainer-clean) \
          || exit 1
 
-@endif mpc
+@endif tcl
 
-.PHONY: maybe-install-html-mpc install-html-mpc
-maybe-install-html-mpc:
-@if mpc
-maybe-install-html-mpc: install-html-mpc
 
-install-html-mpc: \
-    configure-mpc \
-    html-mpc 
-       @[ -f ./mpc/Makefile ] || exit 0; \
+
+.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
+
+.PHONY: install-strip-itcl maybe-install-strip-itcl
+maybe-install-strip-itcl:
+@if itcl
+maybe-install-strip-itcl: install-strip-itcl
+
+install-strip-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-strip)
+
+@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 install-html in mpc" ; \
-       (cd $(HOST_SUBDIR)/mpc && \
+       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}" \
-                 install-html) \
+                 info) \
          || exit 1
 
-@endif mpc
+@endif itcl
 
-.PHONY: maybe-installcheck-mpc installcheck-mpc
-maybe-installcheck-mpc:
-@if mpc
-maybe-installcheck-mpc: installcheck-mpc
+.PHONY: maybe-dvi-itcl dvi-itcl
+maybe-dvi-itcl:
+@if itcl
+maybe-dvi-itcl: dvi-itcl
 
-installcheck-mpc: \
-    configure-mpc 
-       @[ -f ./mpc/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 installcheck in mpc" ; \
-       (cd $(HOST_SUBDIR)/mpc && \
+       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}" \
-                 installcheck) \
+                 dvi) \
          || exit 1
 
-@endif mpc
+@endif itcl
 
-.PHONY: maybe-mostlyclean-mpc mostlyclean-mpc
-maybe-mostlyclean-mpc:
-@if mpc
-maybe-mostlyclean-mpc: mostlyclean-mpc
+.PHONY: maybe-pdf-itcl pdf-itcl
+maybe-pdf-itcl:
+@if itcl
+maybe-pdf-itcl: pdf-itcl
 
-mostlyclean-mpc: 
-       @[ -f ./mpc/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 mostlyclean in mpc" ; \
-       (cd $(HOST_SUBDIR)/mpc && \
+       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}" \
-                 mostlyclean) \
+                 pdf) \
          || exit 1
 
-@endif mpc
+@endif itcl
 
-.PHONY: maybe-clean-mpc clean-mpc
-maybe-clean-mpc:
-@if mpc
-maybe-clean-mpc: clean-mpc
+.PHONY: maybe-html-itcl html-itcl
+maybe-html-itcl:
+@if itcl
+maybe-html-itcl: html-itcl
 
-clean-mpc: 
-       @[ -f ./mpc/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 clean in mpc" ; \
-       (cd $(HOST_SUBDIR)/mpc && \
+       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}" \
-                 clean) \
+                 html) \
          || exit 1
 
-@endif mpc
+@endif itcl
 
-.PHONY: maybe-distclean-mpc distclean-mpc
-maybe-distclean-mpc:
-@if mpc
-maybe-distclean-mpc: distclean-mpc
+.PHONY: maybe-TAGS-itcl TAGS-itcl
+maybe-TAGS-itcl:
+@if itcl
+maybe-TAGS-itcl: TAGS-itcl
 
-distclean-mpc: 
-       @[ -f ./mpc/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 distclean in mpc" ; \
-       (cd $(HOST_SUBDIR)/mpc && \
+       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 && \
+         $(MAKE) $(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 itcl
+
+.PHONY: maybe-install-pdf-itcl install-pdf-itcl
+maybe-install-pdf-itcl:
+@if itcl
+maybe-install-pdf-itcl: install-pdf-itcl
+
+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 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}" \
+                 install-pdf) \
+         || exit 1
+
+@endif itcl
+
+.PHONY: maybe-install-html-itcl install-html-itcl
+maybe-install-html-itcl:
+@if itcl
+maybe-install-html-itcl: install-html-itcl
+
+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 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}" \
+                 install-html) \
+         || exit 1
+
+@endif itcl
+
+.PHONY: maybe-installcheck-itcl installcheck-itcl
+maybe-installcheck-itcl:
+@if itcl
+maybe-installcheck-itcl: installcheck-itcl
+
+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 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}" \
+                 installcheck) \
+         || exit 1
+
+@endif itcl
+
+.PHONY: maybe-mostlyclean-itcl mostlyclean-itcl
+maybe-mostlyclean-itcl:
+@if itcl
+maybe-mostlyclean-itcl: mostlyclean-itcl
+
+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 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}" \
+                 mostlyclean) \
+         || exit 1
+
+@endif itcl
+
+.PHONY: maybe-clean-itcl clean-itcl
+maybe-clean-itcl:
+@if itcl
+maybe-clean-itcl: clean-itcl
+
+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 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}" \
+                 clean) \
+         || exit 1
+
+@endif itcl
+
+.PHONY: maybe-distclean-itcl distclean-itcl
+maybe-distclean-itcl:
+@if itcl
+maybe-distclean-itcl: distclean-itcl
+
+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 itcl" ; \
+       (cd $(HOST_SUBDIR)/itcl && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -19425,23 +18623,24 @@ distclean-mpc:
                  distclean) \
          || exit 1
 
-@endif mpc
+@endif itcl
 
-.PHONY: maybe-maintainer-clean-mpc maintainer-clean-mpc
-maybe-maintainer-clean-mpc:
-@if mpc
-maybe-maintainer-clean-mpc: maintainer-clean-mpc
+.PHONY: maybe-maintainer-clean-itcl maintainer-clean-itcl
+maybe-maintainer-clean-itcl:
+@if itcl
+maybe-maintainer-clean-itcl: maintainer-clean-itcl
 
-maintainer-clean-mpc: 
-       @[ -f ./mpc/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 mpc" ; \
-       (cd $(HOST_SUBDIR)/mpc && \
+       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}" \
@@ -19449,280 +18648,274 @@ maintainer-clean-mpc:
                  maintainer-clean) \
          || exit 1
 
-@endif mpc
+@endif itcl
 
 
 
-.PHONY: configure-ppl maybe-configure-ppl
-maybe-configure-ppl:
+.PHONY: configure-ld maybe-configure-ld
+maybe-configure-ld:
 @if gcc-bootstrap
-configure-ppl: stage_current
+configure-ld: stage_current
 @endif gcc-bootstrap
-@if ppl
-maybe-configure-ppl: configure-ppl
-configure-ppl: 
+@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)/ppl/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
+       test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/ppl; \
-       cd "$(HOST_SUBDIR)/ppl" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/ld; \
+       cd "$(HOST_SUBDIR)/ld" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/ppl/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ppl"; \
-       libsrcdir="$$s/ppl"; \
+       srcdiroption="--srcdir=$${topdir}/ld"; \
+       libsrcdir="$$s/ld"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/ \
+         --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif ppl
+@endif ld
 
 
 
-.PHONY: configure-stage1-ppl maybe-configure-stage1-ppl
-maybe-configure-stage1-ppl:
-@if ppl-bootstrap
-maybe-configure-stage1-ppl: configure-stage1-ppl
-configure-stage1-ppl:
+.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)/ppl
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/ld/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)/ppl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
-       cd $(HOST_SUBDIR)/ppl || exit 1; \
+       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)/ppl/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ppl"; \
-       libsrcdir="$$s/ppl"; \
+       srcdiroption="--srcdir=$${topdir}/ld"; \
+       libsrcdir="$$s/ld"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption} \
-         $(STAGE1_CONFIGURE_FLAGS) \
-         --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
-@endif ppl-bootstrap
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif ld-bootstrap
 
-.PHONY: configure-stage2-ppl maybe-configure-stage2-ppl
-maybe-configure-stage2-ppl:
-@if ppl-bootstrap
-maybe-configure-stage2-ppl: configure-stage2-ppl
-configure-stage2-ppl:
+.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)/ppl
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/ld/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)/ppl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
-       cd $(HOST_SUBDIR)/ppl || exit 1; \
+       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)/ppl/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ppl"; \
-       libsrcdir="$$s/ppl"; \
+       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_CONFIGURE_FLAGS) \
-         --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
-@endif ppl-bootstrap
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif ld-bootstrap
 
-.PHONY: configure-stage3-ppl maybe-configure-stage3-ppl
-maybe-configure-stage3-ppl:
-@if ppl-bootstrap
-maybe-configure-stage3-ppl: configure-stage3-ppl
-configure-stage3-ppl:
+.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)/ppl
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/ld/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)/ppl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
-       cd $(HOST_SUBDIR)/ppl || exit 1; \
+       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)/ppl/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ppl"; \
-       libsrcdir="$$s/ppl"; \
+       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) \
-         $(STAGE3_CONFIGURE_FLAGS) \
-         --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
-@endif ppl-bootstrap
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif ld-bootstrap
 
-.PHONY: configure-stage4-ppl maybe-configure-stage4-ppl
-maybe-configure-stage4-ppl:
-@if ppl-bootstrap
-maybe-configure-stage4-ppl: configure-stage4-ppl
-configure-stage4-ppl:
+.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)/ppl
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/ld/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)/ppl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
-       cd $(HOST_SUBDIR)/ppl || exit 1; \
+       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)/ppl/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ppl"; \
-       libsrcdir="$$s/ppl"; \
+       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) \
-         $(STAGE4_CONFIGURE_FLAGS) \
-         --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
-@endif ppl-bootstrap
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif ld-bootstrap
 
-.PHONY: configure-stageprofile-ppl maybe-configure-stageprofile-ppl
-maybe-configure-stageprofile-ppl:
-@if ppl-bootstrap
-maybe-configure-stageprofile-ppl: configure-stageprofile-ppl
-configure-stageprofile-ppl:
+.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)/ppl
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/ld/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)/ppl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
-       cd $(HOST_SUBDIR)/ppl || exit 1; \
+       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)/ppl/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ppl"; \
-       libsrcdir="$$s/ppl"; \
+       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) \
-         $(STAGEprofile_CONFIGURE_FLAGS) \
-         --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
-@endif ppl-bootstrap
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif ld-bootstrap
 
-.PHONY: configure-stagefeedback-ppl maybe-configure-stagefeedback-ppl
-maybe-configure-stagefeedback-ppl:
-@if ppl-bootstrap
-maybe-configure-stagefeedback-ppl: configure-stagefeedback-ppl
-configure-stagefeedback-ppl:
+.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)/ppl
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/ld/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)/ppl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \
-       cd $(HOST_SUBDIR)/ppl || exit 1; \
+       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)/ppl/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ppl"; \
-       libsrcdir="$$s/ppl"; \
+       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) \
-         $(STAGEfeedback_CONFIGURE_FLAGS) \
-         --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/
-@endif ppl-bootstrap
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif ld-bootstrap
 
 
 
 
 
-.PHONY: all-ppl maybe-all-ppl
-maybe-all-ppl:
+.PHONY: all-ld maybe-all-ld
+maybe-all-ld:
 @if gcc-bootstrap
-all-ppl: stage_current
+all-ld: stage_current
 @endif gcc-bootstrap
-@if ppl
-TARGET-ppl=all
-maybe-all-ppl: all-ppl
-all-ppl: configure-ppl
+@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)/ppl && \
+       (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-ppl))
-@endif ppl
+               $(TARGET-ld))
+@endif ld
 
 
 
-.PHONY: all-stage1-ppl maybe-all-stage1-ppl
-.PHONY: clean-stage1-ppl maybe-clean-stage1-ppl
-maybe-all-stage1-ppl:
-maybe-clean-stage1-ppl:
-@if ppl-bootstrap
-maybe-all-stage1-ppl: all-stage1-ppl
-all-stage1: all-stage1-ppl
-TARGET-stage1-ppl = $(TARGET-ppl)
-all-stage1-ppl: configure-stage1-ppl
+.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; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
        $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/ppl && \
+       cd $(HOST_SUBDIR)/ld && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -19732,39 +18925,39 @@ all-stage1-ppl: configure-stage1-ppl
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS)   \
                TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-ppl)
+               $(TARGET-stage1-ld)
 
-maybe-clean-stage1-ppl: clean-stage1-ppl
-clean-stage1: clean-stage1-ppl
-clean-stage1-ppl:
+maybe-clean-stage1-ld: clean-stage1-ld
+clean-stage1: clean-stage1-ld
+clean-stage1-ld:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage1-ppl/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage1-ld/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(HOST_SUBDIR)/ppl && \
+       cd $(HOST_SUBDIR)/ld && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                 clean
-@endif ppl-bootstrap
+@endif ld-bootstrap
 
 
-.PHONY: all-stage2-ppl maybe-all-stage2-ppl
-.PHONY: clean-stage2-ppl maybe-clean-stage2-ppl
-maybe-all-stage2-ppl:
-maybe-clean-stage2-ppl:
-@if ppl-bootstrap
-maybe-all-stage2-ppl: all-stage2-ppl
-all-stage2: all-stage2-ppl
-TARGET-stage2-ppl = $(TARGET-ppl)
-all-stage2-ppl: configure-stage2-ppl
+.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)/ppl && \
+       cd $(HOST_SUBDIR)/ld && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -19774,40 +18967,40 @@ all-stage2-ppl: configure-stage2-ppl
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE2_TFLAGS)" \
-               $(TARGET-stage2-ppl)
+               $(TARGET-stage2-ld)
 
-maybe-clean-stage2-ppl: clean-stage2-ppl
-clean-stage2: clean-stage2-ppl
-clean-stage2-ppl:
+maybe-clean-stage2-ld: clean-stage2-ld
+clean-stage2: clean-stage2-ld
+clean-stage2-ld:
        @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage2-ppl/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage2-ld/Makefile ] || exit 0; \
          $(MAKE) stage2-start; \
        fi; \
-       cd $(HOST_SUBDIR)/ppl && \
+       cd $(HOST_SUBDIR)/ld && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif ppl-bootstrap
+@endif ld-bootstrap
 
 
-.PHONY: all-stage3-ppl maybe-all-stage3-ppl
-.PHONY: clean-stage3-ppl maybe-clean-stage3-ppl
-maybe-all-stage3-ppl:
-maybe-clean-stage3-ppl:
-@if ppl-bootstrap
-maybe-all-stage3-ppl: all-stage3-ppl
-all-stage3: all-stage3-ppl
-TARGET-stage3-ppl = $(TARGET-ppl)
-all-stage3-ppl: configure-stage3-ppl
+.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)/ppl && \
+       cd $(HOST_SUBDIR)/ld && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -19817,40 +19010,40 @@ all-stage3-ppl: configure-stage3-ppl
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE3_TFLAGS)" \
-               $(TARGET-stage3-ppl)
+               $(TARGET-stage3-ld)
 
-maybe-clean-stage3-ppl: clean-stage3-ppl
-clean-stage3: clean-stage3-ppl
-clean-stage3-ppl:
+maybe-clean-stage3-ld: clean-stage3-ld
+clean-stage3: clean-stage3-ld
+clean-stage3-ld:
        @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage3-ppl/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage3-ld/Makefile ] || exit 0; \
          $(MAKE) stage3-start; \
        fi; \
-       cd $(HOST_SUBDIR)/ppl && \
+       cd $(HOST_SUBDIR)/ld && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif ppl-bootstrap
+@endif ld-bootstrap
 
 
-.PHONY: all-stage4-ppl maybe-all-stage4-ppl
-.PHONY: clean-stage4-ppl maybe-clean-stage4-ppl
-maybe-all-stage4-ppl:
-maybe-clean-stage4-ppl:
-@if ppl-bootstrap
-maybe-all-stage4-ppl: all-stage4-ppl
-all-stage4: all-stage4-ppl
-TARGET-stage4-ppl = $(TARGET-ppl)
-all-stage4-ppl: configure-stage4-ppl
+.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)/ppl && \
+       cd $(HOST_SUBDIR)/ld && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -19860,40 +19053,40 @@ all-stage4-ppl: configure-stage4-ppl
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE4_TFLAGS)" \
-               $(TARGET-stage4-ppl)
+               $(TARGET-stage4-ld)
 
-maybe-clean-stage4-ppl: clean-stage4-ppl
-clean-stage4: clean-stage4-ppl
-clean-stage4-ppl:
+maybe-clean-stage4-ld: clean-stage4-ld
+clean-stage4: clean-stage4-ld
+clean-stage4-ld:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage4-ppl/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage4-ld/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       cd $(HOST_SUBDIR)/ppl && \
+       cd $(HOST_SUBDIR)/ld && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif ppl-bootstrap
+@endif ld-bootstrap
 
 
-.PHONY: all-stageprofile-ppl maybe-all-stageprofile-ppl
-.PHONY: clean-stageprofile-ppl maybe-clean-stageprofile-ppl
-maybe-all-stageprofile-ppl:
-maybe-clean-stageprofile-ppl:
-@if ppl-bootstrap
-maybe-all-stageprofile-ppl: all-stageprofile-ppl
-all-stageprofile: all-stageprofile-ppl
-TARGET-stageprofile-ppl = $(TARGET-ppl)
-all-stageprofile-ppl: configure-stageprofile-ppl
+.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)/ppl && \
+       cd $(HOST_SUBDIR)/ld && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -19903,40 +19096,40 @@ all-stageprofile-ppl: configure-stageprofile-ppl
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEprofile_TFLAGS)" \
-               $(TARGET-stageprofile-ppl)
+               $(TARGET-stageprofile-ld)
 
-maybe-clean-stageprofile-ppl: clean-stageprofile-ppl
-clean-stageprofile: clean-stageprofile-ppl
-clean-stageprofile-ppl:
+maybe-clean-stageprofile-ld: clean-stageprofile-ld
+clean-stageprofile: clean-stageprofile-ld
+clean-stageprofile-ld:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stageprofile-ppl/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageprofile-ld/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       cd $(HOST_SUBDIR)/ppl && \
+       cd $(HOST_SUBDIR)/ld && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif ppl-bootstrap
+@endif ld-bootstrap
 
 
-.PHONY: all-stagefeedback-ppl maybe-all-stagefeedback-ppl
-.PHONY: clean-stagefeedback-ppl maybe-clean-stagefeedback-ppl
-maybe-all-stagefeedback-ppl:
-maybe-clean-stagefeedback-ppl:
-@if ppl-bootstrap
-maybe-all-stagefeedback-ppl: all-stagefeedback-ppl
-all-stagefeedback: all-stagefeedback-ppl
-TARGET-stagefeedback-ppl = $(TARGET-ppl)
-all-stagefeedback-ppl: configure-stagefeedback-ppl
+.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)/ppl && \
+       cd $(HOST_SUBDIR)/ld && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -19946,78 +19139,90 @@ all-stagefeedback-ppl: configure-stagefeedback-ppl
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEfeedback_TFLAGS)" \
-               $(TARGET-stagefeedback-ppl)
+               $(TARGET-stagefeedback-ld)
 
-maybe-clean-stagefeedback-ppl: clean-stagefeedback-ppl
-clean-stagefeedback: clean-stagefeedback-ppl
-clean-stagefeedback-ppl:
+maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
+clean-stagefeedback: clean-stagefeedback-ld
+clean-stagefeedback-ld:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-ppl/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stagefeedback-ld/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       cd $(HOST_SUBDIR)/ppl && \
+       cd $(HOST_SUBDIR)/ld && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif ppl-bootstrap
+@endif ld-bootstrap
 
 
 
 
 
-.PHONY: check-ppl maybe-check-ppl
-maybe-check-ppl:
-@if ppl
-maybe-check-ppl: check-ppl
+.PHONY: check-ld maybe-check-ld
+maybe-check-ld:
+@if ld
+maybe-check-ld: check-ld
 
-check-ppl:
+check-ld:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/ppl && \
+       (cd $(HOST_SUBDIR)/ld && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif ppl
+@endif ld
 
-.PHONY: install-ppl maybe-install-ppl
-maybe-install-ppl:
-@if ppl
-maybe-install-ppl: install-ppl
+.PHONY: install-ld maybe-install-ld
+maybe-install-ld:
+@if ld
+maybe-install-ld: install-ld
 
-install-ppl:
+install-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)
 
-@endif ppl
+@endif ld
 
-.PHONY: install-strip-ppl maybe-install-strip-ppl
-maybe-install-strip-ppl:
-@if ppl
-maybe-install-strip-ppl: install-strip-ppl
+.PHONY: install-strip-ld maybe-install-strip-ld
+maybe-install-strip-ld:
+@if ld
+maybe-install-strip-ld: install-strip-ld
 
-install-strip-ppl:
+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 ppl
+@endif ld
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-ppl info-ppl
-maybe-info-ppl:
-@if ppl
-maybe-info-ppl: info-ppl
+.PHONY: maybe-info-ld info-ld
+maybe-info-ld:
+@if ld
+maybe-info-ld: info-ld
 
-info-ppl: \
-    configure-ppl 
-       @[ -f ./ppl/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 ppl" ; \
-       (cd $(HOST_SUBDIR)/ppl && \
+       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}" \
@@ -20025,24 +19230,24 @@ info-ppl: \
                  info) \
          || exit 1
 
-@endif ppl
+@endif ld
 
-.PHONY: maybe-dvi-ppl dvi-ppl
-maybe-dvi-ppl:
-@if ppl
-maybe-dvi-ppl: dvi-ppl
+.PHONY: maybe-dvi-ld dvi-ld
+maybe-dvi-ld:
+@if ld
+maybe-dvi-ld: dvi-ld
 
-dvi-ppl: \
-    configure-ppl 
-       @[ -f ./ppl/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 ppl" ; \
-       (cd $(HOST_SUBDIR)/ppl && \
+       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}" \
@@ -20050,24 +19255,24 @@ dvi-ppl: \
                  dvi) \
          || exit 1
 
-@endif ppl
+@endif ld
 
-.PHONY: maybe-pdf-ppl pdf-ppl
-maybe-pdf-ppl:
-@if ppl
-maybe-pdf-ppl: pdf-ppl
+.PHONY: maybe-pdf-ld pdf-ld
+maybe-pdf-ld:
+@if ld
+maybe-pdf-ld: pdf-ld
 
-pdf-ppl: \
-    configure-ppl 
-       @[ -f ./ppl/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 ppl" ; \
-       (cd $(HOST_SUBDIR)/ppl && \
+       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}" \
@@ -20075,24 +19280,24 @@ pdf-ppl: \
                  pdf) \
          || exit 1
 
-@endif ppl
+@endif ld
 
-.PHONY: maybe-html-ppl html-ppl
-maybe-html-ppl:
-@if ppl
-maybe-html-ppl: html-ppl
+.PHONY: maybe-html-ld html-ld
+maybe-html-ld:
+@if ld
+maybe-html-ld: html-ld
 
-html-ppl: \
-    configure-ppl 
-       @[ -f ./ppl/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 ppl" ; \
-       (cd $(HOST_SUBDIR)/ppl && \
+       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}" \
@@ -20100,24 +19305,24 @@ html-ppl: \
                  html) \
          || exit 1
 
-@endif ppl
+@endif ld
 
-.PHONY: maybe-TAGS-ppl TAGS-ppl
-maybe-TAGS-ppl:
-@if ppl
-maybe-TAGS-ppl: TAGS-ppl
+.PHONY: maybe-TAGS-ld TAGS-ld
+maybe-TAGS-ld:
+@if ld
+maybe-TAGS-ld: TAGS-ld
 
-TAGS-ppl: \
-    configure-ppl 
-       @[ -f ./ppl/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 ppl" ; \
-       (cd $(HOST_SUBDIR)/ppl && \
+       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}" \
@@ -20125,25 +19330,25 @@ TAGS-ppl: \
                  TAGS) \
          || exit 1
 
-@endif ppl
+@endif ld
 
-.PHONY: maybe-install-info-ppl install-info-ppl
-maybe-install-info-ppl:
-@if ppl
-maybe-install-info-ppl: install-info-ppl
+.PHONY: maybe-install-info-ld install-info-ld
+maybe-install-info-ld:
+@if ld
+maybe-install-info-ld: install-info-ld
 
-install-info-ppl: \
-    configure-ppl \
-    info-ppl 
-       @[ -f ./ppl/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 ppl" ; \
-       (cd $(HOST_SUBDIR)/ppl && \
+       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}" \
@@ -20151,25 +19356,25 @@ install-info-ppl: \
                  install-info) \
          || exit 1
 
-@endif ppl
+@endif ld
 
-.PHONY: maybe-install-pdf-ppl install-pdf-ppl
-maybe-install-pdf-ppl:
-@if ppl
-maybe-install-pdf-ppl: install-pdf-ppl
+.PHONY: maybe-install-pdf-ld install-pdf-ld
+maybe-install-pdf-ld:
+@if ld
+maybe-install-pdf-ld: install-pdf-ld
 
-install-pdf-ppl: \
-    configure-ppl \
-    pdf-ppl 
-       @[ -f ./ppl/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 ppl" ; \
-       (cd $(HOST_SUBDIR)/ppl && \
+       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}" \
@@ -20177,25 +19382,25 @@ install-pdf-ppl: \
                  install-pdf) \
          || exit 1
 
-@endif ppl
+@endif ld
 
-.PHONY: maybe-install-html-ppl install-html-ppl
-maybe-install-html-ppl:
-@if ppl
-maybe-install-html-ppl: install-html-ppl
+.PHONY: maybe-install-html-ld install-html-ld
+maybe-install-html-ld:
+@if ld
+maybe-install-html-ld: install-html-ld
 
-install-html-ppl: \
-    configure-ppl \
-    html-ppl 
-       @[ -f ./ppl/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 ppl" ; \
-       (cd $(HOST_SUBDIR)/ppl && \
+       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}" \
@@ -20203,24 +19408,24 @@ install-html-ppl: \
                  install-html) \
          || exit 1
 
-@endif ppl
+@endif ld
 
-.PHONY: maybe-installcheck-ppl installcheck-ppl
-maybe-installcheck-ppl:
-@if ppl
-maybe-installcheck-ppl: installcheck-ppl
+.PHONY: maybe-installcheck-ld installcheck-ld
+maybe-installcheck-ld:
+@if ld
+maybe-installcheck-ld: installcheck-ld
 
-installcheck-ppl: \
-    configure-ppl 
-       @[ -f ./ppl/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 ppl" ; \
-       (cd $(HOST_SUBDIR)/ppl && \
+       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}" \
@@ -20228,23 +19433,23 @@ installcheck-ppl: \
                  installcheck) \
          || exit 1
 
-@endif ppl
+@endif ld
 
-.PHONY: maybe-mostlyclean-ppl mostlyclean-ppl
-maybe-mostlyclean-ppl:
-@if ppl
-maybe-mostlyclean-ppl: mostlyclean-ppl
+.PHONY: maybe-mostlyclean-ld mostlyclean-ld
+maybe-mostlyclean-ld:
+@if ld
+maybe-mostlyclean-ld: mostlyclean-ld
 
-mostlyclean-ppl: 
-       @[ -f ./ppl/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 ppl" ; \
-       (cd $(HOST_SUBDIR)/ppl && \
+       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}" \
@@ -20252,23 +19457,23 @@ mostlyclean-ppl:
                  mostlyclean) \
          || exit 1
 
-@endif ppl
+@endif ld
 
-.PHONY: maybe-clean-ppl clean-ppl
-maybe-clean-ppl:
-@if ppl
-maybe-clean-ppl: clean-ppl
+.PHONY: maybe-clean-ld clean-ld
+maybe-clean-ld:
+@if ld
+maybe-clean-ld: clean-ld
 
-clean-ppl: 
-       @[ -f ./ppl/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 ppl" ; \
-       (cd $(HOST_SUBDIR)/ppl && \
+       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}" \
@@ -20276,23 +19481,23 @@ clean-ppl:
                  clean) \
          || exit 1
 
-@endif ppl
+@endif ld
 
-.PHONY: maybe-distclean-ppl distclean-ppl
-maybe-distclean-ppl:
-@if ppl
-maybe-distclean-ppl: distclean-ppl
+.PHONY: maybe-distclean-ld distclean-ld
+maybe-distclean-ld:
+@if ld
+maybe-distclean-ld: distclean-ld
 
-distclean-ppl: 
-       @[ -f ./ppl/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 ppl" ; \
-       (cd $(HOST_SUBDIR)/ppl && \
+       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}" \
@@ -20300,23 +19505,23 @@ distclean-ppl:
                  distclean) \
          || exit 1
 
-@endif ppl
+@endif ld
 
-.PHONY: maybe-maintainer-clean-ppl maintainer-clean-ppl
-maybe-maintainer-clean-ppl:
-@if ppl
-maybe-maintainer-clean-ppl: maintainer-clean-ppl
+.PHONY: maybe-maintainer-clean-ld maintainer-clean-ld
+maybe-maintainer-clean-ld:
+@if ld
+maybe-maintainer-clean-ld: maintainer-clean-ld
 
-maintainer-clean-ppl: 
-       @[ -f ./ppl/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 ppl" ; \
-       (cd $(HOST_SUBDIR)/ppl && \
+       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}" \
@@ -20324,280 +19529,274 @@ maintainer-clean-ppl:
                  maintainer-clean) \
          || exit 1
 
-@endif ppl
+@endif ld
 
 
 
-.PHONY: configure-cloog maybe-configure-cloog
-maybe-configure-cloog:
+.PHONY: configure-libcpp maybe-configure-libcpp
+maybe-configure-libcpp:
 @if gcc-bootstrap
-configure-cloog: stage_current
+configure-libcpp: stage_current
 @endif gcc-bootstrap
-@if cloog
-maybe-configure-cloog: configure-cloog
-configure-cloog: 
+@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)/cloog/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
-       $(HOST_EXPORTS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
-       echo Configuring in $(HOST_SUBDIR)/cloog; \
-       cd "$(HOST_SUBDIR)/cloog" || 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)/cloog/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/cloog"; \
-       libsrcdir="$$s/cloog"; \
+       srcdiroption="--srcdir=$${topdir}/libcpp"; \
+       libsrcdir="$$s/libcpp"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl \
+         --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif cloog
+@endif libcpp
 
 
 
-.PHONY: configure-stage1-cloog maybe-configure-stage1-cloog
-maybe-configure-stage1-cloog:
-@if cloog-bootstrap
-maybe-configure-stage1-cloog: configure-stage1-cloog
-configure-stage1-cloog:
+.PHONY: configure-stage1-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)/cloog
+       @$(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)/cloog/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
        $(HOST_EXPORTS) \
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/cloog ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
-       cd $(HOST_SUBDIR)/cloog || exit 1; \
+       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/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)/cloog/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/cloog"; \
-       libsrcdir="$$s/cloog"; \
+       srcdiroption="--srcdir=$${topdir}/libcpp"; \
+       libsrcdir="$$s/libcpp"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption} \
-         $(STAGE1_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl
-@endif cloog-bootstrap
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif libcpp-bootstrap
 
-.PHONY: configure-stage2-cloog maybe-configure-stage2-cloog
-maybe-configure-stage2-cloog:
-@if cloog-bootstrap
-maybe-configure-stage2-cloog: configure-stage2-cloog
-configure-stage2-cloog:
+.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)/cloog
+       @$(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)/cloog/Makefile || exit 0; \
+       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; CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/cloog ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
-       cd $(HOST_SUBDIR)/cloog || exit 1; \
+       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/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)/cloog/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/cloog"; \
-       libsrcdir="$$s/cloog"; \
+       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_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl
-@endif cloog-bootstrap
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif libcpp-bootstrap
 
-.PHONY: configure-stage3-cloog maybe-configure-stage3-cloog
-maybe-configure-stage3-cloog:
-@if cloog-bootstrap
-maybe-configure-stage3-cloog: configure-stage3-cloog
-configure-stage3-cloog:
+.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)/cloog
+       @$(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)/cloog/Makefile || exit 0; \
+       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; CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/cloog ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
-       cd $(HOST_SUBDIR)/cloog || exit 1; \
+       LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/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)/cloog/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/cloog"; \
-       libsrcdir="$$s/cloog"; \
+       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) \
-         $(STAGE3_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl
-@endif cloog-bootstrap
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif libcpp-bootstrap
 
-.PHONY: configure-stage4-cloog maybe-configure-stage4-cloog
-maybe-configure-stage4-cloog:
-@if cloog-bootstrap
-maybe-configure-stage4-cloog: configure-stage4-cloog
-configure-stage4-cloog:
+.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)/cloog
+       @$(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)/cloog/Makefile || exit 0; \
+       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; CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/cloog ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
-       cd $(HOST_SUBDIR)/cloog || exit 1; \
+       LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/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)/cloog/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/cloog"; \
-       libsrcdir="$$s/cloog"; \
+       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) \
-         $(STAGE4_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl
-@endif cloog-bootstrap
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif libcpp-bootstrap
 
-.PHONY: configure-stageprofile-cloog maybe-configure-stageprofile-cloog
-maybe-configure-stageprofile-cloog:
-@if cloog-bootstrap
-maybe-configure-stageprofile-cloog: configure-stageprofile-cloog
-configure-stageprofile-cloog:
+.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)/cloog
+       @$(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)/cloog/Makefile || exit 0; \
+       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; CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/cloog ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
-       cd $(HOST_SUBDIR)/cloog || exit 1; \
+       LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage profile in $(HOST_SUBDIR)/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)/cloog/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/cloog"; \
-       libsrcdir="$$s/cloog"; \
+       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) \
-         $(STAGEprofile_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl
-@endif cloog-bootstrap
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif libcpp-bootstrap
 
-.PHONY: configure-stagefeedback-cloog maybe-configure-stagefeedback-cloog
-maybe-configure-stagefeedback-cloog:
-@if cloog-bootstrap
-maybe-configure-stagefeedback-cloog: configure-stagefeedback-cloog
-configure-stagefeedback-cloog:
+.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)/cloog
+       @$(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)/cloog/Makefile || exit 0; \
+       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; CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/cloog ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \
-       cd $(HOST_SUBDIR)/cloog || exit 1; \
+       LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/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)/cloog/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/cloog"; \
-       libsrcdir="$$s/cloog"; \
+       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) \
-         $(STAGEfeedback_CONFIGURE_FLAGS) \
-         --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl
-@endif cloog-bootstrap
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif libcpp-bootstrap
 
 
 
 
 
-.PHONY: all-cloog maybe-all-cloog
-maybe-all-cloog:
+.PHONY: all-libcpp maybe-all-libcpp
+maybe-all-libcpp:
 @if gcc-bootstrap
-all-cloog: stage_current
+all-libcpp: stage_current
 @endif gcc-bootstrap
-@if cloog
-TARGET-cloog=all
-maybe-all-cloog: all-cloog
-all-cloog: configure-cloog
+@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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
-       (cd $(HOST_SUBDIR)/cloog && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" \
-               $(TARGET-cloog))
-@endif cloog
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/libcpp && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+               $(TARGET-libcpp))
+@endif libcpp
 
 
 
-.PHONY: all-stage1-cloog maybe-all-stage1-cloog
-.PHONY: clean-stage1-cloog maybe-clean-stage1-cloog
-maybe-all-stage1-cloog:
-maybe-clean-stage1-cloog:
-@if cloog-bootstrap
-maybe-all-stage1-cloog: all-stage1-cloog
-all-stage1: all-stage1-cloog
-TARGET-stage1-cloog = $(TARGET-cloog)
-all-stage1-cloog: configure-stage1-cloog
+.PHONY: all-stage1-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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
-       cd $(HOST_SUBDIR)/cloog && \
+       $(HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libcpp && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -20605,41 +19804,41 @@ all-stage1-cloog: configure-stage1-cloog
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)  CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" \
+               $(EXTRA_HOST_FLAGS)   \
                TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-cloog)
+               $(TARGET-stage1-libcpp)
 
-maybe-clean-stage1-cloog: clean-stage1-cloog
-clean-stage1: clean-stage1-cloog
-clean-stage1-cloog:
+maybe-clean-stage1-libcpp: clean-stage1-libcpp
+clean-stage1: clean-stage1-libcpp
+clean-stage1-libcpp:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage1-cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage1-libcpp/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(HOST_SUBDIR)/cloog && \
+       cd $(HOST_SUBDIR)/libcpp && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" clean
-@endif cloog-bootstrap
+                clean
+@endif libcpp-bootstrap
 
 
-.PHONY: all-stage2-cloog maybe-all-stage2-cloog
-.PHONY: clean-stage2-cloog maybe-clean-stage2-cloog
-maybe-all-stage2-cloog:
-maybe-clean-stage2-cloog:
-@if cloog-bootstrap
-maybe-all-stage2-cloog: all-stage2-cloog
-all-stage2: all-stage2-cloog
-TARGET-stage2-cloog = $(TARGET-cloog)
-all-stage2-cloog: configure-stage2-cloog
+.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) \
-       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
-       cd $(HOST_SUBDIR)/cloog && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libcpp && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -20647,42 +19846,42 @@ all-stage2-cloog: configure-stage2-cloog
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE2_TFLAGS)" \
-               $(TARGET-stage2-cloog)
+               $(TARGET-stage2-libcpp)
 
-maybe-clean-stage2-cloog: clean-stage2-cloog
-clean-stage2: clean-stage2-cloog
-clean-stage2-cloog:
+maybe-clean-stage2-libcpp: clean-stage2-libcpp
+clean-stage2: clean-stage2-libcpp
+clean-stage2-libcpp:
        @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage2-cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage2-libcpp/Makefile ] || exit 0; \
          $(MAKE) stage2-start; \
        fi; \
-       cd $(HOST_SUBDIR)/cloog && \
+       cd $(HOST_SUBDIR)/libcpp && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" clean
-@endif cloog-bootstrap
+                clean
+@endif libcpp-bootstrap
 
 
-.PHONY: all-stage3-cloog maybe-all-stage3-cloog
-.PHONY: clean-stage3-cloog maybe-clean-stage3-cloog
-maybe-all-stage3-cloog:
-maybe-clean-stage3-cloog:
-@if cloog-bootstrap
-maybe-all-stage3-cloog: all-stage3-cloog
-all-stage3: all-stage3-cloog
-TARGET-stage3-cloog = $(TARGET-cloog)
-all-stage3-cloog: configure-stage3-cloog
+.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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
-       cd $(HOST_SUBDIR)/cloog && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libcpp && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -20690,42 +19889,42 @@ all-stage3-cloog: configure-stage3-cloog
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE3_TFLAGS)" \
-               $(TARGET-stage3-cloog)
+               $(TARGET-stage3-libcpp)
 
-maybe-clean-stage3-cloog: clean-stage3-cloog
-clean-stage3: clean-stage3-cloog
-clean-stage3-cloog:
+maybe-clean-stage3-libcpp: clean-stage3-libcpp
+clean-stage3: clean-stage3-libcpp
+clean-stage3-libcpp:
        @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage3-cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage3-libcpp/Makefile ] || exit 0; \
          $(MAKE) stage3-start; \
        fi; \
-       cd $(HOST_SUBDIR)/cloog && \
+       cd $(HOST_SUBDIR)/libcpp && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" clean
-@endif cloog-bootstrap
+                clean
+@endif libcpp-bootstrap
 
 
-.PHONY: all-stage4-cloog maybe-all-stage4-cloog
-.PHONY: clean-stage4-cloog maybe-clean-stage4-cloog
-maybe-all-stage4-cloog:
-maybe-clean-stage4-cloog:
-@if cloog-bootstrap
-maybe-all-stage4-cloog: all-stage4-cloog
-all-stage4: all-stage4-cloog
-TARGET-stage4-cloog = $(TARGET-cloog)
-all-stage4-cloog: configure-stage4-cloog
+.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) \
-       $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
-       cd $(HOST_SUBDIR)/cloog && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libcpp && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -20733,42 +19932,42 @@ all-stage4-cloog: configure-stage4-cloog
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE4_TFLAGS)" \
-               $(TARGET-stage4-cloog)
+               $(TARGET-stage4-libcpp)
 
-maybe-clean-stage4-cloog: clean-stage4-cloog
-clean-stage4: clean-stage4-cloog
-clean-stage4-cloog:
+maybe-clean-stage4-libcpp: clean-stage4-libcpp
+clean-stage4: clean-stage4-libcpp
+clean-stage4-libcpp:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage4-cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage4-libcpp/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       cd $(HOST_SUBDIR)/cloog && \
+       cd $(HOST_SUBDIR)/libcpp && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" clean
-@endif cloog-bootstrap
+                clean
+@endif libcpp-bootstrap
 
 
-.PHONY: all-stageprofile-cloog maybe-all-stageprofile-cloog
-.PHONY: clean-stageprofile-cloog maybe-clean-stageprofile-cloog
-maybe-all-stageprofile-cloog:
-maybe-clean-stageprofile-cloog:
-@if cloog-bootstrap
-maybe-all-stageprofile-cloog: all-stageprofile-cloog
-all-stageprofile: all-stageprofile-cloog
-TARGET-stageprofile-cloog = $(TARGET-cloog)
-all-stageprofile-cloog: configure-stageprofile-cloog
+.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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
-       cd $(HOST_SUBDIR)/cloog && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libcpp && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -20776,42 +19975,42 @@ all-stageprofile-cloog: configure-stageprofile-cloog
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEprofile_TFLAGS)" \
-               $(TARGET-stageprofile-cloog)
+               $(TARGET-stageprofile-libcpp)
 
-maybe-clean-stageprofile-cloog: clean-stageprofile-cloog
-clean-stageprofile: clean-stageprofile-cloog
-clean-stageprofile-cloog:
+maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
+clean-stageprofile: clean-stageprofile-libcpp
+clean-stageprofile-libcpp:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stageprofile-cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageprofile-libcpp/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       cd $(HOST_SUBDIR)/cloog && \
+       cd $(HOST_SUBDIR)/libcpp && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" clean
-@endif cloog-bootstrap
+                clean
+@endif libcpp-bootstrap
 
 
-.PHONY: all-stagefeedback-cloog maybe-all-stagefeedback-cloog
-.PHONY: clean-stagefeedback-cloog maybe-clean-stagefeedback-cloog
-maybe-all-stagefeedback-cloog:
-maybe-clean-stagefeedback-cloog:
-@if cloog-bootstrap
-maybe-all-stagefeedback-cloog: all-stagefeedback-cloog
-all-stagefeedback: all-stagefeedback-cloog
-TARGET-stagefeedback-cloog = $(TARGET-cloog)
-all-stagefeedback-cloog: configure-stagefeedback-cloog
+.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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS;  \
-       cd $(HOST_SUBDIR)/cloog && \
+       $(POSTSTAGE1_HOST_EXPORTS)  \
+       cd $(HOST_SUBDIR)/libcpp && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -20819,80 +20018,92 @@ all-stagefeedback-cloog: configure-stagefeedback-cloog
                CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
                CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEfeedback_TFLAGS)" \
-               $(TARGET-stagefeedback-cloog)
+               $(TARGET-stagefeedback-libcpp)
 
-maybe-clean-stagefeedback-cloog: clean-stagefeedback-cloog
-clean-stagefeedback: clean-stagefeedback-cloog
-clean-stagefeedback-cloog:
+maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
+clean-stagefeedback: clean-stagefeedback-libcpp
+clean-stagefeedback-libcpp:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-cloog/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stagefeedback-libcpp/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       cd $(HOST_SUBDIR)/cloog && \
+       cd $(HOST_SUBDIR)/libcpp && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" clean
-@endif cloog-bootstrap
+                clean
+@endif libcpp-bootstrap
 
 
 
 
 
-.PHONY: check-cloog maybe-check-cloog
-maybe-check-cloog:
-@if cloog
-maybe-check-cloog: check-cloog
+.PHONY: check-libcpp maybe-check-libcpp
+maybe-check-libcpp:
+@if libcpp
+maybe-check-libcpp: check-libcpp
 
-check-cloog:
+check-libcpp:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/cloog && \
-         $(MAKE) $(FLAGS_TO_PASS) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS" check)
+       (cd $(HOST_SUBDIR)/libcpp && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif cloog
+@endif libcpp
 
-.PHONY: install-cloog maybe-install-cloog
-maybe-install-cloog:
-@if cloog
-maybe-install-cloog: install-cloog
+.PHONY: install-libcpp maybe-install-libcpp
+maybe-install-libcpp:
+@if libcpp
+maybe-install-libcpp: install-libcpp
 
-install-cloog:
+install-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)
 
-@endif cloog
+@endif libcpp
 
-.PHONY: install-strip-cloog maybe-install-strip-cloog
-maybe-install-strip-cloog:
-@if cloog
-maybe-install-strip-cloog: install-strip-cloog
+.PHONY: install-strip-libcpp maybe-install-strip-libcpp
+maybe-install-strip-libcpp:
+@if libcpp
+maybe-install-strip-libcpp: install-strip-libcpp
 
-install-strip-cloog:
+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 cloog
+@endif libcpp
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-cloog info-cloog
-maybe-info-cloog:
-@if cloog
-maybe-info-cloog: info-cloog
+.PHONY: maybe-info-libcpp info-libcpp
+maybe-info-libcpp:
+@if libcpp
+maybe-info-libcpp: info-libcpp
 
-info-cloog: \
-    configure-cloog 
-       @[ -f ./cloog/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing info in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -20900,24 +20111,24 @@ info-cloog: \
                  info) \
          || exit 1
 
-@endif cloog
+@endif libcpp
 
-.PHONY: maybe-dvi-cloog dvi-cloog
-maybe-dvi-cloog:
-@if cloog
-maybe-dvi-cloog: dvi-cloog
+.PHONY: maybe-dvi-libcpp dvi-libcpp
+maybe-dvi-libcpp:
+@if libcpp
+maybe-dvi-libcpp: dvi-libcpp
 
-dvi-cloog: \
-    configure-cloog 
-       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing dvi in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -20925,24 +20136,24 @@ dvi-cloog: \
                  dvi) \
          || exit 1
 
-@endif cloog
+@endif libcpp
 
-.PHONY: maybe-pdf-cloog pdf-cloog
-maybe-pdf-cloog:
-@if cloog
-maybe-pdf-cloog: pdf-cloog
+.PHONY: maybe-pdf-libcpp pdf-libcpp
+maybe-pdf-libcpp:
+@if libcpp
+maybe-pdf-libcpp: pdf-libcpp
 
-pdf-cloog: \
-    configure-cloog 
-       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing pdf in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -20950,24 +20161,24 @@ pdf-cloog: \
                  pdf) \
          || exit 1
 
-@endif cloog
+@endif libcpp
 
-.PHONY: maybe-html-cloog html-cloog
-maybe-html-cloog:
-@if cloog
-maybe-html-cloog: html-cloog
+.PHONY: maybe-html-libcpp html-libcpp
+maybe-html-libcpp:
+@if libcpp
+maybe-html-libcpp: html-libcpp
 
-html-cloog: \
-    configure-cloog 
-       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing html in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -20975,24 +20186,24 @@ html-cloog: \
                  html) \
          || exit 1
 
-@endif cloog
+@endif libcpp
 
-.PHONY: maybe-TAGS-cloog TAGS-cloog
-maybe-TAGS-cloog:
-@if cloog
-maybe-TAGS-cloog: TAGS-cloog
+.PHONY: maybe-TAGS-libcpp TAGS-libcpp
+maybe-TAGS-libcpp:
+@if libcpp
+maybe-TAGS-libcpp: TAGS-libcpp
 
-TAGS-cloog: \
-    configure-cloog 
-       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing TAGS in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21000,25 +20211,25 @@ TAGS-cloog: \
                  TAGS) \
          || exit 1
 
-@endif cloog
+@endif libcpp
 
-.PHONY: maybe-install-info-cloog install-info-cloog
-maybe-install-info-cloog:
-@if cloog
-maybe-install-info-cloog: install-info-cloog
+.PHONY: maybe-install-info-libcpp install-info-libcpp
+maybe-install-info-libcpp:
+@if libcpp
+maybe-install-info-libcpp: install-info-libcpp
 
-install-info-cloog: \
-    configure-cloog \
-    info-cloog 
-       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-info in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing install-info in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21026,25 +20237,25 @@ install-info-cloog: \
                  install-info) \
          || exit 1
 
-@endif cloog
+@endif libcpp
 
-.PHONY: maybe-install-pdf-cloog install-pdf-cloog
-maybe-install-pdf-cloog:
-@if cloog
-maybe-install-pdf-cloog: install-pdf-cloog
+.PHONY: maybe-install-pdf-libcpp install-pdf-libcpp
+maybe-install-pdf-libcpp:
+@if libcpp
+maybe-install-pdf-libcpp: install-pdf-libcpp
 
-install-pdf-cloog: \
-    configure-cloog \
-    pdf-cloog 
-       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-pdf in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing install-pdf in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21052,25 +20263,25 @@ install-pdf-cloog: \
                  install-pdf) \
          || exit 1
 
-@endif cloog
+@endif libcpp
 
-.PHONY: maybe-install-html-cloog install-html-cloog
-maybe-install-html-cloog:
-@if cloog
-maybe-install-html-cloog: install-html-cloog
+.PHONY: maybe-install-html-libcpp install-html-libcpp
+maybe-install-html-libcpp:
+@if libcpp
+maybe-install-html-libcpp: install-html-libcpp
 
-install-html-cloog: \
-    configure-cloog \
-    html-cloog 
-       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing install-html in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing install-html in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21078,24 +20289,24 @@ install-html-cloog: \
                  install-html) \
          || exit 1
 
-@endif cloog
+@endif libcpp
 
-.PHONY: maybe-installcheck-cloog installcheck-cloog
-maybe-installcheck-cloog:
-@if cloog
-maybe-installcheck-cloog: installcheck-cloog
+.PHONY: maybe-installcheck-libcpp installcheck-libcpp
+maybe-installcheck-libcpp:
+@if libcpp
+maybe-installcheck-libcpp: installcheck-libcpp
 
-installcheck-cloog: \
-    configure-cloog 
-       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing installcheck in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21103,23 +20314,23 @@ installcheck-cloog: \
                  installcheck) \
          || exit 1
 
-@endif cloog
+@endif libcpp
 
-.PHONY: maybe-mostlyclean-cloog mostlyclean-cloog
-maybe-mostlyclean-cloog:
-@if cloog
-maybe-mostlyclean-cloog: mostlyclean-cloog
+.PHONY: maybe-mostlyclean-libcpp mostlyclean-libcpp
+maybe-mostlyclean-libcpp:
+@if libcpp
+maybe-mostlyclean-libcpp: mostlyclean-libcpp
 
-mostlyclean-cloog: 
-       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing mostlyclean in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21127,23 +20338,23 @@ mostlyclean-cloog:
                  mostlyclean) \
          || exit 1
 
-@endif cloog
+@endif libcpp
 
-.PHONY: maybe-clean-cloog clean-cloog
-maybe-clean-cloog:
-@if cloog
-maybe-clean-cloog: clean-cloog
+.PHONY: maybe-clean-libcpp clean-libcpp
+maybe-clean-libcpp:
+@if libcpp
+maybe-clean-libcpp: clean-libcpp
 
-clean-cloog: 
-       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing clean in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21151,23 +20362,23 @@ clean-cloog:
                  clean) \
          || exit 1
 
-@endif cloog
+@endif libcpp
 
-.PHONY: maybe-distclean-cloog distclean-cloog
-maybe-distclean-cloog:
-@if cloog
-maybe-distclean-cloog: distclean-cloog
+.PHONY: maybe-distclean-libcpp distclean-libcpp
+maybe-distclean-libcpp:
+@if libcpp
+maybe-distclean-libcpp: distclean-libcpp
 
-distclean-cloog: 
-       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing distclean in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21175,23 +20386,23 @@ distclean-cloog:
                  distclean) \
          || exit 1
 
-@endif cloog
+@endif libcpp
 
-.PHONY: maybe-maintainer-clean-cloog maintainer-clean-cloog
-maybe-maintainer-clean-cloog:
-@if cloog
-maybe-maintainer-clean-cloog: maintainer-clean-cloog
+.PHONY: maybe-maintainer-clean-libcpp maintainer-clean-libcpp
+maybe-maintainer-clean-libcpp:
+@if libcpp
+maybe-maintainer-clean-libcpp: maintainer-clean-libcpp
 
-maintainer-clean-cloog: 
-       @[ -f ./cloog/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) CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"; do \
+       for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing maintainer-clean in cloog" ; \
-       (cd $(HOST_SUBDIR)/cloog && \
+       echo "Doing maintainer-clean in libcpp" ; \
+       (cd $(HOST_SUBDIR)/libcpp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -21199,280 +20410,274 @@ maintainer-clean-cloog:
                  maintainer-clean) \
          || exit 1
 
-@endif cloog
+@endif libcpp
 
 
 
-.PHONY: configure-libelf maybe-configure-libelf
-maybe-configure-libelf:
+.PHONY: configure-libdecnumber maybe-configure-libdecnumber
+maybe-configure-libdecnumber:
 @if gcc-bootstrap
-configure-libelf: stage_current
+configure-libdecnumber: stage_current
 @endif gcc-bootstrap
-@if libelf
-maybe-configure-libelf: configure-libelf
-configure-libelf: 
+@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)/libelf/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/libelf; \
-       cd "$(HOST_SUBDIR)/libelf" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libdecnumber; \
+       cd "$(HOST_SUBDIR)/libdecnumber" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libelf"; \
-       libsrcdir="$$s/libelf"; \
+       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
+       libsrcdir="$$s/libdecnumber"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} --disable-shared \
+         --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif libelf
+@endif libdecnumber
 
 
 
-.PHONY: configure-stage1-libelf maybe-configure-stage1-libelf
-maybe-configure-stage1-libelf:
-@if libelf-bootstrap
-maybe-configure-stage1-libelf: configure-stage1-libelf
-configure-stage1-libelf:
+.PHONY: configure-stage1-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)/libelf
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
        $(HOST_EXPORTS) \
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/libelf ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-       cd $(HOST_SUBDIR)/libelf || exit 1; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/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)/libelf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libelf"; \
-       libsrcdir="$$s/libelf"; \
+       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
+       libsrcdir="$$s/libdecnumber"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption} \
-         $(STAGE1_CONFIGURE_FLAGS) \
-         --disable-shared
-@endif libelf-bootstrap
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
 
-.PHONY: configure-stage2-libelf maybe-configure-stage2-libelf
-maybe-configure-stage2-libelf:
-@if libelf-bootstrap
-maybe-configure-stage2-libelf: configure-stage2-libelf
-configure-stage2-libelf:
+.PHONY: configure-stage2-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)/libelf
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE2_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/libelf ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-       cd $(HOST_SUBDIR)/libelf || exit 1; \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/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)/libelf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libelf"; \
-       libsrcdir="$$s/libelf"; \
+       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_CONFIGURE_FLAGS) \
-         --disable-shared
-@endif libelf-bootstrap
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
 
-.PHONY: configure-stage3-libelf maybe-configure-stage3-libelf
-maybe-configure-stage3-libelf:
-@if libelf-bootstrap
-maybe-configure-stage3-libelf: configure-stage3-libelf
-configure-stage3-libelf:
+.PHONY: configure-stage3-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)/libelf
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE3_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/libelf ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-       cd $(HOST_SUBDIR)/libelf || exit 1; \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/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)/libelf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libelf"; \
-       libsrcdir="$$s/libelf"; \
+       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) \
-         $(STAGE3_CONFIGURE_FLAGS) \
-         --disable-shared
-@endif libelf-bootstrap
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
 
-.PHONY: configure-stage4-libelf maybe-configure-stage4-libelf
-maybe-configure-stage4-libelf:
-@if libelf-bootstrap
-maybe-configure-stage4-libelf: configure-stage4-libelf
-configure-stage4-libelf:
+.PHONY: configure-stage4-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)/libelf
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGE4_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/libelf ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-       cd $(HOST_SUBDIR)/libelf || exit 1; \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/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)/libelf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libelf"; \
-       libsrcdir="$$s/libelf"; \
+       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) \
-         $(STAGE4_CONFIGURE_FLAGS) \
-         --disable-shared
-@endif libelf-bootstrap
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
 
-.PHONY: configure-stageprofile-libelf maybe-configure-stageprofile-libelf
-maybe-configure-stageprofile-libelf:
-@if libelf-bootstrap
-maybe-configure-stageprofile-libelf: configure-stageprofile-libelf
-configure-stageprofile-libelf:
+.PHONY: configure-stageprofile-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)/libelf
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/libelf ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-       cd $(HOST_SUBDIR)/libelf || exit 1; \
+       echo Configuring stage profile in $(HOST_SUBDIR)/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)/libelf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libelf"; \
-       libsrcdir="$$s/libelf"; \
+       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) \
-         $(STAGEprofile_CONFIGURE_FLAGS) \
-         --disable-shared
-@endif libelf-bootstrap
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
 
-.PHONY: configure-stagefeedback-libelf maybe-configure-stagefeedback-libelf
-maybe-configure-stagefeedback-libelf:
-@if libelf-bootstrap
-maybe-configure-stagefeedback-libelf: configure-stagefeedback-libelf
-configure-stagefeedback-libelf:
+.PHONY: configure-stagefeedback-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)/libelf
+       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS) \
        CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/libelf ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \
-       cd $(HOST_SUBDIR)/libelf || exit 1; \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/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)/libelf/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libelf"; \
-       libsrcdir="$$s/libelf"; \
+       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) \
-         $(STAGEfeedback_CONFIGURE_FLAGS) \
-         --disable-shared
-@endif libelf-bootstrap
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif libdecnumber-bootstrap
 
 
 
 
 
-.PHONY: all-libelf maybe-all-libelf
-maybe-all-libelf:
+.PHONY: all-libdecnumber maybe-all-libdecnumber
+maybe-all-libdecnumber:
 @if gcc-bootstrap
-all-libelf: stage_current
+all-libdecnumber: stage_current
 @endif gcc-bootstrap
-@if libelf
-TARGET-libelf=all
-maybe-all-libelf: all-libelf
-all-libelf: configure-libelf
+@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)/libelf && \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-libelf))
-@endif libelf
+               $(TARGET-libdecnumber))
+@endif libdecnumber
 
 
 
-.PHONY: all-stage1-libelf maybe-all-stage1-libelf
-.PHONY: clean-stage1-libelf maybe-clean-stage1-libelf
-maybe-all-stage1-libelf:
-maybe-clean-stage1-libelf:
-@if libelf-bootstrap
-maybe-all-stage1-libelf: all-stage1-libelf
-all-stage1: all-stage1-libelf
-TARGET-stage1-libelf = $(TARGET-libelf)
-all-stage1-libelf: configure-stage1-libelf
+.PHONY: all-stage1-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; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
        $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/libdecnumber && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -21482,39 +20687,39 @@ all-stage1-libelf: configure-stage1-libelf
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS)   \
                TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-libelf)
+               $(TARGET-stage1-libdecnumber)
 
-maybe-clean-stage1-libelf: clean-stage1-libelf
-clean-stage1: clean-stage1-libelf
-clean-stage1-libelf:
+maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber
+clean-stage1: clean-stage1-libdecnumber
+clean-stage1-libdecnumber:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage1-libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage1-libdecnumber/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/libdecnumber && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                 clean
-@endif libelf-bootstrap
+@endif libdecnumber-bootstrap
 
 
-.PHONY: all-stage2-libelf maybe-all-stage2-libelf
-.PHONY: clean-stage2-libelf maybe-clean-stage2-libelf
-maybe-all-stage2-libelf:
-maybe-clean-stage2-libelf:
-@if libelf-bootstrap
-maybe-all-stage2-libelf: all-stage2-libelf
-all-stage2: all-stage2-libelf
-TARGET-stage2-libelf = $(TARGET-libelf)
-all-stage2-libelf: configure-stage2-libelf
+.PHONY: all-stage2-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)/libelf && \
+       cd $(HOST_SUBDIR)/libdecnumber && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -21524,40 +20729,40 @@ all-stage2-libelf: configure-stage2-libelf
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE2_TFLAGS)" \
-               $(TARGET-stage2-libelf)
+               $(TARGET-stage2-libdecnumber)
 
-maybe-clean-stage2-libelf: clean-stage2-libelf
-clean-stage2: clean-stage2-libelf
-clean-stage2-libelf:
+maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber
+clean-stage2: clean-stage2-libdecnumber
+clean-stage2-libdecnumber:
        @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage2-libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage2-libdecnumber/Makefile ] || exit 0; \
          $(MAKE) stage2-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/libdecnumber && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif libelf-bootstrap
+@endif libdecnumber-bootstrap
 
 
-.PHONY: all-stage3-libelf maybe-all-stage3-libelf
-.PHONY: clean-stage3-libelf maybe-clean-stage3-libelf
-maybe-all-stage3-libelf:
-maybe-clean-stage3-libelf:
-@if libelf-bootstrap
-maybe-all-stage3-libelf: all-stage3-libelf
-all-stage3: all-stage3-libelf
-TARGET-stage3-libelf = $(TARGET-libelf)
-all-stage3-libelf: configure-stage3-libelf
+.PHONY: all-stage3-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)/libelf && \
+       cd $(HOST_SUBDIR)/libdecnumber && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -21567,40 +20772,40 @@ all-stage3-libelf: configure-stage3-libelf
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE3_TFLAGS)" \
-               $(TARGET-stage3-libelf)
+               $(TARGET-stage3-libdecnumber)
 
-maybe-clean-stage3-libelf: clean-stage3-libelf
-clean-stage3: clean-stage3-libelf
-clean-stage3-libelf:
+maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber
+clean-stage3: clean-stage3-libdecnumber
+clean-stage3-libdecnumber:
        @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage3-libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage3-libdecnumber/Makefile ] || exit 0; \
          $(MAKE) stage3-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/libdecnumber && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif libelf-bootstrap
+@endif libdecnumber-bootstrap
 
 
-.PHONY: all-stage4-libelf maybe-all-stage4-libelf
-.PHONY: clean-stage4-libelf maybe-clean-stage4-libelf
-maybe-all-stage4-libelf:
-maybe-clean-stage4-libelf:
-@if libelf-bootstrap
-maybe-all-stage4-libelf: all-stage4-libelf
-all-stage4: all-stage4-libelf
-TARGET-stage4-libelf = $(TARGET-libelf)
-all-stage4-libelf: configure-stage4-libelf
+.PHONY: all-stage4-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)/libelf && \
+       cd $(HOST_SUBDIR)/libdecnumber && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -21610,40 +20815,40 @@ all-stage4-libelf: configure-stage4-libelf
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE4_TFLAGS)" \
-               $(TARGET-stage4-libelf)
+               $(TARGET-stage4-libdecnumber)
 
-maybe-clean-stage4-libelf: clean-stage4-libelf
-clean-stage4: clean-stage4-libelf
-clean-stage4-libelf:
+maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber
+clean-stage4: clean-stage4-libdecnumber
+clean-stage4-libdecnumber:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage4-libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage4-libdecnumber/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/libdecnumber && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif libelf-bootstrap
+@endif libdecnumber-bootstrap
 
 
-.PHONY: all-stageprofile-libelf maybe-all-stageprofile-libelf
-.PHONY: clean-stageprofile-libelf maybe-clean-stageprofile-libelf
-maybe-all-stageprofile-libelf:
-maybe-clean-stageprofile-libelf:
-@if libelf-bootstrap
-maybe-all-stageprofile-libelf: all-stageprofile-libelf
-all-stageprofile: all-stageprofile-libelf
-TARGET-stageprofile-libelf = $(TARGET-libelf)
-all-stageprofile-libelf: configure-stageprofile-libelf
+.PHONY: all-stageprofile-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)/libelf && \
+       cd $(HOST_SUBDIR)/libdecnumber && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -21653,40 +20858,40 @@ all-stageprofile-libelf: configure-stageprofile-libelf
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEprofile_TFLAGS)" \
-               $(TARGET-stageprofile-libelf)
+               $(TARGET-stageprofile-libdecnumber)
 
-maybe-clean-stageprofile-libelf: clean-stageprofile-libelf
-clean-stageprofile: clean-stageprofile-libelf
-clean-stageprofile-libelf:
+maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber
+clean-stageprofile: clean-stageprofile-libdecnumber
+clean-stageprofile-libdecnumber:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stageprofile-libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageprofile-libdecnumber/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/libdecnumber && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif libelf-bootstrap
+@endif libdecnumber-bootstrap
 
 
-.PHONY: all-stagefeedback-libelf maybe-all-stagefeedback-libelf
-.PHONY: clean-stagefeedback-libelf maybe-clean-stagefeedback-libelf
-maybe-all-stagefeedback-libelf:
-maybe-clean-stagefeedback-libelf:
-@if libelf-bootstrap
-maybe-all-stagefeedback-libelf: all-stagefeedback-libelf
-all-stagefeedback: all-stagefeedback-libelf
-TARGET-stagefeedback-libelf = $(TARGET-libelf)
-all-stagefeedback-libelf: configure-stagefeedback-libelf
+.PHONY: all-stagefeedback-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)/libelf && \
+       cd $(HOST_SUBDIR)/libdecnumber && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -21696,78 +20901,90 @@ all-stagefeedback-libelf: configure-stagefeedback-libelf
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEfeedback_TFLAGS)" \
-               $(TARGET-stagefeedback-libelf)
+               $(TARGET-stagefeedback-libdecnumber)
 
-maybe-clean-stagefeedback-libelf: clean-stagefeedback-libelf
-clean-stagefeedback: clean-stagefeedback-libelf
-clean-stagefeedback-libelf:
+maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber
+clean-stagefeedback: clean-stagefeedback-libdecnumber
+clean-stagefeedback-libdecnumber:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-libelf/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stagefeedback-libdecnumber/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       cd $(HOST_SUBDIR)/libelf && \
+       cd $(HOST_SUBDIR)/libdecnumber && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif libelf-bootstrap
+@endif libdecnumber-bootstrap
 
 
 
 
 
-.PHONY: check-libelf maybe-check-libelf
-maybe-check-libelf:
-@if libelf
-maybe-check-libelf: check-libelf
+.PHONY: check-libdecnumber maybe-check-libdecnumber
+maybe-check-libdecnumber:
+@if libdecnumber
+maybe-check-libdecnumber: check-libdecnumber
 
-check-libelf:
+check-libdecnumber:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libelf && \
+       (cd $(HOST_SUBDIR)/libdecnumber && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif libelf
+@endif libdecnumber
 
-.PHONY: install-libelf maybe-install-libelf
-maybe-install-libelf:
-@if libelf
-maybe-install-libelf: install-libelf
+.PHONY: install-libdecnumber maybe-install-libdecnumber
+maybe-install-libdecnumber:
+@if libdecnumber
+maybe-install-libdecnumber: install-libdecnumber
 
-install-libelf:
+install-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)
 
-@endif libelf
+@endif libdecnumber
 
-.PHONY: install-strip-libelf maybe-install-strip-libelf
-maybe-install-strip-libelf:
-@if libelf
-maybe-install-strip-libelf: install-strip-libelf
+.PHONY: install-strip-libdecnumber maybe-install-strip-libdecnumber
+maybe-install-strip-libdecnumber:
+@if libdecnumber
+maybe-install-strip-libdecnumber: install-strip-libdecnumber
 
-install-strip-libelf:
+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 libelf
+@endif libdecnumber
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-libelf info-libelf
-maybe-info-libelf:
-@if libelf
-maybe-info-libelf: info-libelf
+.PHONY: maybe-info-libdecnumber info-libdecnumber
+maybe-info-libdecnumber:
+@if libdecnumber
+maybe-info-libdecnumber: info-libdecnumber
 
-info-libelf: \
-    configure-libelf 
-       @[ -f ./libelf/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       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}" \
@@ -21775,24 +20992,24 @@ info-libelf: \
                  info) \
          || exit 1
 
-@endif libelf
+@endif libdecnumber
 
-.PHONY: maybe-dvi-libelf dvi-libelf
-maybe-dvi-libelf:
-@if libelf
-maybe-dvi-libelf: dvi-libelf
+.PHONY: maybe-dvi-libdecnumber dvi-libdecnumber
+maybe-dvi-libdecnumber:
+@if libdecnumber
+maybe-dvi-libdecnumber: dvi-libdecnumber
 
-dvi-libelf: \
-    configure-libelf 
-       @[ -f ./libelf/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       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}" \
@@ -21800,24 +21017,24 @@ dvi-libelf: \
                  dvi) \
          || exit 1
 
-@endif libelf
+@endif libdecnumber
 
-.PHONY: maybe-pdf-libelf pdf-libelf
-maybe-pdf-libelf:
-@if libelf
-maybe-pdf-libelf: pdf-libelf
+.PHONY: maybe-pdf-libdecnumber pdf-libdecnumber
+maybe-pdf-libdecnumber:
+@if libdecnumber
+maybe-pdf-libdecnumber: pdf-libdecnumber
 
-pdf-libelf: \
-    configure-libelf 
-       @[ -f ./libelf/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       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}" \
@@ -21825,24 +21042,24 @@ pdf-libelf: \
                  pdf) \
          || exit 1
 
-@endif libelf
+@endif libdecnumber
 
-.PHONY: maybe-html-libelf html-libelf
-maybe-html-libelf:
-@if libelf
-maybe-html-libelf: html-libelf
+.PHONY: maybe-html-libdecnumber html-libdecnumber
+maybe-html-libdecnumber:
+@if libdecnumber
+maybe-html-libdecnumber: html-libdecnumber
 
-html-libelf: \
-    configure-libelf 
-       @[ -f ./libelf/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       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}" \
@@ -21850,24 +21067,24 @@ html-libelf: \
                  html) \
          || exit 1
 
-@endif libelf
+@endif libdecnumber
 
-.PHONY: maybe-TAGS-libelf TAGS-libelf
-maybe-TAGS-libelf:
-@if libelf
-maybe-TAGS-libelf: TAGS-libelf
+.PHONY: maybe-TAGS-libdecnumber TAGS-libdecnumber
+maybe-TAGS-libdecnumber:
+@if libdecnumber
+maybe-TAGS-libdecnumber: TAGS-libdecnumber
 
-TAGS-libelf: \
-    configure-libelf 
-       @[ -f ./libelf/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       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}" \
@@ -21875,25 +21092,25 @@ TAGS-libelf: \
                  TAGS) \
          || exit 1
 
-@endif libelf
+@endif libdecnumber
 
-.PHONY: maybe-install-info-libelf install-info-libelf
-maybe-install-info-libelf:
-@if libelf
-maybe-install-info-libelf: install-info-libelf
+.PHONY: maybe-install-info-libdecnumber install-info-libdecnumber
+maybe-install-info-libdecnumber:
+@if libdecnumber
+maybe-install-info-libdecnumber: install-info-libdecnumber
 
-install-info-libelf: \
-    configure-libelf \
-    info-libelf 
-       @[ -f ./libelf/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       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}" \
@@ -21901,25 +21118,25 @@ install-info-libelf: \
                  install-info) \
          || exit 1
 
-@endif libelf
+@endif libdecnumber
 
-.PHONY: maybe-install-pdf-libelf install-pdf-libelf
-maybe-install-pdf-libelf:
-@if libelf
-maybe-install-pdf-libelf: install-pdf-libelf
+.PHONY: maybe-install-pdf-libdecnumber install-pdf-libdecnumber
+maybe-install-pdf-libdecnumber:
+@if libdecnumber
+maybe-install-pdf-libdecnumber: install-pdf-libdecnumber
 
-install-pdf-libelf: \
-    configure-libelf \
-    pdf-libelf 
-       @[ -f ./libelf/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       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}" \
@@ -21927,25 +21144,25 @@ install-pdf-libelf: \
                  install-pdf) \
          || exit 1
 
-@endif libelf
+@endif libdecnumber
 
-.PHONY: maybe-install-html-libelf install-html-libelf
-maybe-install-html-libelf:
-@if libelf
-maybe-install-html-libelf: install-html-libelf
+.PHONY: maybe-install-html-libdecnumber install-html-libdecnumber
+maybe-install-html-libdecnumber:
+@if libdecnumber
+maybe-install-html-libdecnumber: install-html-libdecnumber
 
-install-html-libelf: \
-    configure-libelf \
-    html-libelf 
-       @[ -f ./libelf/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       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}" \
@@ -21953,24 +21170,24 @@ install-html-libelf: \
                  install-html) \
          || exit 1
 
-@endif libelf
+@endif libdecnumber
 
-.PHONY: maybe-installcheck-libelf installcheck-libelf
-maybe-installcheck-libelf:
-@if libelf
-maybe-installcheck-libelf: installcheck-libelf
+.PHONY: maybe-installcheck-libdecnumber installcheck-libdecnumber
+maybe-installcheck-libdecnumber:
+@if libdecnumber
+maybe-installcheck-libdecnumber: installcheck-libdecnumber
 
-installcheck-libelf: \
-    configure-libelf 
-       @[ -f ./libelf/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       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}" \
@@ -21978,23 +21195,23 @@ installcheck-libelf: \
                  installcheck) \
          || exit 1
 
-@endif libelf
+@endif libdecnumber
 
-.PHONY: maybe-mostlyclean-libelf mostlyclean-libelf
-maybe-mostlyclean-libelf:
-@if libelf
-maybe-mostlyclean-libelf: mostlyclean-libelf
+.PHONY: maybe-mostlyclean-libdecnumber mostlyclean-libdecnumber
+maybe-mostlyclean-libdecnumber:
+@if libdecnumber
+maybe-mostlyclean-libdecnumber: mostlyclean-libdecnumber
 
-mostlyclean-libelf: 
-       @[ -f ./libelf/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       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}" \
@@ -22002,23 +21219,23 @@ mostlyclean-libelf:
                  mostlyclean) \
          || exit 1
 
-@endif libelf
+@endif libdecnumber
 
-.PHONY: maybe-clean-libelf clean-libelf
-maybe-clean-libelf:
-@if libelf
-maybe-clean-libelf: clean-libelf
+.PHONY: maybe-clean-libdecnumber clean-libdecnumber
+maybe-clean-libdecnumber:
+@if libdecnumber
+maybe-clean-libdecnumber: clean-libdecnumber
 
-clean-libelf: 
-       @[ -f ./libelf/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       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}" \
@@ -22026,23 +21243,23 @@ clean-libelf:
                  clean) \
          || exit 1
 
-@endif libelf
+@endif libdecnumber
 
-.PHONY: maybe-distclean-libelf distclean-libelf
-maybe-distclean-libelf:
-@if libelf
-maybe-distclean-libelf: distclean-libelf
+.PHONY: maybe-distclean-libdecnumber distclean-libdecnumber
+maybe-distclean-libdecnumber:
+@if libdecnumber
+maybe-distclean-libdecnumber: distclean-libdecnumber
 
-distclean-libelf: 
-       @[ -f ./libelf/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       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}" \
@@ -22050,23 +21267,23 @@ distclean-libelf:
                  distclean) \
          || exit 1
 
-@endif libelf
+@endif libdecnumber
 
-.PHONY: maybe-maintainer-clean-libelf maintainer-clean-libelf
-maybe-maintainer-clean-libelf:
-@if libelf
-maybe-maintainer-clean-libelf: maintainer-clean-libelf
+.PHONY: maybe-maintainer-clean-libdecnumber maintainer-clean-libdecnumber
+maybe-maintainer-clean-libdecnumber:
+@if libdecnumber
+maybe-maintainer-clean-libdecnumber: maintainer-clean-libdecnumber
 
-maintainer-clean-libelf: 
-       @[ -f ./libelf/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 libelf" ; \
-       (cd $(HOST_SUBDIR)/libelf && \
+       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}" \
@@ -22074,128 +21291,128 @@ maintainer-clean-libelf:
                  maintainer-clean) \
          || exit 1
 
-@endif libelf
+@endif libdecnumber
 
 
 
-.PHONY: configure-gnuserv maybe-configure-gnuserv
-maybe-configure-gnuserv:
+.PHONY: configure-libgui maybe-configure-libgui
+maybe-configure-libgui:
 @if gcc-bootstrap
-configure-gnuserv: stage_current
+configure-libgui: stage_current
 @endif gcc-bootstrap
-@if gnuserv
-maybe-configure-gnuserv: configure-gnuserv
-configure-gnuserv: 
+@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)/gnuserv/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnuserv ; \
+       test ! -f $(HOST_SUBDIR)/libgui/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/gnuserv; \
-       cd "$(HOST_SUBDIR)/gnuserv" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libgui; \
+       cd "$(HOST_SUBDIR)/libgui" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gnuserv/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libgui/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gnuserv"; \
-       libsrcdir="$$s/gnuserv"; \
+       srcdiroption="--srcdir=$${topdir}/libgui"; \
+       libsrcdir="$$s/libgui"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif gnuserv
+@endif libgui
 
 
 
 
 
-.PHONY: all-gnuserv maybe-all-gnuserv
-maybe-all-gnuserv:
+.PHONY: all-libgui maybe-all-libgui
+maybe-all-libgui:
 @if gcc-bootstrap
-all-gnuserv: stage_current
+all-libgui: stage_current
 @endif gcc-bootstrap
-@if gnuserv
-TARGET-gnuserv=all
-maybe-all-gnuserv: all-gnuserv
-all-gnuserv: configure-gnuserv
+@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)/gnuserv && \
+       (cd $(HOST_SUBDIR)/libgui && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-gnuserv))
-@endif gnuserv
+               $(TARGET-libgui))
+@endif libgui
 
 
 
 
-.PHONY: check-gnuserv maybe-check-gnuserv
-maybe-check-gnuserv:
-@if gnuserv
-maybe-check-gnuserv: check-gnuserv
+.PHONY: check-libgui maybe-check-libgui
+maybe-check-libgui:
+@if libgui
+maybe-check-libgui: check-libgui
 
-check-gnuserv:
+check-libgui:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gnuserv && \
+       (cd $(HOST_SUBDIR)/libgui && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif gnuserv
+@endif libgui
 
-.PHONY: install-gnuserv maybe-install-gnuserv
-maybe-install-gnuserv:
-@if gnuserv
-maybe-install-gnuserv: install-gnuserv
+.PHONY: install-libgui maybe-install-libgui
+maybe-install-libgui:
+@if libgui
+maybe-install-libgui: install-libgui
 
-install-gnuserv: installdirs
+install-libgui: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gnuserv && \
+       (cd $(HOST_SUBDIR)/libgui && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif gnuserv
+@endif libgui
 
-.PHONY: install-strip-gnuserv maybe-install-strip-gnuserv
-maybe-install-strip-gnuserv:
-@if gnuserv
-maybe-install-strip-gnuserv: install-strip-gnuserv
+.PHONY: install-strip-libgui maybe-install-strip-libgui
+maybe-install-strip-libgui:
+@if libgui
+maybe-install-strip-libgui: install-strip-libgui
 
-install-strip-gnuserv: installdirs
+install-strip-libgui: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gnuserv && \
+       (cd $(HOST_SUBDIR)/libgui && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif gnuserv
+@endif libgui
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-gnuserv info-gnuserv
-maybe-info-gnuserv:
-@if gnuserv
-maybe-info-gnuserv: info-gnuserv
+.PHONY: maybe-info-libgui info-libgui
+maybe-info-libgui:
+@if libgui
+maybe-info-libgui: info-libgui
 
-info-gnuserv: \
-    configure-gnuserv 
+info-libgui: \
+    configure-libgui 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
+       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}" \
@@ -22203,25 +21420,25 @@ info-gnuserv: \
                  info) \
          || exit 1
 
-@endif gnuserv
+@endif libgui
 
-.PHONY: maybe-dvi-gnuserv dvi-gnuserv
-maybe-dvi-gnuserv:
-@if gnuserv
-maybe-dvi-gnuserv: dvi-gnuserv
+.PHONY: maybe-dvi-libgui dvi-libgui
+maybe-dvi-libgui:
+@if libgui
+maybe-dvi-libgui: dvi-libgui
 
-dvi-gnuserv: \
-    configure-gnuserv 
+dvi-libgui: \
+    configure-libgui 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
+       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}" \
@@ -22229,25 +21446,25 @@ dvi-gnuserv: \
                  dvi) \
          || exit 1
 
-@endif gnuserv
+@endif libgui
 
-.PHONY: maybe-pdf-gnuserv pdf-gnuserv
-maybe-pdf-gnuserv:
-@if gnuserv
-maybe-pdf-gnuserv: pdf-gnuserv
+.PHONY: maybe-pdf-libgui pdf-libgui
+maybe-pdf-libgui:
+@if libgui
+maybe-pdf-libgui: pdf-libgui
 
-pdf-gnuserv: \
-    configure-gnuserv 
+pdf-libgui: \
+    configure-libgui 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
+       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}" \
@@ -22255,25 +21472,25 @@ pdf-gnuserv: \
                  pdf) \
          || exit 1
 
-@endif gnuserv
+@endif libgui
 
-.PHONY: maybe-html-gnuserv html-gnuserv
-maybe-html-gnuserv:
-@if gnuserv
-maybe-html-gnuserv: html-gnuserv
+.PHONY: maybe-html-libgui html-libgui
+maybe-html-libgui:
+@if libgui
+maybe-html-libgui: html-libgui
 
-html-gnuserv: \
-    configure-gnuserv 
+html-libgui: \
+    configure-libgui 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
+       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}" \
@@ -22281,25 +21498,25 @@ html-gnuserv: \
                  html) \
          || exit 1
 
-@endif gnuserv
+@endif libgui
 
-.PHONY: maybe-TAGS-gnuserv TAGS-gnuserv
-maybe-TAGS-gnuserv:
-@if gnuserv
-maybe-TAGS-gnuserv: TAGS-gnuserv
+.PHONY: maybe-TAGS-libgui TAGS-libgui
+maybe-TAGS-libgui:
+@if libgui
+maybe-TAGS-libgui: TAGS-libgui
 
-TAGS-gnuserv: \
-    configure-gnuserv 
+TAGS-libgui: \
+    configure-libgui 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
+       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}" \
@@ -22307,26 +21524,26 @@ TAGS-gnuserv: \
                  TAGS) \
          || exit 1
 
-@endif gnuserv
+@endif libgui
 
-.PHONY: maybe-install-info-gnuserv install-info-gnuserv
-maybe-install-info-gnuserv:
-@if gnuserv
-maybe-install-info-gnuserv: install-info-gnuserv
+.PHONY: maybe-install-info-libgui install-info-libgui
+maybe-install-info-libgui:
+@if libgui
+maybe-install-info-libgui: install-info-libgui
 
-install-info-gnuserv: \
-    configure-gnuserv \
-    info-gnuserv 
+install-info-libgui: \
+    configure-libgui \
+    info-libgui 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
+       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}" \
@@ -22334,26 +21551,26 @@ install-info-gnuserv: \
                  install-info) \
          || exit 1
 
-@endif gnuserv
+@endif libgui
 
-.PHONY: maybe-install-pdf-gnuserv install-pdf-gnuserv
-maybe-install-pdf-gnuserv:
-@if gnuserv
-maybe-install-pdf-gnuserv: install-pdf-gnuserv
+.PHONY: maybe-install-pdf-libgui install-pdf-libgui
+maybe-install-pdf-libgui:
+@if libgui
+maybe-install-pdf-libgui: install-pdf-libgui
 
-install-pdf-gnuserv: \
-    configure-gnuserv \
-    pdf-gnuserv 
+install-pdf-libgui: \
+    configure-libgui \
+    pdf-libgui 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
+       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}" \
@@ -22361,26 +21578,26 @@ install-pdf-gnuserv: \
                  install-pdf) \
          || exit 1
 
-@endif gnuserv
+@endif libgui
 
-.PHONY: maybe-install-html-gnuserv install-html-gnuserv
-maybe-install-html-gnuserv:
-@if gnuserv
-maybe-install-html-gnuserv: install-html-gnuserv
+.PHONY: maybe-install-html-libgui install-html-libgui
+maybe-install-html-libgui:
+@if libgui
+maybe-install-html-libgui: install-html-libgui
 
-install-html-gnuserv: \
-    configure-gnuserv \
-    html-gnuserv 
+install-html-libgui: \
+    configure-libgui \
+    html-libgui 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
+       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}" \
@@ -22388,25 +21605,25 @@ install-html-gnuserv: \
                  install-html) \
          || exit 1
 
-@endif gnuserv
+@endif libgui
 
-.PHONY: maybe-installcheck-gnuserv installcheck-gnuserv
-maybe-installcheck-gnuserv:
-@if gnuserv
-maybe-installcheck-gnuserv: installcheck-gnuserv
+.PHONY: maybe-installcheck-libgui installcheck-libgui
+maybe-installcheck-libgui:
+@if libgui
+maybe-installcheck-libgui: installcheck-libgui
 
-installcheck-gnuserv: \
-    configure-gnuserv 
+installcheck-libgui: \
+    configure-libgui 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
+       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}" \
@@ -22414,24 +21631,24 @@ installcheck-gnuserv: \
                  installcheck) \
          || exit 1
 
-@endif gnuserv
+@endif libgui
 
-.PHONY: maybe-mostlyclean-gnuserv mostlyclean-gnuserv
-maybe-mostlyclean-gnuserv:
-@if gnuserv
-maybe-mostlyclean-gnuserv: mostlyclean-gnuserv
+.PHONY: maybe-mostlyclean-libgui mostlyclean-libgui
+maybe-mostlyclean-libgui:
+@if libgui
+maybe-mostlyclean-libgui: mostlyclean-libgui
 
-mostlyclean-gnuserv: 
+mostlyclean-libgui: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
+       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}" \
@@ -22439,24 +21656,24 @@ mostlyclean-gnuserv:
                  mostlyclean) \
          || exit 1
 
-@endif gnuserv
+@endif libgui
 
-.PHONY: maybe-clean-gnuserv clean-gnuserv
-maybe-clean-gnuserv:
-@if gnuserv
-maybe-clean-gnuserv: clean-gnuserv
+.PHONY: maybe-clean-libgui clean-libgui
+maybe-clean-libgui:
+@if libgui
+maybe-clean-libgui: clean-libgui
 
-clean-gnuserv: 
+clean-libgui: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
+       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}" \
@@ -22464,24 +21681,24 @@ clean-gnuserv:
                  clean) \
          || exit 1
 
-@endif gnuserv
+@endif libgui
 
-.PHONY: maybe-distclean-gnuserv distclean-gnuserv
-maybe-distclean-gnuserv:
-@if gnuserv
-maybe-distclean-gnuserv: distclean-gnuserv
+.PHONY: maybe-distclean-libgui distclean-libgui
+maybe-distclean-libgui:
+@if libgui
+maybe-distclean-libgui: distclean-libgui
 
-distclean-gnuserv: 
+distclean-libgui: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
+       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}" \
@@ -22489,24 +21706,24 @@ distclean-gnuserv:
                  distclean) \
          || exit 1
 
-@endif gnuserv
+@endif libgui
 
-.PHONY: maybe-maintainer-clean-gnuserv maintainer-clean-gnuserv
-maybe-maintainer-clean-gnuserv:
-@if gnuserv
-maybe-maintainer-clean-gnuserv: maintainer-clean-gnuserv
+.PHONY: maybe-maintainer-clean-libgui maintainer-clean-libgui
+maybe-maintainer-clean-libgui:
+@if libgui
+maybe-maintainer-clean-libgui: maintainer-clean-libgui
 
-maintainer-clean-gnuserv: 
+maintainer-clean-libgui: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gnuserv/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 gnuserv" ; \
-       (cd $(HOST_SUBDIR)/gnuserv && \
+       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}" \
@@ -22514,274 +21731,280 @@ maintainer-clean-gnuserv:
                  maintainer-clean) \
          || exit 1
 
-@endif gnuserv
+@endif libgui
 
 
 
-.PHONY: configure-gold maybe-configure-gold
-maybe-configure-gold:
+.PHONY: configure-libiberty maybe-configure-libiberty
+maybe-configure-libiberty:
 @if gcc-bootstrap
-configure-gold: stage_current
+configure-libiberty: stage_current
 @endif gcc-bootstrap
-@if gold
-maybe-configure-gold: configure-gold
-configure-gold: 
+@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)/gold/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \
+       test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/gold; \
-       cd "$(HOST_SUBDIR)/gold" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libiberty; \
+       cd "$(HOST_SUBDIR)/libiberty" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
+       srcdiroption="--srcdir=$${topdir}/libiberty"; \
+       libsrcdir="$$s/libiberty"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias} $${srcdiroption} @extra_host_libiberty_configure_flags@ \
          || exit 1
-@endif gold
+@endif libiberty
 
 
 
-.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-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)/gold
+       @$(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)/gold/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libiberty/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; \
+       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)/gold/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
+       srcdiroption="--srcdir=$${topdir}/libiberty"; \
+       libsrcdir="$$s/libiberty"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption} \
-         $(STAGE1_CONFIGURE_FLAGS)
-@endif gold-bootstrap
+         $(STAGE1_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@
+@endif libiberty-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:
+.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)/gold
+       @$(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)/gold/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libiberty/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; \
+       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)/gold/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
+       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_CONFIGURE_FLAGS)
-@endif gold-bootstrap
+         $(STAGE2_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@
+@endif libiberty-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:
+.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)/gold
+       @$(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)/gold/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libiberty/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; \
+       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)/gold/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
+       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) \
-         $(STAGE3_CONFIGURE_FLAGS)
-@endif gold-bootstrap
+         $(STAGE3_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@
+@endif libiberty-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:
+.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)/gold
+       @$(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)/gold/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libiberty/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; \
+       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)/gold/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
+       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) \
-         $(STAGE4_CONFIGURE_FLAGS)
-@endif gold-bootstrap
+         $(STAGE4_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@
+@endif libiberty-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:
+.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)/gold
+       @$(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)/gold/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libiberty/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; \
+       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)/gold/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
+       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) \
-         $(STAGEprofile_CONFIGURE_FLAGS)
-@endif gold-bootstrap
+         $(STAGEprofile_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@
+@endif libiberty-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:
+.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)/gold
+       @$(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)/gold/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/libiberty/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; \
+       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)/gold/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gold"; \
-       libsrcdir="$$s/gold"; \
+       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) \
-         $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif gold-bootstrap
+         $(STAGEfeedback_CONFIGURE_FLAGS) \
+         @extra_host_libiberty_configure_flags@
+@endif libiberty-bootstrap
 
 
 
 
 
-.PHONY: all-gold maybe-all-gold
-maybe-all-gold:
+.PHONY: all-libiberty maybe-all-libiberty
+maybe-all-libiberty:
 @if gcc-bootstrap
-all-gold: stage_current
+all-libiberty: stage_current
 @endif gcc-bootstrap
-@if gold
-TARGET-gold=all
-maybe-all-gold: all-gold
-all-gold: configure-gold
+@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)/gold && \
+       (cd $(HOST_SUBDIR)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-gold))
-@endif gold
+               $(TARGET-libiberty))
+@endif libiberty
 
 
 
-.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
+.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; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
        $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gold && \
+       cd $(HOST_SUBDIR)/libiberty && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -22791,39 +22014,39 @@ all-stage1-gold: configure-stage1-gold
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS)   \
                TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-gold)
+               $(TARGET-stage1-libiberty)
 
-maybe-clean-stage1-gold: clean-stage1-gold
-clean-stage1: clean-stage1-gold
-clean-stage1-gold:
+maybe-clean-stage1-libiberty: clean-stage1-libiberty
+clean-stage1: clean-stage1-libiberty
+clean-stage1-libiberty:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage1-gold/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage1-libiberty/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(HOST_SUBDIR)/gold && \
+       cd $(HOST_SUBDIR)/libiberty && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                 clean
-@endif gold-bootstrap
+@endif libiberty-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
+.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) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gold && \
+       cd $(HOST_SUBDIR)/libiberty && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -22833,40 +22056,40 @@ all-stage2-gold: configure-stage2-gold
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE2_TFLAGS)" \
-               $(TARGET-stage2-gold)
+               $(TARGET-stage2-libiberty)
 
-maybe-clean-stage2-gold: clean-stage2-gold
-clean-stage2: clean-stage2-gold
-clean-stage2-gold:
+maybe-clean-stage2-libiberty: clean-stage2-libiberty
+clean-stage2: clean-stage2-libiberty
+clean-stage2-libiberty:
        @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage2-gold/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage2-libiberty/Makefile ] || exit 0; \
          $(MAKE) stage2-start; \
        fi; \
-       cd $(HOST_SUBDIR)/gold && \
+       cd $(HOST_SUBDIR)/libiberty && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif gold-bootstrap
+@endif libiberty-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
+.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) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gold && \
+       cd $(HOST_SUBDIR)/libiberty && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -22876,40 +22099,40 @@ all-stage3-gold: configure-stage3-gold
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE3_TFLAGS)" \
-               $(TARGET-stage3-gold)
+               $(TARGET-stage3-libiberty)
 
-maybe-clean-stage3-gold: clean-stage3-gold
-clean-stage3: clean-stage3-gold
-clean-stage3-gold:
+maybe-clean-stage3-libiberty: clean-stage3-libiberty
+clean-stage3: clean-stage3-libiberty
+clean-stage3-libiberty:
        @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage3-gold/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage3-libiberty/Makefile ] || exit 0; \
          $(MAKE) stage3-start; \
        fi; \
-       cd $(HOST_SUBDIR)/gold && \
+       cd $(HOST_SUBDIR)/libiberty && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif gold-bootstrap
+@endif libiberty-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
+.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) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gold && \
+       cd $(HOST_SUBDIR)/libiberty && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -22919,40 +22142,40 @@ all-stage4-gold: configure-stage4-gold
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE4_TFLAGS)" \
-               $(TARGET-stage4-gold)
+               $(TARGET-stage4-libiberty)
 
-maybe-clean-stage4-gold: clean-stage4-gold
-clean-stage4: clean-stage4-gold
-clean-stage4-gold:
+maybe-clean-stage4-libiberty: clean-stage4-libiberty
+clean-stage4: clean-stage4-libiberty
+clean-stage4-libiberty:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage4-gold/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage4-libiberty/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       cd $(HOST_SUBDIR)/gold && \
+       cd $(HOST_SUBDIR)/libiberty && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif gold-bootstrap
+@endif libiberty-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
+.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) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gold && \
+       cd $(HOST_SUBDIR)/libiberty && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -22962,40 +22185,40 @@ all-stageprofile-gold: configure-stageprofile-gold
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEprofile_TFLAGS)" \
-               $(TARGET-stageprofile-gold)
+               $(TARGET-stageprofile-libiberty)
 
-maybe-clean-stageprofile-gold: clean-stageprofile-gold
-clean-stageprofile: clean-stageprofile-gold
-clean-stageprofile-gold:
+maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
+clean-stageprofile: clean-stageprofile-libiberty
+clean-stageprofile-libiberty:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stageprofile-gold/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageprofile-libiberty/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       cd $(HOST_SUBDIR)/gold && \
+       cd $(HOST_SUBDIR)/libiberty && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif gold-bootstrap
+@endif libiberty-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
+.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; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/gold && \
+       cd $(HOST_SUBDIR)/libiberty && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -23005,90 +22228,90 @@ all-stagefeedback-gold: configure-stagefeedback-gold
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEfeedback_TFLAGS)" \
-               $(TARGET-stagefeedback-gold)
+               $(TARGET-stagefeedback-libiberty)
 
-maybe-clean-stagefeedback-gold: clean-stagefeedback-gold
-clean-stagefeedback: clean-stagefeedback-gold
-clean-stagefeedback-gold:
+maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
+clean-stagefeedback: clean-stagefeedback-libiberty
+clean-stagefeedback-libiberty:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-gold/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stagefeedback-libiberty/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       cd $(HOST_SUBDIR)/gold && \
+       cd $(HOST_SUBDIR)/libiberty && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif gold-bootstrap
+@endif libiberty-bootstrap
 
 
 
 
 
-.PHONY: check-gold maybe-check-gold
-maybe-check-gold:
-@if gold
-maybe-check-gold: check-gold
+.PHONY: check-libiberty maybe-check-libiberty
+maybe-check-libiberty:
+@if libiberty
+maybe-check-libiberty: check-libiberty
 
-check-gold:
+check-libiberty:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gold && \
+       (cd $(HOST_SUBDIR)/libiberty && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif gold
+@endif libiberty
 
-.PHONY: install-gold maybe-install-gold
-maybe-install-gold:
-@if gold
-maybe-install-gold: install-gold
+.PHONY: install-libiberty maybe-install-libiberty
+maybe-install-libiberty:
+@if libiberty
+maybe-install-libiberty: install-libiberty
 
-install-gold: installdirs
+install-libiberty: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gold && \
+       (cd $(HOST_SUBDIR)/libiberty && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif gold
+@endif libiberty
 
-.PHONY: install-strip-gold maybe-install-strip-gold
-maybe-install-strip-gold:
-@if gold
-maybe-install-strip-gold: install-strip-gold
+.PHONY: install-strip-libiberty maybe-install-strip-libiberty
+maybe-install-strip-libiberty:
+@if libiberty
+maybe-install-strip-libiberty: install-strip-libiberty
 
-install-strip-gold: installdirs
+install-strip-libiberty: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gold && \
+       (cd $(HOST_SUBDIR)/libiberty && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif gold
+@endif libiberty
 
 # 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-libiberty info-libiberty
+maybe-info-libiberty:
+@if libiberty
+maybe-info-libiberty: info-libiberty
 
-info-gold: \
-    configure-gold 
-       @[ -f ./gold/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       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}" \
@@ -23096,24 +22319,24 @@ info-gold: \
                  info) \
          || exit 1
 
-@endif gold
+@endif libiberty
 
-.PHONY: maybe-dvi-gold dvi-gold
-maybe-dvi-gold:
-@if gold
-maybe-dvi-gold: dvi-gold
+.PHONY: maybe-dvi-libiberty dvi-libiberty
+maybe-dvi-libiberty:
+@if libiberty
+maybe-dvi-libiberty: dvi-libiberty
 
-dvi-gold: \
-    configure-gold 
-       @[ -f ./gold/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       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}" \
@@ -23121,24 +22344,24 @@ dvi-gold: \
                  dvi) \
          || exit 1
 
-@endif gold
+@endif libiberty
 
-.PHONY: maybe-pdf-gold pdf-gold
-maybe-pdf-gold:
-@if gold
-maybe-pdf-gold: pdf-gold
+.PHONY: maybe-pdf-libiberty pdf-libiberty
+maybe-pdf-libiberty:
+@if libiberty
+maybe-pdf-libiberty: pdf-libiberty
 
-pdf-gold: \
-    configure-gold 
-       @[ -f ./gold/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       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}" \
@@ -23146,24 +22369,24 @@ pdf-gold: \
                  pdf) \
          || exit 1
 
-@endif gold
+@endif libiberty
 
-.PHONY: maybe-html-gold html-gold
-maybe-html-gold:
-@if gold
-maybe-html-gold: html-gold
+.PHONY: maybe-html-libiberty html-libiberty
+maybe-html-libiberty:
+@if libiberty
+maybe-html-libiberty: html-libiberty
 
-html-gold: \
-    configure-gold 
-       @[ -f ./gold/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       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}" \
@@ -23171,24 +22394,24 @@ html-gold: \
                  html) \
          || exit 1
 
-@endif gold
+@endif libiberty
 
-.PHONY: maybe-TAGS-gold TAGS-gold
-maybe-TAGS-gold:
-@if gold
-maybe-TAGS-gold: TAGS-gold
+.PHONY: maybe-TAGS-libiberty TAGS-libiberty
+maybe-TAGS-libiberty:
+@if libiberty
+maybe-TAGS-libiberty: TAGS-libiberty
 
-TAGS-gold: \
-    configure-gold 
-       @[ -f ./gold/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       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}" \
@@ -23196,25 +22419,25 @@ TAGS-gold: \
                  TAGS) \
          || exit 1
 
-@endif gold
+@endif libiberty
 
-.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-libiberty install-info-libiberty
+maybe-install-info-libiberty:
+@if libiberty
+maybe-install-info-libiberty: install-info-libiberty
 
-install-info-gold: \
-    configure-gold \
-    info-gold 
-       @[ -f ./gold/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       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}" \
@@ -23222,25 +22445,25 @@ install-info-gold: \
                  install-info) \
          || exit 1
 
-@endif gold
+@endif libiberty
 
-.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-libiberty install-pdf-libiberty
+maybe-install-pdf-libiberty:
+@if libiberty
+maybe-install-pdf-libiberty: install-pdf-libiberty
 
-install-pdf-gold: \
-    configure-gold \
-    pdf-gold 
-       @[ -f ./gold/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       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}" \
@@ -23248,25 +22471,25 @@ install-pdf-gold: \
                  install-pdf) \
          || exit 1
 
-@endif gold
+@endif libiberty
 
-.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-libiberty install-html-libiberty
+maybe-install-html-libiberty:
+@if libiberty
+maybe-install-html-libiberty: install-html-libiberty
 
-install-html-gold: \
-    configure-gold \
-    html-gold 
-       @[ -f ./gold/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       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}" \
@@ -23274,24 +22497,24 @@ install-html-gold: \
                  install-html) \
          || exit 1
 
-@endif gold
+@endif libiberty
 
-.PHONY: maybe-installcheck-gold installcheck-gold
-maybe-installcheck-gold:
-@if gold
-maybe-installcheck-gold: installcheck-gold
+.PHONY: maybe-installcheck-libiberty installcheck-libiberty
+maybe-installcheck-libiberty:
+@if libiberty
+maybe-installcheck-libiberty: installcheck-libiberty
 
-installcheck-gold: \
-    configure-gold 
-       @[ -f ./gold/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       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}" \
@@ -23299,23 +22522,23 @@ installcheck-gold: \
                  installcheck) \
          || exit 1
 
-@endif gold
+@endif libiberty
 
-.PHONY: maybe-mostlyclean-gold mostlyclean-gold
-maybe-mostlyclean-gold:
-@if gold
-maybe-mostlyclean-gold: mostlyclean-gold
+.PHONY: maybe-mostlyclean-libiberty mostlyclean-libiberty
+maybe-mostlyclean-libiberty:
+@if libiberty
+maybe-mostlyclean-libiberty: mostlyclean-libiberty
 
-mostlyclean-gold: 
-       @[ -f ./gold/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       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}" \
@@ -23323,23 +22546,23 @@ mostlyclean-gold:
                  mostlyclean) \
          || exit 1
 
-@endif gold
+@endif libiberty
 
-.PHONY: maybe-clean-gold clean-gold
-maybe-clean-gold:
-@if gold
-maybe-clean-gold: clean-gold
+.PHONY: maybe-clean-libiberty clean-libiberty
+maybe-clean-libiberty:
+@if libiberty
+maybe-clean-libiberty: clean-libiberty
 
-clean-gold: 
-       @[ -f ./gold/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       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}" \
@@ -23347,23 +22570,23 @@ clean-gold:
                  clean) \
          || exit 1
 
-@endif gold
+@endif libiberty
 
-.PHONY: maybe-distclean-gold distclean-gold
-maybe-distclean-gold:
-@if gold
-maybe-distclean-gold: distclean-gold
+.PHONY: maybe-distclean-libiberty distclean-libiberty
+maybe-distclean-libiberty:
+@if libiberty
+maybe-distclean-libiberty: distclean-libiberty
 
-distclean-gold: 
-       @[ -f ./gold/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       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}" \
@@ -23371,23 +22594,23 @@ distclean-gold:
                  distclean) \
          || exit 1
 
-@endif gold
+@endif libiberty
 
-.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-libiberty maintainer-clean-libiberty
+maybe-maintainer-clean-libiberty:
+@if libiberty
+maybe-maintainer-clean-libiberty: maintainer-clean-libiberty
 
-maintainer-clean-gold: 
-       @[ -f ./gold/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 gold" ; \
-       (cd $(HOST_SUBDIR)/gold && \
+       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}" \
@@ -23395,128 +22618,116 @@ maintainer-clean-gold:
                  maintainer-clean) \
          || exit 1
 
-@endif gold
+@endif libiberty
 
 
 
-.PHONY: configure-gprof maybe-configure-gprof
-maybe-configure-gprof:
+.PHONY: configure-libiconv maybe-configure-libiconv
+maybe-configure-libiconv:
 @if gcc-bootstrap
-configure-gprof: stage_current
+configure-libiconv: stage_current
 @endif gcc-bootstrap
-@if gprof
-maybe-configure-gprof: configure-gprof
-configure-gprof: 
+@if libiconv
+maybe-configure-libiconv: configure-libiconv
+configure-libiconv: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof ; \
+       test ! -f $(HOST_SUBDIR)/libiconv/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/gprof; \
-       cd "$(HOST_SUBDIR)/gprof" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libiconv; \
+       cd "$(HOST_SUBDIR)/libiconv" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gprof/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gprof"; \
-       libsrcdir="$$s/gprof"; \
+       srcdiroption="--srcdir=$${topdir}/libiconv"; \
+       libsrcdir="$$s/libiconv"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias} $${srcdiroption} --disable-shared \
          || exit 1
-@endif gprof
+@endif libiconv
 
 
 
 
 
-.PHONY: all-gprof maybe-all-gprof
-maybe-all-gprof:
+.PHONY: all-libiconv maybe-all-libiconv
+maybe-all-libiconv:
 @if gcc-bootstrap
-all-gprof: stage_current
+all-libiconv: stage_current
 @endif gcc-bootstrap
-@if gprof
-TARGET-gprof=all
-maybe-all-gprof: all-gprof
-all-gprof: configure-gprof
+@if libiconv
+TARGET-libiconv=all
+maybe-all-libiconv: all-libiconv
+all-libiconv: configure-libiconv
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/gprof && \
+       (cd $(HOST_SUBDIR)/libiconv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-gprof))
-@endif gprof
+               $(TARGET-libiconv))
+@endif libiconv
 
 
 
 
-.PHONY: check-gprof maybe-check-gprof
-maybe-check-gprof:
-@if gprof
-maybe-check-gprof: check-gprof
+.PHONY: check-libiconv maybe-check-libiconv
+maybe-check-libiconv:
+@if libiconv
+maybe-check-libiconv: check-libiconv
 
-check-gprof:
+check-libiconv:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gprof && \
+       (cd $(HOST_SUBDIR)/libiconv && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif gprof
-
-.PHONY: install-gprof maybe-install-gprof
-maybe-install-gprof:
-@if gprof
-maybe-install-gprof: install-gprof
+@endif libiconv
 
-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)
+.PHONY: install-libiconv maybe-install-libiconv
+maybe-install-libiconv:
+@if libiconv
+maybe-install-libiconv: install-libiconv
 
-@endif gprof
+install-libiconv:
 
-.PHONY: install-strip-gprof maybe-install-strip-gprof
-maybe-install-strip-gprof:
-@if gprof
-maybe-install-strip-gprof: install-strip-gprof
+@endif libiconv
 
-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)
+.PHONY: install-strip-libiconv maybe-install-strip-libiconv
+maybe-install-strip-libiconv:
+@if libiconv
+maybe-install-strip-libiconv: install-strip-libiconv
 
-@endif gprof
+install-strip-libiconv:
+
+@endif libiconv
 
 # 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-libiconv info-libiconv
+maybe-info-libiconv:
+@if libiconv
+maybe-info-libiconv: info-libiconv
 
-info-gprof: \
-    configure-gprof 
+info-libiconv: \
+    configure-libiconv 
        @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+       @[ -f ./libiconv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       echo "Doing info in libiconv" ; \
+       (cd $(HOST_SUBDIR)/libiconv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -23524,25 +22735,25 @@ info-gprof: \
                  info) \
          || exit 1
 
-@endif gprof
+@endif libiconv
 
-.PHONY: maybe-dvi-gprof dvi-gprof
-maybe-dvi-gprof:
-@if gprof
-maybe-dvi-gprof: dvi-gprof
+.PHONY: maybe-dvi-libiconv dvi-libiconv
+maybe-dvi-libiconv:
+@if libiconv
+maybe-dvi-libiconv: dvi-libiconv
 
-dvi-gprof: \
-    configure-gprof 
+dvi-libiconv: \
+    configure-libiconv 
        @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+       @[ -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 gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       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}" \
@@ -23550,25 +22761,25 @@ dvi-gprof: \
                  dvi) \
          || exit 1
 
-@endif gprof
+@endif libiconv
 
-.PHONY: maybe-pdf-gprof pdf-gprof
-maybe-pdf-gprof:
-@if gprof
-maybe-pdf-gprof: pdf-gprof
+.PHONY: maybe-pdf-libiconv pdf-libiconv
+maybe-pdf-libiconv:
+@if libiconv
+maybe-pdf-libiconv: pdf-libiconv
 
-pdf-gprof: \
-    configure-gprof 
+pdf-libiconv: \
+    configure-libiconv 
        @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+       @[ -f ./libiconv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       echo "Doing pdf in libiconv" ; \
+       (cd $(HOST_SUBDIR)/libiconv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -23576,25 +22787,25 @@ pdf-gprof: \
                  pdf) \
          || exit 1
 
-@endif gprof
+@endif libiconv
 
-.PHONY: maybe-html-gprof html-gprof
-maybe-html-gprof:
-@if gprof
-maybe-html-gprof: html-gprof
+.PHONY: maybe-html-libiconv html-libiconv
+maybe-html-libiconv:
+@if libiconv
+maybe-html-libiconv: html-libiconv
 
-html-gprof: \
-    configure-gprof 
+html-libiconv: \
+    configure-libiconv 
        @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+       @[ -f ./libiconv/Makefile ] || exit 0; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       echo "Doing html in libiconv" ; \
+       (cd $(HOST_SUBDIR)/libiconv && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -23602,25 +22813,25 @@ html-gprof: \
                  html) \
          || exit 1
 
-@endif gprof
+@endif libiconv
 
-.PHONY: maybe-TAGS-gprof TAGS-gprof
-maybe-TAGS-gprof:
-@if gprof
-maybe-TAGS-gprof: TAGS-gprof
+.PHONY: maybe-TAGS-libiconv TAGS-libiconv
+maybe-TAGS-libiconv:
+@if libiconv
+maybe-TAGS-libiconv: TAGS-libiconv
 
-TAGS-gprof: \
-    configure-gprof 
+TAGS-libiconv: \
+    configure-libiconv 
        @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+       @[ -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 gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       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}" \
@@ -23628,106 +22839,55 @@ TAGS-gprof: \
                  TAGS) \
          || exit 1
 
-@endif gprof
+@endif libiconv
 
-.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-libiconv install-info-libiconv
+maybe-install-info-libiconv:
+@if libiconv
+maybe-install-info-libiconv: install-info-libiconv
 
-install-info-gprof: \
-    configure-gprof \
-    info-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing install-info in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-info) \
-         || exit 1
+# libiconv doesn't support install-info.
+install-info-libiconv:
 
-@endif gprof
+@endif libiconv
 
-.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-libiconv install-pdf-libiconv
+maybe-install-pdf-libiconv:
+@if libiconv
+maybe-install-pdf-libiconv: install-pdf-libiconv
 
-install-pdf-gprof: \
-    configure-gprof \
-    pdf-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing install-pdf in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-pdf) \
-         || exit 1
+# libiconv doesn't support install-pdf.
+install-pdf-libiconv:
 
-@endif gprof
+@endif libiconv
 
-.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-libiconv install-html-libiconv
+maybe-install-html-libiconv:
+@if libiconv
+maybe-install-html-libiconv: install-html-libiconv
 
-install-html-gprof: \
-    configure-gprof \
-    html-gprof 
-       @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing install-html in gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-html) \
-         || exit 1
+# libiconv doesn't support install-html.
+install-html-libiconv:
 
-@endif gprof
+@endif libiconv
 
-.PHONY: maybe-installcheck-gprof installcheck-gprof
-maybe-installcheck-gprof:
-@if gprof
-maybe-installcheck-gprof: installcheck-gprof
+.PHONY: maybe-installcheck-libiconv installcheck-libiconv
+maybe-installcheck-libiconv:
+@if libiconv
+maybe-installcheck-libiconv: installcheck-libiconv
 
-installcheck-gprof: \
-    configure-gprof 
+installcheck-libiconv: \
+    configure-libiconv 
        @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+       @[ -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 gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       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}" \
@@ -23735,24 +22895,24 @@ installcheck-gprof: \
                  installcheck) \
          || exit 1
 
-@endif gprof
+@endif libiconv
 
-.PHONY: maybe-mostlyclean-gprof mostlyclean-gprof
-maybe-mostlyclean-gprof:
-@if gprof
-maybe-mostlyclean-gprof: mostlyclean-gprof
+.PHONY: maybe-mostlyclean-libiconv mostlyclean-libiconv
+maybe-mostlyclean-libiconv:
+@if libiconv
+maybe-mostlyclean-libiconv: mostlyclean-libiconv
 
-mostlyclean-gprof: 
+mostlyclean-libiconv: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+       @[ -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 gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       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}" \
@@ -23760,24 +22920,24 @@ mostlyclean-gprof:
                  mostlyclean) \
          || exit 1
 
-@endif gprof
+@endif libiconv
 
-.PHONY: maybe-clean-gprof clean-gprof
-maybe-clean-gprof:
-@if gprof
-maybe-clean-gprof: clean-gprof
+.PHONY: maybe-clean-libiconv clean-libiconv
+maybe-clean-libiconv:
+@if libiconv
+maybe-clean-libiconv: clean-libiconv
 
-clean-gprof: 
+clean-libiconv: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+       @[ -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 gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       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}" \
@@ -23785,24 +22945,24 @@ clean-gprof:
                  clean) \
          || exit 1
 
-@endif gprof
+@endif libiconv
 
-.PHONY: maybe-distclean-gprof distclean-gprof
-maybe-distclean-gprof:
-@if gprof
-maybe-distclean-gprof: distclean-gprof
+.PHONY: maybe-distclean-libiconv distclean-libiconv
+maybe-distclean-libiconv:
+@if libiconv
+maybe-distclean-libiconv: distclean-libiconv
 
-distclean-gprof: 
+distclean-libiconv: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+       @[ -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 gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       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}" \
@@ -23810,24 +22970,24 @@ distclean-gprof:
                  distclean) \
          || exit 1
 
-@endif gprof
+@endif libiconv
 
-.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-libiconv maintainer-clean-libiconv
+maybe-maintainer-clean-libiconv:
+@if libiconv
+maybe-maintainer-clean-libiconv: maintainer-clean-libiconv
 
-maintainer-clean-gprof: 
+maintainer-clean-libiconv: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gprof/Makefile ] || exit 0; \
+       @[ -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 gprof" ; \
-       (cd $(HOST_SUBDIR)/gprof && \
+       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}" \
@@ -23835,128 +22995,128 @@ maintainer-clean-gprof:
                  maintainer-clean) \
          || exit 1
 
-@endif gprof
+@endif libiconv
 
 
 
-.PHONY: configure-gzip maybe-configure-gzip
-maybe-configure-gzip:
+.PHONY: configure-m4 maybe-configure-m4
+maybe-configure-m4:
 @if gcc-bootstrap
-configure-gzip: stage_current
+configure-m4: stage_current
 @endif gcc-bootstrap
-@if gzip
-maybe-configure-gzip: configure-gzip
-configure-gzip: 
+@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)/gzip/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gzip ; \
+       test ! -f $(HOST_SUBDIR)/m4/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/m4 ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/gzip; \
-       cd "$(HOST_SUBDIR)/gzip" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/m4; \
+       cd "$(HOST_SUBDIR)/m4" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/gzip/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/m4/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gzip"; \
-       libsrcdir="$$s/gzip"; \
+       srcdiroption="--srcdir=$${topdir}/m4"; \
+       libsrcdir="$$s/m4"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif gzip
+@endif m4
 
 
 
 
 
-.PHONY: all-gzip maybe-all-gzip
-maybe-all-gzip:
+.PHONY: all-m4 maybe-all-m4
+maybe-all-m4:
 @if gcc-bootstrap
-all-gzip: stage_current
+all-m4: stage_current
 @endif gcc-bootstrap
-@if gzip
-TARGET-gzip=all
-maybe-all-gzip: all-gzip
-all-gzip: configure-gzip
+@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)/gzip && \
+       (cd $(HOST_SUBDIR)/m4 && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-gzip))
-@endif gzip
+               $(TARGET-m4))
+@endif m4
 
 
 
 
-.PHONY: check-gzip maybe-check-gzip
-maybe-check-gzip:
-@if gzip
-maybe-check-gzip: check-gzip
+.PHONY: check-m4 maybe-check-m4
+maybe-check-m4:
+@if m4
+maybe-check-m4: check-m4
 
-check-gzip:
+check-m4:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gzip && \
+       (cd $(HOST_SUBDIR)/m4 && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif gzip
+@endif m4
 
-.PHONY: install-gzip maybe-install-gzip
-maybe-install-gzip:
-@if gzip
-maybe-install-gzip: install-gzip
+.PHONY: install-m4 maybe-install-m4
+maybe-install-m4:
+@if m4
+maybe-install-m4: install-m4
 
-install-gzip: installdirs
+install-m4: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gzip && \
+       (cd $(HOST_SUBDIR)/m4 && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif gzip
+@endif m4
 
-.PHONY: install-strip-gzip maybe-install-strip-gzip
-maybe-install-strip-gzip:
-@if gzip
-maybe-install-strip-gzip: install-strip-gzip
+.PHONY: install-strip-m4 maybe-install-strip-m4
+maybe-install-strip-m4:
+@if m4
+maybe-install-strip-m4: install-strip-m4
 
-install-strip-gzip: installdirs
+install-strip-m4: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gzip && \
+       (cd $(HOST_SUBDIR)/m4 && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif gzip
+@endif m4
 
 # 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-m4 info-m4
+maybe-info-m4:
+@if m4
+maybe-info-m4: info-m4
 
-info-gzip: \
-    configure-gzip 
+info-m4: \
+    configure-m4 
        @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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 gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -23964,25 +23124,25 @@ info-gzip: \
                  info) \
          || exit 1
 
-@endif gzip
+@endif m4
 
-.PHONY: maybe-dvi-gzip dvi-gzip
-maybe-dvi-gzip:
-@if gzip
-maybe-dvi-gzip: dvi-gzip
+.PHONY: maybe-dvi-m4 dvi-m4
+maybe-dvi-m4:
+@if m4
+maybe-dvi-m4: dvi-m4
 
-dvi-gzip: \
-    configure-gzip 
+dvi-m4: \
+    configure-m4 
        @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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 gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -23990,25 +23150,25 @@ dvi-gzip: \
                  dvi) \
          || exit 1
 
-@endif gzip
+@endif m4
 
-.PHONY: maybe-pdf-gzip pdf-gzip
-maybe-pdf-gzip:
-@if gzip
-maybe-pdf-gzip: pdf-gzip
+.PHONY: maybe-pdf-m4 pdf-m4
+maybe-pdf-m4:
+@if m4
+maybe-pdf-m4: pdf-m4
 
-pdf-gzip: \
-    configure-gzip 
+pdf-m4: \
+    configure-m4 
        @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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 gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -24016,25 +23176,25 @@ pdf-gzip: \
                  pdf) \
          || exit 1
 
-@endif gzip
+@endif m4
 
-.PHONY: maybe-html-gzip html-gzip
-maybe-html-gzip:
-@if gzip
-maybe-html-gzip: html-gzip
+.PHONY: maybe-html-m4 html-m4
+maybe-html-m4:
+@if m4
+maybe-html-m4: html-m4
 
-html-gzip: \
-    configure-gzip 
+html-m4: \
+    configure-m4 
        @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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 gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -24042,25 +23202,25 @@ html-gzip: \
                  html) \
          || exit 1
 
-@endif gzip
+@endif m4
 
-.PHONY: maybe-TAGS-gzip TAGS-gzip
-maybe-TAGS-gzip:
-@if gzip
-maybe-TAGS-gzip: TAGS-gzip
+.PHONY: maybe-TAGS-m4 TAGS-m4
+maybe-TAGS-m4:
+@if m4
+maybe-TAGS-m4: TAGS-m4
 
-TAGS-gzip: \
-    configure-gzip 
+TAGS-m4: \
+    configure-m4 
        @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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 gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -24068,26 +23228,26 @@ TAGS-gzip: \
                  TAGS) \
          || exit 1
 
-@endif gzip
+@endif m4
 
-.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-m4 install-info-m4
+maybe-install-info-m4:
+@if m4
+maybe-install-info-m4: install-info-m4
 
-install-info-gzip: \
-    configure-gzip \
-    info-gzip 
+install-info-m4: \
+    configure-m4 \
+    info-m4 
        @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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 gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -24095,26 +23255,26 @@ install-info-gzip: \
                  install-info) \
          || exit 1
 
-@endif gzip
+@endif m4
 
-.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-m4 install-pdf-m4
+maybe-install-pdf-m4:
+@if m4
+maybe-install-pdf-m4: install-pdf-m4
 
-install-pdf-gzip: \
-    configure-gzip \
-    pdf-gzip 
+install-pdf-m4: \
+    configure-m4 \
+    pdf-m4 
        @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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 gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -24122,26 +23282,26 @@ install-pdf-gzip: \
                  install-pdf) \
          || exit 1
 
-@endif gzip
+@endif m4
 
-.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-m4 install-html-m4
+maybe-install-html-m4:
+@if m4
+maybe-install-html-m4: install-html-m4
 
-install-html-gzip: \
-    configure-gzip \
-    html-gzip 
+install-html-m4: \
+    configure-m4 \
+    html-m4 
        @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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 gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -24149,25 +23309,25 @@ install-html-gzip: \
                  install-html) \
          || exit 1
 
-@endif gzip
+@endif m4
 
-.PHONY: maybe-installcheck-gzip installcheck-gzip
-maybe-installcheck-gzip:
-@if gzip
-maybe-installcheck-gzip: installcheck-gzip
+.PHONY: maybe-installcheck-m4 installcheck-m4
+maybe-installcheck-m4:
+@if m4
+maybe-installcheck-m4: installcheck-m4
 
-installcheck-gzip: \
-    configure-gzip 
+installcheck-m4: \
+    configure-m4 
        @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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 gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -24175,24 +23335,24 @@ installcheck-gzip: \
                  installcheck) \
          || exit 1
 
-@endif gzip
+@endif m4
 
-.PHONY: maybe-mostlyclean-gzip mostlyclean-gzip
-maybe-mostlyclean-gzip:
-@if gzip
-maybe-mostlyclean-gzip: mostlyclean-gzip
+.PHONY: maybe-mostlyclean-m4 mostlyclean-m4
+maybe-mostlyclean-m4:
+@if m4
+maybe-mostlyclean-m4: mostlyclean-m4
 
-mostlyclean-gzip: 
+mostlyclean-m4: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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 gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -24200,24 +23360,24 @@ mostlyclean-gzip:
                  mostlyclean) \
          || exit 1
 
-@endif gzip
+@endif m4
 
-.PHONY: maybe-clean-gzip clean-gzip
-maybe-clean-gzip:
-@if gzip
-maybe-clean-gzip: clean-gzip
+.PHONY: maybe-clean-m4 clean-m4
+maybe-clean-m4:
+@if m4
+maybe-clean-m4: clean-m4
 
-clean-gzip: 
+clean-m4: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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 gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -24225,24 +23385,24 @@ clean-gzip:
                  clean) \
          || exit 1
 
-@endif gzip
+@endif m4
 
-.PHONY: maybe-distclean-gzip distclean-gzip
-maybe-distclean-gzip:
-@if gzip
-maybe-distclean-gzip: distclean-gzip
+.PHONY: maybe-distclean-m4 distclean-m4
+maybe-distclean-m4:
+@if m4
+maybe-distclean-m4: distclean-m4
 
-distclean-gzip: 
+distclean-m4: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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 gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -24250,24 +23410,24 @@ distclean-gzip:
                  distclean) \
          || exit 1
 
-@endif gzip
+@endif m4
 
-.PHONY: maybe-maintainer-clean-gzip maintainer-clean-gzip
-maybe-maintainer-clean-gzip:
-@if gzip
-maybe-maintainer-clean-gzip: maintainer-clean-gzip
+.PHONY: maybe-maintainer-clean-m4 maintainer-clean-m4
+maybe-maintainer-clean-m4:
+@if m4
+maybe-maintainer-clean-m4: maintainer-clean-m4
 
-maintainer-clean-gzip: 
+maintainer-clean-m4: 
        @: $(MAKE); $(unstage)
-       @[ -f ./gzip/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 gzip" ; \
-       (cd $(HOST_SUBDIR)/gzip && \
+       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}" \
@@ -24275,128 +23435,128 @@ maintainer-clean-gzip:
                  maintainer-clean) \
          || exit 1
 
-@endif gzip
+@endif m4
 
 
 
-.PHONY: configure-hello maybe-configure-hello
-maybe-configure-hello:
+.PHONY: configure-readline maybe-configure-readline
+maybe-configure-readline:
 @if gcc-bootstrap
-configure-hello: stage_current
+configure-readline: stage_current
 @endif gcc-bootstrap
-@if hello
-maybe-configure-hello: configure-hello
-configure-hello: 
+@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)/hello/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/hello ; \
+       test ! -f $(HOST_SUBDIR)/readline/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/readline ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/hello; \
-       cd "$(HOST_SUBDIR)/hello" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/readline; \
+       cd "$(HOST_SUBDIR)/readline" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/hello/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/readline/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/hello"; \
-       libsrcdir="$$s/hello"; \
+       srcdiroption="--srcdir=$${topdir}/readline"; \
+       libsrcdir="$$s/readline"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif hello
+@endif readline
 
 
 
 
 
-.PHONY: all-hello maybe-all-hello
-maybe-all-hello:
+.PHONY: all-readline maybe-all-readline
+maybe-all-readline:
 @if gcc-bootstrap
-all-hello: stage_current
+all-readline: stage_current
 @endif gcc-bootstrap
-@if hello
-TARGET-hello=all
-maybe-all-hello: all-hello
-all-hello: configure-hello
+@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)/hello && \
+       (cd $(HOST_SUBDIR)/readline && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-hello))
-@endif hello
+               $(TARGET-readline))
+@endif readline
 
 
 
 
-.PHONY: check-hello maybe-check-hello
-maybe-check-hello:
-@if hello
-maybe-check-hello: check-hello
+.PHONY: check-readline maybe-check-readline
+maybe-check-readline:
+@if readline
+maybe-check-readline: check-readline
 
-check-hello:
+check-readline:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/hello && \
+       (cd $(HOST_SUBDIR)/readline && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif hello
+@endif readline
 
-.PHONY: install-hello maybe-install-hello
-maybe-install-hello:
-@if hello
-maybe-install-hello: install-hello
+.PHONY: install-readline maybe-install-readline
+maybe-install-readline:
+@if readline
+maybe-install-readline: install-readline
 
-install-hello: installdirs
+install-readline: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/hello && \
+       (cd $(HOST_SUBDIR)/readline && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif hello
-
-.PHONY: install-strip-hello maybe-install-strip-hello
-maybe-install-strip-hello:
-@if hello
-maybe-install-strip-hello: install-strip-hello
+@endif readline
 
-install-strip-hello: installdirs
+.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)/hello && \
+       (cd $(HOST_SUBDIR)/readline && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif hello
+@endif readline
 
 # 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-readline info-readline
+maybe-info-readline:
+@if readline
+maybe-info-readline: info-readline
 
-info-hello: \
-    configure-hello 
+info-readline: \
+    configure-readline 
        @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -24404,25 +23564,25 @@ info-hello: \
                  info) \
          || exit 1
 
-@endif hello
+@endif readline
 
-.PHONY: maybe-dvi-hello dvi-hello
-maybe-dvi-hello:
-@if hello
-maybe-dvi-hello: dvi-hello
+.PHONY: maybe-dvi-readline dvi-readline
+maybe-dvi-readline:
+@if readline
+maybe-dvi-readline: dvi-readline
 
-dvi-hello: \
-    configure-hello 
+dvi-readline: \
+    configure-readline 
        @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -24430,25 +23590,25 @@ dvi-hello: \
                  dvi) \
          || exit 1
 
-@endif hello
+@endif readline
 
-.PHONY: maybe-pdf-hello pdf-hello
-maybe-pdf-hello:
-@if hello
-maybe-pdf-hello: pdf-hello
+.PHONY: maybe-pdf-readline pdf-readline
+maybe-pdf-readline:
+@if readline
+maybe-pdf-readline: pdf-readline
 
-pdf-hello: \
-    configure-hello 
+pdf-readline: \
+    configure-readline 
        @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -24456,25 +23616,25 @@ pdf-hello: \
                  pdf) \
          || exit 1
 
-@endif hello
+@endif readline
 
-.PHONY: maybe-html-hello html-hello
-maybe-html-hello:
-@if hello
-maybe-html-hello: html-hello
+.PHONY: maybe-html-readline html-readline
+maybe-html-readline:
+@if readline
+maybe-html-readline: html-readline
 
-html-hello: \
-    configure-hello 
+html-readline: \
+    configure-readline 
        @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -24482,25 +23642,25 @@ html-hello: \
                  html) \
          || exit 1
 
-@endif hello
+@endif readline
 
-.PHONY: maybe-TAGS-hello TAGS-hello
-maybe-TAGS-hello:
-@if hello
-maybe-TAGS-hello: TAGS-hello
+.PHONY: maybe-TAGS-readline TAGS-readline
+maybe-TAGS-readline:
+@if readline
+maybe-TAGS-readline: TAGS-readline
 
-TAGS-hello: \
-    configure-hello 
+TAGS-readline: \
+    configure-readline 
        @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -24508,26 +23668,26 @@ TAGS-hello: \
                  TAGS) \
          || exit 1
 
-@endif hello
+@endif readline
 
-.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-readline install-info-readline
+maybe-install-info-readline:
+@if readline
+maybe-install-info-readline: install-info-readline
 
-install-info-hello: \
-    configure-hello \
-    info-hello 
+install-info-readline: \
+    configure-readline \
+    info-readline 
        @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -24535,26 +23695,26 @@ install-info-hello: \
                  install-info) \
          || exit 1
 
-@endif hello
+@endif readline
 
-.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-readline install-pdf-readline
+maybe-install-pdf-readline:
+@if readline
+maybe-install-pdf-readline: install-pdf-readline
 
-install-pdf-hello: \
-    configure-hello \
-    pdf-hello 
+install-pdf-readline: \
+    configure-readline \
+    pdf-readline 
        @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -24562,26 +23722,26 @@ install-pdf-hello: \
                  install-pdf) \
          || exit 1
 
-@endif hello
+@endif readline
 
-.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-readline install-html-readline
+maybe-install-html-readline:
+@if readline
+maybe-install-html-readline: install-html-readline
 
-install-html-hello: \
-    configure-hello \
-    html-hello 
+install-html-readline: \
+    configure-readline \
+    html-readline 
        @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -24589,25 +23749,25 @@ install-html-hello: \
                  install-html) \
          || exit 1
 
-@endif hello
+@endif readline
 
-.PHONY: maybe-installcheck-hello installcheck-hello
-maybe-installcheck-hello:
-@if hello
-maybe-installcheck-hello: installcheck-hello
+.PHONY: maybe-installcheck-readline installcheck-readline
+maybe-installcheck-readline:
+@if readline
+maybe-installcheck-readline: installcheck-readline
 
-installcheck-hello: \
-    configure-hello 
+installcheck-readline: \
+    configure-readline 
        @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -24615,24 +23775,24 @@ installcheck-hello: \
                  installcheck) \
          || exit 1
 
-@endif hello
+@endif readline
 
-.PHONY: maybe-mostlyclean-hello mostlyclean-hello
-maybe-mostlyclean-hello:
-@if hello
-maybe-mostlyclean-hello: mostlyclean-hello
+.PHONY: maybe-mostlyclean-readline mostlyclean-readline
+maybe-mostlyclean-readline:
+@if readline
+maybe-mostlyclean-readline: mostlyclean-readline
 
-mostlyclean-hello: 
+mostlyclean-readline: 
        @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -24640,24 +23800,24 @@ mostlyclean-hello:
                  mostlyclean) \
          || exit 1
 
-@endif hello
+@endif readline
 
-.PHONY: maybe-clean-hello clean-hello
-maybe-clean-hello:
-@if hello
-maybe-clean-hello: clean-hello
+.PHONY: maybe-clean-readline clean-readline
+maybe-clean-readline:
+@if readline
+maybe-clean-readline: clean-readline
 
-clean-hello: 
+clean-readline: 
        @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -24665,24 +23825,24 @@ clean-hello:
                  clean) \
          || exit 1
 
-@endif hello
+@endif readline
 
-.PHONY: maybe-distclean-hello distclean-hello
-maybe-distclean-hello:
-@if hello
-maybe-distclean-hello: distclean-hello
+.PHONY: maybe-distclean-readline distclean-readline
+maybe-distclean-readline:
+@if readline
+maybe-distclean-readline: distclean-readline
 
-distclean-hello: 
+distclean-readline: 
        @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -24690,24 +23850,24 @@ distclean-hello:
                  distclean) \
          || exit 1
 
-@endif hello
+@endif readline
 
-.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-readline maintainer-clean-readline
+maybe-maintainer-clean-readline:
+@if readline
+maybe-maintainer-clean-readline: maintainer-clean-readline
 
-maintainer-clean-hello: 
+maintainer-clean-readline: 
        @: $(MAKE); $(unstage)
-       @[ -f ./hello/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 hello" ; \
-       (cd $(HOST_SUBDIR)/hello && \
+       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}" \
@@ -24715,128 +23875,128 @@ maintainer-clean-hello:
                  maintainer-clean) \
          || exit 1
 
-@endif hello
+@endif readline
 
 
 
-.PHONY: configure-indent maybe-configure-indent
-maybe-configure-indent:
+.PHONY: configure-sid maybe-configure-sid
+maybe-configure-sid:
 @if gcc-bootstrap
-configure-indent: stage_current
+configure-sid: stage_current
 @endif gcc-bootstrap
-@if indent
-maybe-configure-indent: configure-indent
-configure-indent: 
+@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)/indent/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/indent ; \
+       test ! -f $(HOST_SUBDIR)/sid/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sid ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/indent; \
-       cd "$(HOST_SUBDIR)/indent" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/sid; \
+       cd "$(HOST_SUBDIR)/sid" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/indent/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/sid/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/indent"; \
-       libsrcdir="$$s/indent"; \
+       srcdiroption="--srcdir=$${topdir}/sid"; \
+       libsrcdir="$$s/sid"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif indent
+@endif sid
 
 
 
 
 
-.PHONY: all-indent maybe-all-indent
-maybe-all-indent:
+.PHONY: all-sid maybe-all-sid
+maybe-all-sid:
 @if gcc-bootstrap
-all-indent: stage_current
+all-sid: stage_current
 @endif gcc-bootstrap
-@if indent
-TARGET-indent=all
-maybe-all-indent: all-indent
-all-indent: configure-indent
+@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)/indent && \
+       (cd $(HOST_SUBDIR)/sid && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-indent))
-@endif indent
+               $(TARGET-sid))
+@endif sid
 
 
 
 
-.PHONY: check-indent maybe-check-indent
-maybe-check-indent:
-@if indent
-maybe-check-indent: check-indent
+.PHONY: check-sid maybe-check-sid
+maybe-check-sid:
+@if sid
+maybe-check-sid: check-sid
 
-check-indent:
+check-sid:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/indent && \
+       (cd $(HOST_SUBDIR)/sid && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif indent
+@endif sid
 
-.PHONY: install-indent maybe-install-indent
-maybe-install-indent:
-@if indent
-maybe-install-indent: install-indent
+.PHONY: install-sid maybe-install-sid
+maybe-install-sid:
+@if sid
+maybe-install-sid: install-sid
 
-install-indent: installdirs
+install-sid: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/indent && \
+       (cd $(HOST_SUBDIR)/sid && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif indent
+@endif sid
 
-.PHONY: install-strip-indent maybe-install-strip-indent
-maybe-install-strip-indent:
-@if indent
-maybe-install-strip-indent: install-strip-indent
+.PHONY: install-strip-sid maybe-install-strip-sid
+maybe-install-strip-sid:
+@if sid
+maybe-install-strip-sid: install-strip-sid
 
-install-strip-indent: installdirs
+install-strip-sid: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/indent && \
+       (cd $(HOST_SUBDIR)/sid && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif indent
+@endif sid
 
 # 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-sid info-sid
+maybe-info-sid:
+@if sid
+maybe-info-sid: info-sid
 
-info-indent: \
-    configure-indent 
+info-sid: \
+    configure-sid 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -24844,25 +24004,25 @@ info-indent: \
                  info) \
          || exit 1
 
-@endif indent
+@endif sid
 
-.PHONY: maybe-dvi-indent dvi-indent
-maybe-dvi-indent:
-@if indent
-maybe-dvi-indent: dvi-indent
+.PHONY: maybe-dvi-sid dvi-sid
+maybe-dvi-sid:
+@if sid
+maybe-dvi-sid: dvi-sid
 
-dvi-indent: \
-    configure-indent 
+dvi-sid: \
+    configure-sid 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -24870,25 +24030,25 @@ dvi-indent: \
                  dvi) \
          || exit 1
 
-@endif indent
+@endif sid
 
-.PHONY: maybe-pdf-indent pdf-indent
-maybe-pdf-indent:
-@if indent
-maybe-pdf-indent: pdf-indent
+.PHONY: maybe-pdf-sid pdf-sid
+maybe-pdf-sid:
+@if sid
+maybe-pdf-sid: pdf-sid
 
-pdf-indent: \
-    configure-indent 
+pdf-sid: \
+    configure-sid 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -24896,25 +24056,25 @@ pdf-indent: \
                  pdf) \
          || exit 1
 
-@endif indent
+@endif sid
 
-.PHONY: maybe-html-indent html-indent
-maybe-html-indent:
-@if indent
-maybe-html-indent: html-indent
+.PHONY: maybe-html-sid html-sid
+maybe-html-sid:
+@if sid
+maybe-html-sid: html-sid
 
-html-indent: \
-    configure-indent 
+html-sid: \
+    configure-sid 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -24922,25 +24082,25 @@ html-indent: \
                  html) \
          || exit 1
 
-@endif indent
+@endif sid
 
-.PHONY: maybe-TAGS-indent TAGS-indent
-maybe-TAGS-indent:
-@if indent
-maybe-TAGS-indent: TAGS-indent
+.PHONY: maybe-TAGS-sid TAGS-sid
+maybe-TAGS-sid:
+@if sid
+maybe-TAGS-sid: TAGS-sid
 
-TAGS-indent: \
-    configure-indent 
+TAGS-sid: \
+    configure-sid 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -24948,26 +24108,26 @@ TAGS-indent: \
                  TAGS) \
          || exit 1
 
-@endif indent
+@endif sid
 
-.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-sid install-info-sid
+maybe-install-info-sid:
+@if sid
+maybe-install-info-sid: install-info-sid
 
-install-info-indent: \
-    configure-indent \
-    info-indent 
+install-info-sid: \
+    configure-sid \
+    info-sid 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -24975,26 +24135,26 @@ install-info-indent: \
                  install-info) \
          || exit 1
 
-@endif indent
+@endif sid
 
-.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-sid install-pdf-sid
+maybe-install-pdf-sid:
+@if sid
+maybe-install-pdf-sid: install-pdf-sid
 
-install-pdf-indent: \
-    configure-indent \
-    pdf-indent 
+install-pdf-sid: \
+    configure-sid \
+    pdf-sid 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -25002,26 +24162,26 @@ install-pdf-indent: \
                  install-pdf) \
          || exit 1
 
-@endif indent
+@endif sid
 
-.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-sid install-html-sid
+maybe-install-html-sid:
+@if sid
+maybe-install-html-sid: install-html-sid
 
-install-html-indent: \
-    configure-indent \
-    html-indent 
+install-html-sid: \
+    configure-sid \
+    html-sid 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -25029,25 +24189,25 @@ install-html-indent: \
                  install-html) \
          || exit 1
 
-@endif indent
+@endif sid
 
-.PHONY: maybe-installcheck-indent installcheck-indent
-maybe-installcheck-indent:
-@if indent
-maybe-installcheck-indent: installcheck-indent
+.PHONY: maybe-installcheck-sid installcheck-sid
+maybe-installcheck-sid:
+@if sid
+maybe-installcheck-sid: installcheck-sid
 
-installcheck-indent: \
-    configure-indent 
+installcheck-sid: \
+    configure-sid 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -25055,24 +24215,24 @@ installcheck-indent: \
                  installcheck) \
          || exit 1
 
-@endif indent
+@endif sid
 
-.PHONY: maybe-mostlyclean-indent mostlyclean-indent
-maybe-mostlyclean-indent:
-@if indent
-maybe-mostlyclean-indent: mostlyclean-indent
+.PHONY: maybe-mostlyclean-sid mostlyclean-sid
+maybe-mostlyclean-sid:
+@if sid
+maybe-mostlyclean-sid: mostlyclean-sid
 
-mostlyclean-indent: 
+mostlyclean-sid: 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -25080,24 +24240,24 @@ mostlyclean-indent:
                  mostlyclean) \
          || exit 1
 
-@endif indent
+@endif sid
 
-.PHONY: maybe-clean-indent clean-indent
-maybe-clean-indent:
-@if indent
-maybe-clean-indent: clean-indent
+.PHONY: maybe-clean-sid clean-sid
+maybe-clean-sid:
+@if sid
+maybe-clean-sid: clean-sid
 
-clean-indent: 
+clean-sid: 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -25105,24 +24265,24 @@ clean-indent:
                  clean) \
          || exit 1
 
-@endif indent
+@endif sid
 
-.PHONY: maybe-distclean-indent distclean-indent
-maybe-distclean-indent:
-@if indent
-maybe-distclean-indent: distclean-indent
+.PHONY: maybe-distclean-sid distclean-sid
+maybe-distclean-sid:
+@if sid
+maybe-distclean-sid: distclean-sid
 
-distclean-indent: 
+distclean-sid: 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -25130,24 +24290,24 @@ distclean-indent:
                  distclean) \
          || exit 1
 
-@endif indent
+@endif sid
 
-.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-sid maintainer-clean-sid
+maybe-maintainer-clean-sid:
+@if sid
+maybe-maintainer-clean-sid: maintainer-clean-sid
 
-maintainer-clean-indent: 
+maintainer-clean-sid: 
        @: $(MAKE); $(unstage)
-       @[ -f ./indent/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 indent" ; \
-       (cd $(HOST_SUBDIR)/indent && \
+       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}" \
@@ -25155,581 +24315,128 @@ maintainer-clean-indent:
                  maintainer-clean) \
          || exit 1
 
-@endif indent
+@endif sid
 
 
 
-.PHONY: configure-intl maybe-configure-intl
-maybe-configure-intl:
+.PHONY: configure-sim maybe-configure-sim
+maybe-configure-sim:
 @if gcc-bootstrap
-configure-intl: stage_current
+configure-sim: stage_current
 @endif gcc-bootstrap
-@if intl
-maybe-configure-intl: configure-intl
-configure-intl: 
+@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)/intl/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+       test ! -f $(HOST_SUBDIR)/sim/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sim ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/intl; \
-       cd "$(HOST_SUBDIR)/intl" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/sim; \
+       cd "$(HOST_SUBDIR)/sim" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/sim/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/intl"; \
-       libsrcdir="$$s/intl"; \
+       srcdiroption="--srcdir=$${topdir}/sim"; \
+       libsrcdir="$$s/sim"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif intl
+@endif sim
 
 
 
-.PHONY: configure-stage1-intl maybe-configure-stage1-intl
-maybe-configure-stage1-intl:
-@if intl-bootstrap
-maybe-configure-stage1-intl: configure-stage1-intl
-configure-stage1-intl:
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
+
+
+.PHONY: all-sim maybe-all-sim
+maybe-all-sim:
+@if gcc-bootstrap
+all-sim: stage_current
+@endif gcc-bootstrap
+@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; \
-       TFLAGS="$(STAGE1_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-       $(HOST_EXPORTS) \
-       CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
-       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} \
-         $(STAGE1_CONFIGURE_FLAGS)
-@endif intl-bootstrap
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/sim && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+               $(TARGET-sim))
+@endif sim
 
-.PHONY: configure-stage2-intl maybe-configure-stage2-intl
-maybe-configure-stage2-intl:
-@if intl-bootstrap
-maybe-configure-stage2-intl: configure-stage2-intl
-configure-stage2-intl:
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
+
+
+
+.PHONY: check-sim maybe-check-sim
+maybe-check-sim:
+@if sim
+maybe-check-sim: check-sim
+
+check-sim:
+       @: $(MAKE); $(unstage)
        @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) \
-       CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
-       CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
-       LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/intl ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
-       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_CONFIGURE_FLAGS)
-@endif intl-bootstrap
+       (cd $(HOST_SUBDIR)/sim && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
 
-.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
+@endif sim
+
+.PHONY: install-sim maybe-install-sim
+maybe-install-sim:
+@if sim
+maybe-install-sim: install-sim
+
+install-sim: installdirs
+       @: $(MAKE); $(unstage)
        @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)"; 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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE3_CONFIGURE_FLAGS)
-@endif intl-bootstrap
+       (cd $(HOST_SUBDIR)/sim && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-.PHONY: configure-stage4-intl maybe-configure-stage4-intl
-maybe-configure-stage4-intl:
-@if intl-bootstrap
-maybe-configure-stage4-intl: configure-stage4-intl
-configure-stage4-intl:
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
+@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; \
-       TFLAGS="$(STAGE4_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/intl/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)/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) \
-         $(STAGE4_CONFIGURE_FLAGS)
-@endif intl-bootstrap
+       (cd $(HOST_SUBDIR)/sim && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-.PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl
-maybe-configure-stageprofile-intl:
-@if intl-bootstrap
-maybe-configure-stageprofile-intl: configure-stageprofile-intl
-configure-stageprofile-intl:
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(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="$(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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEprofile_CONFIGURE_FLAGS)
-@endif intl-bootstrap
-
-.PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl
-maybe-configure-stagefeedback-intl:
-@if intl-bootstrap
-maybe-configure-stagefeedback-intl: configure-stagefeedback-intl
-configure-stagefeedback-intl:
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(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="$(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 \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif intl-bootstrap
-
-
-
-
-
-.PHONY: all-intl maybe-all-intl
-maybe-all-intl:
-@if gcc-bootstrap
-all-intl: stage_current
-@endif gcc-bootstrap
-@if intl
-TARGET-intl=all
-maybe-all-intl: all-intl
-all-intl: configure-intl
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/intl && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-intl))
-@endif intl
-
-
-
-.PHONY: all-stage1-intl maybe-all-stage1-intl
-.PHONY: clean-stage1-intl maybe-clean-stage1-intl
-maybe-all-stage1-intl:
-maybe-clean-stage1-intl:
-@if intl-bootstrap
-maybe-all-stage1-intl: all-stage1-intl
-all-stage1: all-stage1-intl
-TARGET-stage1-intl = $(TARGET-intl)
-all-stage1-intl: configure-stage1-intl
-       @[ $(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)/intl && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" \
-               CXXFLAGS="$(STAGE1_CXXFLAGS)" \
-               LIBCFLAGS="$(LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-intl)
-
-maybe-clean-stage1-intl: clean-stage1-intl
-clean-stage1: clean-stage1-intl
-clean-stage1-intl:
-       @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage1-intl/Makefile ] || exit 0; \
-         $(MAKE) stage1-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
-@endif intl-bootstrap
-
-
-.PHONY: all-stage2-intl maybe-all-stage2-intl
-.PHONY: clean-stage2-intl maybe-clean-stage2-intl
-maybe-all-stage2-intl:
-maybe-clean-stage2-intl:
-@if intl-bootstrap
-maybe-all-stage2-intl: all-stage2-intl
-all-stage2: all-stage2-intl
-TARGET-stage2-intl = $(TARGET-intl)
-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)  \
-       cd $(HOST_SUBDIR)/intl && \
-       $(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-intl)
-
-maybe-clean-stage2-intl: clean-stage2-intl
-clean-stage2: clean-stage2-intl
-clean-stage2-intl:
-       @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage2-intl/Makefile ] || exit 0; \
-         $(MAKE) stage2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif intl-bootstrap
-
-
-.PHONY: all-stage3-intl maybe-all-stage3-intl
-.PHONY: clean-stage3-intl maybe-clean-stage3-intl
-maybe-all-stage3-intl:
-maybe-clean-stage3-intl:
-@if intl-bootstrap
-maybe-all-stage3-intl: all-stage3-intl
-all-stage3: all-stage3-intl
-TARGET-stage3-intl = $(TARGET-intl)
-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)  \
-       cd $(HOST_SUBDIR)/intl && \
-       $(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-intl)
-
-maybe-clean-stage3-intl: clean-stage3-intl
-clean-stage3: clean-stage3-intl
-clean-stage3-intl:
-       @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage3-intl/Makefile ] || exit 0; \
-         $(MAKE) stage3-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif intl-bootstrap
-
-
-.PHONY: all-stage4-intl maybe-all-stage4-intl
-.PHONY: clean-stage4-intl maybe-clean-stage4-intl
-maybe-all-stage4-intl:
-maybe-clean-stage4-intl:
-@if intl-bootstrap
-maybe-all-stage4-intl: all-stage4-intl
-all-stage4: all-stage4-intl
-TARGET-stage4-intl = $(TARGET-intl)
-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)  \
-       cd $(HOST_SUBDIR)/intl && \
-       $(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-intl)
-
-maybe-clean-stage4-intl: clean-stage4-intl
-clean-stage4: clean-stage4-intl
-clean-stage4-intl:
-       @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage4-intl/Makefile ] || exit 0; \
-         $(MAKE) stage4-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif intl-bootstrap
-
-
-.PHONY: all-stageprofile-intl maybe-all-stageprofile-intl
-.PHONY: clean-stageprofile-intl maybe-clean-stageprofile-intl
-maybe-all-stageprofile-intl:
-maybe-clean-stageprofile-intl:
-@if intl-bootstrap
-maybe-all-stageprofile-intl: all-stageprofile-intl
-all-stageprofile: all-stageprofile-intl
-TARGET-stageprofile-intl = $(TARGET-intl)
-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)  \
-       cd $(HOST_SUBDIR)/intl && \
-       $(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-intl)
-
-maybe-clean-stageprofile-intl: clean-stageprofile-intl
-clean-stageprofile: clean-stageprofile-intl
-clean-stageprofile-intl:
-       @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageprofile-intl/Makefile ] || exit 0; \
-         $(MAKE) stageprofile-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif intl-bootstrap
-
-
-.PHONY: all-stagefeedback-intl maybe-all-stagefeedback-intl
-.PHONY: clean-stagefeedback-intl maybe-clean-stagefeedback-intl
-maybe-all-stagefeedback-intl:
-maybe-clean-stagefeedback-intl:
-@if intl-bootstrap
-maybe-all-stagefeedback-intl: all-stagefeedback-intl
-all-stagefeedback: all-stagefeedback-intl
-TARGET-stagefeedback-intl = $(TARGET-intl)
-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)  \
-       cd $(HOST_SUBDIR)/intl && \
-       $(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-intl)
-
-maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
-clean-stagefeedback: clean-stagefeedback-intl
-clean-stagefeedback-intl:
-       @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-intl/Makefile ] || exit 0; \
-         $(MAKE) stagefeedback-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/intl && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif intl-bootstrap
-
-
-
-
-
-.PHONY: check-intl maybe-check-intl
-maybe-check-intl:
-@if intl
-maybe-check-intl: check-intl
-
-check-intl:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/intl && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif intl
-
-.PHONY: install-intl maybe-install-intl
-maybe-install-intl:
-@if intl
-maybe-install-intl: install-intl
-
-install-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)
-
-@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
+@endif sim
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-intl info-intl
-maybe-info-intl:
-@if intl
-maybe-info-intl: info-intl
+.PHONY: maybe-info-sim info-sim
+maybe-info-sim:
+@if sim
+maybe-info-sim: info-sim
 
-info-intl: \
-    configure-intl 
-       @[ -f ./intl/Makefile ] || exit 0; \
+info-sim: \
+    configure-sim 
+       @: $(MAKE); $(unstage)
+       @[ -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 intl" ; \
-       (cd $(HOST_SUBDIR)/intl && \
+       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}" \
@@ -25737,24 +24444,25 @@ info-intl: \
                  info) \
          || exit 1
 
-@endif intl
+@endif sim
 
-.PHONY: maybe-dvi-intl dvi-intl
-maybe-dvi-intl:
-@if intl
-maybe-dvi-intl: dvi-intl
+.PHONY: maybe-dvi-sim dvi-sim
+maybe-dvi-sim:
+@if sim
+maybe-dvi-sim: dvi-sim
 
-dvi-intl: \
-    configure-intl 
-       @[ -f ./intl/Makefile ] || exit 0; \
+dvi-sim: \
+    configure-sim 
+       @: $(MAKE); $(unstage)
+       @[ -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 intl" ; \
-       (cd $(HOST_SUBDIR)/intl && \
+       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}" \
@@ -25762,24 +24470,25 @@ dvi-intl: \
                  dvi) \
          || exit 1
 
-@endif intl
+@endif sim
 
-.PHONY: maybe-pdf-intl pdf-intl
-maybe-pdf-intl:
-@if intl
-maybe-pdf-intl: pdf-intl
+.PHONY: maybe-pdf-sim pdf-sim
+maybe-pdf-sim:
+@if sim
+maybe-pdf-sim: pdf-sim
 
-pdf-intl: \
-    configure-intl 
-       @[ -f ./intl/Makefile ] || exit 0; \
+pdf-sim: \
+    configure-sim 
+       @: $(MAKE); $(unstage)
+       @[ -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 intl" ; \
-       (cd $(HOST_SUBDIR)/intl && \
+       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}" \
@@ -25787,24 +24496,25 @@ pdf-intl: \
                  pdf) \
          || exit 1
 
-@endif intl
+@endif sim
 
-.PHONY: maybe-html-intl html-intl
-maybe-html-intl:
-@if intl
-maybe-html-intl: html-intl
+.PHONY: maybe-html-sim html-sim
+maybe-html-sim:
+@if sim
+maybe-html-sim: html-sim
 
-html-intl: \
-    configure-intl 
-       @[ -f ./intl/Makefile ] || exit 0; \
+html-sim: \
+    configure-sim 
+       @: $(MAKE); $(unstage)
+       @[ -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 intl" ; \
-       (cd $(HOST_SUBDIR)/intl && \
+       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}" \
@@ -25812,24 +24522,25 @@ html-intl: \
                  html) \
          || exit 1
 
-@endif intl
+@endif sim
 
-.PHONY: maybe-TAGS-intl TAGS-intl
-maybe-TAGS-intl:
-@if intl
-maybe-TAGS-intl: TAGS-intl
+.PHONY: maybe-TAGS-sim TAGS-sim
+maybe-TAGS-sim:
+@if sim
+maybe-TAGS-sim: TAGS-sim
 
-TAGS-intl: \
-    configure-intl 
-       @[ -f ./intl/Makefile ] || exit 0; \
+TAGS-sim: \
+    configure-sim 
+       @: $(MAKE); $(unstage)
+       @[ -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 intl" ; \
-       (cd $(HOST_SUBDIR)/intl && \
+       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}" \
@@ -25837,51 +24548,53 @@ TAGS-intl: \
                  TAGS) \
          || exit 1
 
-@endif intl
+@endif sim
 
-.PHONY: maybe-install-info-intl install-info-intl
-maybe-install-info-intl:
-@if intl
-maybe-install-info-intl: install-info-intl
+.PHONY: maybe-install-info-sim install-info-sim
+maybe-install-info-sim:
+@if sim
+maybe-install-info-sim: install-info-sim
 
-install-info-intl: \
-    configure-intl \
-    info-intl 
-       @[ -f ./intl/Makefile ] || exit 0; \
+install-info-sim: \
+    configure-sim \
+    info-sim 
+       @: $(MAKE); $(unstage)
+       @[ -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 intl" ; \
-       (cd $(HOST_SUBDIR)/intl && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
                  install-info) \
          || exit 1
 
-@endif intl
+@endif sim
 
-.PHONY: maybe-install-pdf-intl install-pdf-intl
-maybe-install-pdf-intl:
-@if intl
-maybe-install-pdf-intl: install-pdf-intl
+.PHONY: maybe-install-pdf-sim install-pdf-sim
+maybe-install-pdf-sim:
+@if sim
+maybe-install-pdf-sim: install-pdf-sim
 
-install-pdf-intl: \
-    configure-intl \
-    pdf-intl 
-       @[ -f ./intl/Makefile ] || exit 0; \
+install-pdf-sim: \
+    configure-sim \
+    pdf-sim 
+       @: $(MAKE); $(unstage)
+       @[ -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 intl" ; \
-       (cd $(HOST_SUBDIR)/intl && \
+       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}" \
@@ -25889,25 +24602,26 @@ install-pdf-intl: \
                  install-pdf) \
          || exit 1
 
-@endif intl
+@endif sim
 
-.PHONY: maybe-install-html-intl install-html-intl
-maybe-install-html-intl:
-@if intl
-maybe-install-html-intl: install-html-intl
+.PHONY: maybe-install-html-sim install-html-sim
+maybe-install-html-sim:
+@if sim
+maybe-install-html-sim: install-html-sim
 
-install-html-intl: \
-    configure-intl \
-    html-intl 
-       @[ -f ./intl/Makefile ] || exit 0; \
+install-html-sim: \
+    configure-sim \
+    html-sim 
+       @: $(MAKE); $(unstage)
+       @[ -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 intl" ; \
-       (cd $(HOST_SUBDIR)/intl && \
+       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}" \
@@ -25915,24 +24629,25 @@ install-html-intl: \
                  install-html) \
          || exit 1
 
-@endif intl
+@endif sim
 
-.PHONY: maybe-installcheck-intl installcheck-intl
-maybe-installcheck-intl:
-@if intl
-maybe-installcheck-intl: installcheck-intl
+.PHONY: maybe-installcheck-sim installcheck-sim
+maybe-installcheck-sim:
+@if sim
+maybe-installcheck-sim: installcheck-sim
 
-installcheck-intl: \
-    configure-intl 
-       @[ -f ./intl/Makefile ] || exit 0; \
+installcheck-sim: \
+    configure-sim 
+       @: $(MAKE); $(unstage)
+       @[ -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 intl" ; \
-       (cd $(HOST_SUBDIR)/intl && \
+       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}" \
@@ -25940,23 +24655,24 @@ installcheck-intl: \
                  installcheck) \
          || exit 1
 
-@endif intl
+@endif sim
 
-.PHONY: maybe-mostlyclean-intl mostlyclean-intl
-maybe-mostlyclean-intl:
-@if intl
-maybe-mostlyclean-intl: mostlyclean-intl
+.PHONY: maybe-mostlyclean-sim mostlyclean-sim
+maybe-mostlyclean-sim:
+@if sim
+maybe-mostlyclean-sim: mostlyclean-sim
 
-mostlyclean-intl: 
-       @[ -f ./intl/Makefile ] || exit 0; \
+mostlyclean-sim: 
+       @: $(MAKE); $(unstage)
+       @[ -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 intl" ; \
-       (cd $(HOST_SUBDIR)/intl && \
+       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}" \
@@ -25964,23 +24680,24 @@ mostlyclean-intl:
                  mostlyclean) \
          || exit 1
 
-@endif intl
+@endif sim
 
-.PHONY: maybe-clean-intl clean-intl
-maybe-clean-intl:
-@if intl
-maybe-clean-intl: clean-intl
+.PHONY: maybe-clean-sim clean-sim
+maybe-clean-sim:
+@if sim
+maybe-clean-sim: clean-sim
 
-clean-intl: 
-       @[ -f ./intl/Makefile ] || exit 0; \
+clean-sim: 
+       @: $(MAKE); $(unstage)
+       @[ -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 intl" ; \
-       (cd $(HOST_SUBDIR)/intl && \
+       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}" \
@@ -25988,23 +24705,24 @@ clean-intl:
                  clean) \
          || exit 1
 
-@endif intl
+@endif sim
 
-.PHONY: maybe-distclean-intl distclean-intl
-maybe-distclean-intl:
-@if intl
-maybe-distclean-intl: distclean-intl
+.PHONY: maybe-distclean-sim distclean-sim
+maybe-distclean-sim:
+@if sim
+maybe-distclean-sim: distclean-sim
 
-distclean-intl: 
-       @[ -f ./intl/Makefile ] || exit 0; \
+distclean-sim: 
+       @: $(MAKE); $(unstage)
+       @[ -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 intl" ; \
-       (cd $(HOST_SUBDIR)/intl && \
+       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}" \
@@ -26012,23 +24730,24 @@ distclean-intl:
                  distclean) \
          || exit 1
 
-@endif intl
+@endif sim
 
-.PHONY: maybe-maintainer-clean-intl maintainer-clean-intl
-maybe-maintainer-clean-intl:
-@if intl
-maybe-maintainer-clean-intl: maintainer-clean-intl
+.PHONY: maybe-maintainer-clean-sim maintainer-clean-sim
+maybe-maintainer-clean-sim:
+@if sim
+maybe-maintainer-clean-sim: maintainer-clean-sim
 
-maintainer-clean-intl: 
-       @[ -f ./intl/Makefile ] || exit 0; \
+maintainer-clean-sim: 
+       @: $(MAKE); $(unstage)
+       @[ -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 intl" ; \
-       (cd $(HOST_SUBDIR)/intl && \
+       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}" \
@@ -26036,128 +24755,116 @@ maintainer-clean-intl:
                  maintainer-clean) \
          || exit 1
 
-@endif intl
+@endif sim
 
 
 
-.PHONY: configure-tcl maybe-configure-tcl
-maybe-configure-tcl:
+.PHONY: configure-texinfo maybe-configure-texinfo
+maybe-configure-texinfo:
 @if gcc-bootstrap
-configure-tcl: stage_current
+configure-texinfo: stage_current
 @endif gcc-bootstrap
-@if tcl
-maybe-configure-tcl: configure-tcl
-configure-tcl: 
+@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)/tcl/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tcl ; \
+       test ! -f $(HOST_SUBDIR)/texinfo/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/texinfo ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/tcl; \
-       cd "$(HOST_SUBDIR)/tcl" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/texinfo; \
+       cd "$(HOST_SUBDIR)/texinfo" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/tcl/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/texinfo/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/tcl"; \
-       libsrcdir="$$s/tcl"; \
+       srcdiroption="--srcdir=$${topdir}/texinfo"; \
+       libsrcdir="$$s/texinfo"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif tcl
+@endif texinfo
 
 
 
 
 
-.PHONY: all-tcl maybe-all-tcl
-maybe-all-tcl:
+.PHONY: all-texinfo maybe-all-texinfo
+maybe-all-texinfo:
 @if gcc-bootstrap
-all-tcl: stage_current
+all-texinfo: stage_current
 @endif gcc-bootstrap
-@if tcl
-TARGET-tcl=all
-maybe-all-tcl: all-tcl
-all-tcl: configure-tcl
+@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)/tcl && \
+       (cd $(HOST_SUBDIR)/texinfo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-tcl))
-@endif tcl
+               $(TARGET-texinfo))
+@endif texinfo
 
 
 
 
-.PHONY: check-tcl maybe-check-tcl
-maybe-check-tcl:
-@if tcl
-maybe-check-tcl: check-tcl
+.PHONY: check-texinfo maybe-check-texinfo
+maybe-check-texinfo:
+@if texinfo
+maybe-check-texinfo: check-texinfo
 
-check-tcl:
+check-texinfo:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/tcl && \
+       (cd $(HOST_SUBDIR)/texinfo && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif tcl
+@endif texinfo
 
-.PHONY: install-tcl maybe-install-tcl
-maybe-install-tcl:
-@if tcl
-maybe-install-tcl: install-tcl
+.PHONY: install-texinfo maybe-install-texinfo
+maybe-install-texinfo:
+@if texinfo
+maybe-install-texinfo: install-texinfo
 
-install-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)
+install-texinfo:
 
-@endif tcl
+@endif texinfo
 
-.PHONY: install-strip-tcl maybe-install-strip-tcl
-maybe-install-strip-tcl:
-@if tcl
-maybe-install-strip-tcl: install-strip-tcl
+.PHONY: install-strip-texinfo maybe-install-strip-texinfo
+maybe-install-strip-texinfo:
+@if texinfo
+maybe-install-strip-texinfo: install-strip-texinfo
 
-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)
+install-strip-texinfo:
 
-@endif tcl
+@endif texinfo
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-tcl info-tcl
-maybe-info-tcl:
-@if tcl
-maybe-info-tcl: info-tcl
+.PHONY: maybe-info-texinfo info-texinfo
+maybe-info-texinfo:
+@if texinfo
+maybe-info-texinfo: info-texinfo
 
-info-tcl: \
-    configure-tcl 
+info-texinfo: \
+    configure-texinfo 
        @: $(MAKE); $(unstage)
-       @[ -f ./tcl/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 tcl" ; \
-       (cd $(HOST_SUBDIR)/tcl && \
+       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}" \
@@ -26165,25 +24872,25 @@ info-tcl: \
                  info) \
          || exit 1
 
-@endif tcl
+@endif texinfo
 
-.PHONY: maybe-dvi-tcl dvi-tcl
-maybe-dvi-tcl:
-@if tcl
-maybe-dvi-tcl: dvi-tcl
+.PHONY: maybe-dvi-texinfo dvi-texinfo
+maybe-dvi-texinfo:
+@if texinfo
+maybe-dvi-texinfo: dvi-texinfo
 
-dvi-tcl: \
-    configure-tcl 
+dvi-texinfo: \
+    configure-texinfo 
        @: $(MAKE); $(unstage)
-       @[ -f ./tcl/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 tcl" ; \
-       (cd $(HOST_SUBDIR)/tcl && \
+       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}" \
@@ -26191,25 +24898,25 @@ dvi-tcl: \
                  dvi) \
          || exit 1
 
-@endif tcl
+@endif texinfo
 
-.PHONY: maybe-pdf-tcl pdf-tcl
-maybe-pdf-tcl:
-@if tcl
-maybe-pdf-tcl: pdf-tcl
+.PHONY: maybe-pdf-texinfo pdf-texinfo
+maybe-pdf-texinfo:
+@if texinfo
+maybe-pdf-texinfo: pdf-texinfo
 
-pdf-tcl: \
-    configure-tcl 
+pdf-texinfo: \
+    configure-texinfo 
        @: $(MAKE); $(unstage)
-       @[ -f ./tcl/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 tcl" ; \
-       (cd $(HOST_SUBDIR)/tcl && \
+       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}" \
@@ -26217,25 +24924,25 @@ pdf-tcl: \
                  pdf) \
          || exit 1
 
-@endif tcl
+@endif texinfo
 
-.PHONY: maybe-html-tcl html-tcl
-maybe-html-tcl:
-@if tcl
-maybe-html-tcl: html-tcl
+.PHONY: maybe-html-texinfo html-texinfo
+maybe-html-texinfo:
+@if texinfo
+maybe-html-texinfo: html-texinfo
 
-html-tcl: \
-    configure-tcl 
+html-texinfo: \
+    configure-texinfo 
        @: $(MAKE); $(unstage)
-       @[ -f ./tcl/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 tcl" ; \
-       (cd $(HOST_SUBDIR)/tcl && \
+       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}" \
@@ -26243,25 +24950,25 @@ html-tcl: \
                  html) \
          || exit 1
 
-@endif tcl
+@endif texinfo
 
-.PHONY: maybe-TAGS-tcl TAGS-tcl
-maybe-TAGS-tcl:
-@if tcl
-maybe-TAGS-tcl: TAGS-tcl
+.PHONY: maybe-TAGS-texinfo TAGS-texinfo
+maybe-TAGS-texinfo:
+@if texinfo
+maybe-TAGS-texinfo: TAGS-texinfo
 
-TAGS-tcl: \
-    configure-tcl 
+TAGS-texinfo: \
+    configure-texinfo 
        @: $(MAKE); $(unstage)
-       @[ -f ./tcl/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 tcl" ; \
-       (cd $(HOST_SUBDIR)/tcl && \
+       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}" \
@@ -26269,26 +24976,26 @@ TAGS-tcl: \
                  TAGS) \
          || exit 1
 
-@endif tcl
+@endif texinfo
 
-.PHONY: maybe-install-info-tcl install-info-tcl
-maybe-install-info-tcl:
-@if tcl
-maybe-install-info-tcl: install-info-tcl
+.PHONY: maybe-install-info-texinfo install-info-texinfo
+maybe-install-info-texinfo:
+@if texinfo
+maybe-install-info-texinfo: install-info-texinfo
 
-install-info-tcl: \
-    configure-tcl \
-    info-tcl 
+install-info-texinfo: \
+    configure-texinfo \
+    info-texinfo 
        @: $(MAKE); $(unstage)
-       @[ -f ./tcl/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 tcl" ; \
-       (cd $(HOST_SUBDIR)/tcl && \
+       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}" \
@@ -26296,26 +25003,26 @@ install-info-tcl: \
                  install-info) \
          || exit 1
 
-@endif tcl
+@endif texinfo
 
-.PHONY: maybe-install-pdf-tcl install-pdf-tcl
-maybe-install-pdf-tcl:
-@if tcl
-maybe-install-pdf-tcl: install-pdf-tcl
+.PHONY: maybe-install-pdf-texinfo install-pdf-texinfo
+maybe-install-pdf-texinfo:
+@if texinfo
+maybe-install-pdf-texinfo: install-pdf-texinfo
 
-install-pdf-tcl: \
-    configure-tcl \
-    pdf-tcl 
+install-pdf-texinfo: \
+    configure-texinfo \
+    pdf-texinfo 
        @: $(MAKE); $(unstage)
-       @[ -f ./tcl/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 tcl" ; \
-       (cd $(HOST_SUBDIR)/tcl && \
+       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}" \
@@ -26323,26 +25030,26 @@ install-pdf-tcl: \
                  install-pdf) \
          || exit 1
 
-@endif tcl
+@endif texinfo
 
-.PHONY: maybe-install-html-tcl install-html-tcl
-maybe-install-html-tcl:
-@if tcl
-maybe-install-html-tcl: install-html-tcl
+.PHONY: maybe-install-html-texinfo install-html-texinfo
+maybe-install-html-texinfo:
+@if texinfo
+maybe-install-html-texinfo: install-html-texinfo
 
-install-html-tcl: \
-    configure-tcl \
-    html-tcl 
+install-html-texinfo: \
+    configure-texinfo \
+    html-texinfo 
        @: $(MAKE); $(unstage)
-       @[ -f ./tcl/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 tcl" ; \
-       (cd $(HOST_SUBDIR)/tcl && \
+       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}" \
@@ -26350,25 +25057,25 @@ install-html-tcl: \
                  install-html) \
          || exit 1
 
-@endif tcl
+@endif texinfo
 
-.PHONY: maybe-installcheck-tcl installcheck-tcl
-maybe-installcheck-tcl:
-@if tcl
-maybe-installcheck-tcl: installcheck-tcl
+.PHONY: maybe-installcheck-texinfo installcheck-texinfo
+maybe-installcheck-texinfo:
+@if texinfo
+maybe-installcheck-texinfo: installcheck-texinfo
 
-installcheck-tcl: \
-    configure-tcl 
+installcheck-texinfo: \
+    configure-texinfo 
        @: $(MAKE); $(unstage)
-       @[ -f ./tcl/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 tcl" ; \
-       (cd $(HOST_SUBDIR)/tcl && \
+       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}" \
@@ -26376,524 +25083,99 @@ installcheck-tcl: \
                  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
+@endif texinfo
 
-.PHONY: maybe-clean-tcl clean-tcl
-maybe-clean-tcl:
-@if tcl
-maybe-clean-tcl: clean-tcl
+.PHONY: maybe-mostlyclean-texinfo mostlyclean-texinfo
+maybe-mostlyclean-texinfo:
+@if texinfo
+maybe-mostlyclean-texinfo: mostlyclean-texinfo
 
-clean-tcl: 
+mostlyclean-texinfo: 
        @: $(MAKE); $(unstage)
-       @[ -f ./tcl/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 tcl" ; \
-       (cd $(HOST_SUBDIR)/tcl && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 clean) \
+                 mostlyclean) \
          || exit 1
 
-@endif tcl
+@endif texinfo
 
-.PHONY: maybe-distclean-tcl distclean-tcl
-maybe-distclean-tcl:
-@if tcl
-maybe-distclean-tcl: distclean-tcl
+.PHONY: maybe-clean-texinfo clean-texinfo
+maybe-clean-texinfo:
+@if texinfo
+maybe-clean-texinfo: clean-texinfo
 
-distclean-tcl: 
+clean-texinfo: 
        @: $(MAKE); $(unstage)
-       @[ -f ./tcl/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 tcl" ; \
-       (cd $(HOST_SUBDIR)/tcl && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 distclean) \
+                 clean) \
          || exit 1
 
-@endif tcl
+@endif texinfo
 
-.PHONY: maybe-maintainer-clean-tcl maintainer-clean-tcl
-maybe-maintainer-clean-tcl:
-@if tcl
-maybe-maintainer-clean-tcl: maintainer-clean-tcl
+.PHONY: maybe-distclean-texinfo distclean-texinfo
+maybe-distclean-texinfo:
+@if texinfo
+maybe-distclean-texinfo: distclean-texinfo
 
-maintainer-clean-tcl: 
+distclean-texinfo: 
        @: $(MAKE); $(unstage)
-       @[ -f ./tcl/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 tcl" ; \
-       (cd $(HOST_SUBDIR)/tcl && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 maintainer-clean) \
+                 distclean) \
          || exit 1
 
-@endif tcl
-
+@endif texinfo
 
+.PHONY: maybe-maintainer-clean-texinfo maintainer-clean-texinfo
+maybe-maintainer-clean-texinfo:
+@if texinfo
+maybe-maintainer-clean-texinfo: maintainer-clean-texinfo
 
-.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
-
-.PHONY: install-strip-itcl maybe-install-strip-itcl
-maybe-install-strip-itcl:
-@if itcl
-maybe-install-strip-itcl: install-strip-itcl
-
-install-strip-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-strip)
-
-@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 && \
-         $(MAKE) $(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 itcl
-
-.PHONY: maybe-install-pdf-itcl install-pdf-itcl
-maybe-install-pdf-itcl:
-@if itcl
-maybe-install-pdf-itcl: install-pdf-itcl
-
-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 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}" \
-                 install-pdf) \
-         || exit 1
-
-@endif itcl
-
-.PHONY: maybe-install-html-itcl install-html-itcl
-maybe-install-html-itcl:
-@if itcl
-maybe-install-html-itcl: install-html-itcl
-
-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 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}" \
-                 install-html) \
-         || exit 1
-
-@endif itcl
-
-.PHONY: maybe-installcheck-itcl installcheck-itcl
-maybe-installcheck-itcl:
-@if itcl
-maybe-installcheck-itcl: installcheck-itcl
-
-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 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}" \
-                 installcheck) \
-         || exit 1
-
-@endif itcl
-
-.PHONY: maybe-mostlyclean-itcl mostlyclean-itcl
-maybe-mostlyclean-itcl:
-@if itcl
-maybe-mostlyclean-itcl: mostlyclean-itcl
-
-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 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}" \
-                 mostlyclean) \
-         || exit 1
-
-@endif itcl
-
-.PHONY: maybe-clean-itcl clean-itcl
-maybe-clean-itcl:
-@if itcl
-maybe-clean-itcl: clean-itcl
-
-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 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}" \
-                 clean) \
-         || exit 1
-
-@endif itcl
-
-.PHONY: maybe-distclean-itcl distclean-itcl
-maybe-distclean-itcl:
-@if itcl
-maybe-distclean-itcl: distclean-itcl
-
-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 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}" \
-                 distclean) \
-         || exit 1
-
-@endif itcl
-
-.PHONY: maybe-maintainer-clean-itcl maintainer-clean-itcl
-maybe-maintainer-clean-itcl:
-@if itcl
-maybe-maintainer-clean-itcl: maintainer-clean-itcl
-
-maintainer-clean-itcl: 
+maintainer-clean-texinfo: 
        @: $(MAKE); $(unstage)
-       @[ -f ./itcl/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 itcl" ; \
-       (cd $(HOST_SUBDIR)/itcl && \
+       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}" \
@@ -26901,274 +25183,274 @@ maintainer-clean-itcl:
                  maintainer-clean) \
          || exit 1
 
-@endif itcl
+@endif texinfo
 
 
 
-.PHONY: configure-ld maybe-configure-ld
-maybe-configure-ld:
+.PHONY: configure-zlib maybe-configure-zlib
+maybe-configure-zlib:
 @if gcc-bootstrap
-configure-ld: stage_current
+configure-zlib: stage_current
 @endif gcc-bootstrap
-@if ld
-maybe-configure-ld: configure-ld
-configure-ld: 
+@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)/ld/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
+       test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/ld; \
-       cd "$(HOST_SUBDIR)/ld" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/zlib; \
+       cd "$(HOST_SUBDIR)/zlib" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
+       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 ld
+@endif zlib
 
 
 
-.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:
+.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)/ld
+       @$(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)/ld/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/zlib/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)/ld ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
-       cd $(HOST_SUBDIR)/ld || exit 1; \
+       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)/ld/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
+       srcdiroption="--srcdir=$${topdir}/zlib"; \
+       libsrcdir="$$s/zlib"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption} \
          $(STAGE1_CONFIGURE_FLAGS)
-@endif ld-bootstrap
+@endif zlib-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:
+.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)/ld
+       @$(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)/ld/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/zlib/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)/ld ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
-       cd $(HOST_SUBDIR)/ld || exit 1; \
+       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)/ld/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
+       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_CONFIGURE_FLAGS)
-@endif ld-bootstrap
+@endif zlib-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:
+.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)/ld
+       @$(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)/ld/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/zlib/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)/ld ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
-       cd $(HOST_SUBDIR)/ld || exit 1; \
+       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)/ld/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
+       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) \
          $(STAGE3_CONFIGURE_FLAGS)
-@endif ld-bootstrap
+@endif zlib-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:
+.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)/ld
+       @$(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)/ld/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/zlib/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)/ld ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
-       cd $(HOST_SUBDIR)/ld || exit 1; \
+       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)/ld/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
+       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) \
          $(STAGE4_CONFIGURE_FLAGS)
-@endif ld-bootstrap
+@endif zlib-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:
+.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)/ld
+       @$(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)/ld/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/zlib/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)/ld ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
-       cd $(HOST_SUBDIR)/ld || exit 1; \
+       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)/ld/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
+       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) \
          $(STAGEprofile_CONFIGURE_FLAGS)
-@endif ld-bootstrap
+@endif zlib-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:
+.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)/ld
+       @$(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)/ld/Makefile || exit 0; \
+       test ! -f $(HOST_SUBDIR)/zlib/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)/ld ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
-       cd $(HOST_SUBDIR)/ld || exit 1; \
+       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)/ld/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/ld"; \
-       libsrcdir="$$s/ld"; \
+       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) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif ld-bootstrap
+@endif zlib-bootstrap
 
 
 
 
 
-.PHONY: all-ld maybe-all-ld
-maybe-all-ld:
+.PHONY: all-zlib maybe-all-zlib
+maybe-all-zlib:
 @if gcc-bootstrap
-all-ld: stage_current
+all-zlib: stage_current
 @endif gcc-bootstrap
-@if ld
-TARGET-ld=all
-maybe-all-ld: all-ld
-all-ld: configure-ld
+@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)/ld && \
+       (cd $(HOST_SUBDIR)/zlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-ld))
-@endif ld
+               $(TARGET-zlib))
+@endif zlib
 
 
 
-.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
+.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; \
        TFLAGS="$(STAGE1_TFLAGS)"; \
        $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/ld && \
+       cd $(HOST_SUBDIR)/zlib && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE1_CFLAGS)" \
                CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -27178,39 +25460,39 @@ all-stage1-ld: configure-stage1-ld
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS)   \
                TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-ld)
+               $(TARGET-stage1-zlib)
 
-maybe-clean-stage1-ld: clean-stage1-ld
-clean-stage1: clean-stage1-ld
-clean-stage1-ld:
+maybe-clean-stage1-zlib: clean-stage1-zlib
+clean-stage1: clean-stage1-zlib
+clean-stage1-zlib:
        @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage1-ld/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage1-zlib/Makefile ] || exit 0; \
          $(MAKE) stage1-start; \
        fi; \
-       cd $(HOST_SUBDIR)/ld && \
+       cd $(HOST_SUBDIR)/zlib && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                 clean
-@endif ld-bootstrap
+@endif zlib-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
+.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) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/ld && \
+       cd $(HOST_SUBDIR)/zlib && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE2_CFLAGS)" \
                CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -27220,40 +25502,40 @@ all-stage2-ld: configure-stage2-ld
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE2_TFLAGS)" \
-               $(TARGET-stage2-ld)
+               $(TARGET-stage2-zlib)
 
-maybe-clean-stage2-ld: clean-stage2-ld
-clean-stage2: clean-stage2-ld
-clean-stage2-ld:
+maybe-clean-stage2-zlib: clean-stage2-zlib
+clean-stage2: clean-stage2-zlib
+clean-stage2-zlib:
        @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage2-ld/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage2-zlib/Makefile ] || exit 0; \
          $(MAKE) stage2-start; \
        fi; \
-       cd $(HOST_SUBDIR)/ld && \
+       cd $(HOST_SUBDIR)/zlib && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif ld-bootstrap
+@endif zlib-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
+.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) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/ld && \
+       cd $(HOST_SUBDIR)/zlib && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE3_CFLAGS)" \
                CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -27263,40 +25545,40 @@ all-stage3-ld: configure-stage3-ld
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE3_TFLAGS)" \
-               $(TARGET-stage3-ld)
+               $(TARGET-stage3-zlib)
 
-maybe-clean-stage3-ld: clean-stage3-ld
-clean-stage3: clean-stage3-ld
-clean-stage3-ld:
+maybe-clean-stage3-zlib: clean-stage3-zlib
+clean-stage3: clean-stage3-zlib
+clean-stage3-zlib:
        @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage3-ld/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage3-zlib/Makefile ] || exit 0; \
          $(MAKE) stage3-start; \
        fi; \
-       cd $(HOST_SUBDIR)/ld && \
+       cd $(HOST_SUBDIR)/zlib && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif ld-bootstrap
+@endif zlib-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
+.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) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/ld && \
+       cd $(HOST_SUBDIR)/zlib && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGE4_CFLAGS)" \
                CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -27306,40 +25588,40 @@ all-stage4-ld: configure-stage4-ld
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGE4_TFLAGS)" \
-               $(TARGET-stage4-ld)
+               $(TARGET-stage4-zlib)
 
-maybe-clean-stage4-ld: clean-stage4-ld
-clean-stage4: clean-stage4-ld
-clean-stage4-ld:
+maybe-clean-stage4-zlib: clean-stage4-zlib
+clean-stage4: clean-stage4-zlib
+clean-stage4-zlib:
        @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stage4-ld/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stage4-zlib/Makefile ] || exit 0; \
          $(MAKE) stage4-start; \
        fi; \
-       cd $(HOST_SUBDIR)/ld && \
+       cd $(HOST_SUBDIR)/zlib && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif ld-bootstrap
+@endif zlib-bootstrap
 
 
-.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
+.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) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/ld && \
+       cd $(HOST_SUBDIR)/zlib && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEprofile_CFLAGS)" \
                CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -27349,40 +25631,40 @@ all-stageprofile-ld: configure-stageprofile-ld
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEprofile_TFLAGS)" \
-               $(TARGET-stageprofile-ld)
+               $(TARGET-stageprofile-zlib)
 
-maybe-clean-stageprofile-ld: clean-stageprofile-ld
-clean-stageprofile: clean-stageprofile-ld
-clean-stageprofile-ld:
+maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
+clean-stageprofile: clean-stageprofile-zlib
+clean-stageprofile-zlib:
        @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stageprofile-ld/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stageprofile-zlib/Makefile ] || exit 0; \
          $(MAKE) stageprofile-start; \
        fi; \
-       cd $(HOST_SUBDIR)/ld && \
+       cd $(HOST_SUBDIR)/zlib && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif ld-bootstrap
+@endif zlib-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
+.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; \
        TFLAGS="$(STAGEfeedback_TFLAGS)"; \
        $(HOST_EXPORTS) \
        $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/ld && \
+       cd $(HOST_SUBDIR)/zlib && \
        $(MAKE) $(BASE_FLAGS_TO_PASS) \
                CFLAGS="$(STAGEfeedback_CFLAGS)" \
                CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -27392,90 +25674,72 @@ all-stagefeedback-ld: configure-stagefeedback-ld
                LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
                TFLAGS="$(STAGEfeedback_TFLAGS)" \
-               $(TARGET-stagefeedback-ld)
+               $(TARGET-stagefeedback-zlib)
 
-maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
-clean-stagefeedback: clean-stagefeedback-ld
-clean-stagefeedback-ld:
+maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
+clean-stagefeedback: clean-stagefeedback-zlib
+clean-stagefeedback-zlib:
        @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
        else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-ld/Makefile ] || exit 0; \
+         [ -f $(HOST_SUBDIR)/stagefeedback-zlib/Makefile ] || exit 0; \
          $(MAKE) stagefeedback-start; \
        fi; \
-       cd $(HOST_SUBDIR)/ld && \
+       cd $(HOST_SUBDIR)/zlib && \
        $(MAKE) $(EXTRA_HOST_FLAGS)  \
                $(POSTSTAGE1_FLAGS_TO_PASS)  \
                 clean
-@endif ld-bootstrap
+@endif zlib-bootstrap
 
 
 
 
 
-.PHONY: check-ld maybe-check-ld
-maybe-check-ld:
-@if ld
-maybe-check-ld: check-ld
+.PHONY: check-zlib maybe-check-zlib
+maybe-check-zlib:
+@if zlib
+maybe-check-zlib: check-zlib
 
-check-ld:
-       @: $(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)
+check-zlib:
 
-@endif ld
+@endif zlib
 
-.PHONY: install-ld maybe-install-ld
-maybe-install-ld:
-@if ld
-maybe-install-ld: install-ld
+.PHONY: install-zlib maybe-install-zlib
+maybe-install-zlib:
+@if zlib
+maybe-install-zlib: install-zlib
 
-install-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)
+install-zlib:
 
-@endif ld
+@endif zlib
 
-.PHONY: install-strip-ld maybe-install-strip-ld
-maybe-install-strip-ld:
-@if ld
-maybe-install-strip-ld: install-strip-ld
+.PHONY: install-strip-zlib maybe-install-strip-zlib
+maybe-install-strip-zlib:
+@if zlib
+maybe-install-strip-zlib: install-strip-zlib
 
-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)
+install-strip-zlib:
 
-@endif ld
+@endif zlib
 
 # 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-zlib info-zlib
+maybe-info-zlib:
+@if zlib
+maybe-info-zlib: info-zlib
 
-info-ld: \
-    configure-ld 
-       @[ -f ./ld/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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
@@ -27483,24 +25747,24 @@ info-ld: \
                  info) \
          || exit 1
 
-@endif ld
+@endif zlib
 
-.PHONY: maybe-dvi-ld dvi-ld
-maybe-dvi-ld:
-@if ld
-maybe-dvi-ld: dvi-ld
+.PHONY: maybe-dvi-zlib dvi-zlib
+maybe-dvi-zlib:
+@if zlib
+maybe-dvi-zlib: dvi-zlib
 
-dvi-ld: \
-    configure-ld 
-       @[ -f ./ld/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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
@@ -27508,24 +25772,24 @@ dvi-ld: \
                  dvi) \
          || exit 1
 
-@endif ld
+@endif zlib
 
-.PHONY: maybe-pdf-ld pdf-ld
-maybe-pdf-ld:
-@if ld
-maybe-pdf-ld: pdf-ld
+.PHONY: maybe-pdf-zlib pdf-zlib
+maybe-pdf-zlib:
+@if zlib
+maybe-pdf-zlib: pdf-zlib
 
-pdf-ld: \
-    configure-ld 
-       @[ -f ./ld/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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
@@ -27533,24 +25797,24 @@ pdf-ld: \
                  pdf) \
          || exit 1
 
-@endif ld
+@endif zlib
 
-.PHONY: maybe-html-ld html-ld
-maybe-html-ld:
-@if ld
-maybe-html-ld: html-ld
+.PHONY: maybe-html-zlib html-zlib
+maybe-html-zlib:
+@if zlib
+maybe-html-zlib: html-zlib
 
-html-ld: \
-    configure-ld 
-       @[ -f ./ld/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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
@@ -27558,24 +25822,24 @@ html-ld: \
                  html) \
          || exit 1
 
-@endif ld
+@endif zlib
 
-.PHONY: maybe-TAGS-ld TAGS-ld
-maybe-TAGS-ld:
-@if ld
-maybe-TAGS-ld: TAGS-ld
+.PHONY: maybe-TAGS-zlib TAGS-zlib
+maybe-TAGS-zlib:
+@if zlib
+maybe-TAGS-zlib: TAGS-zlib
 
-TAGS-ld: \
-    configure-ld 
-       @[ -f ./ld/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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
@@ -27583,25 +25847,25 @@ TAGS-ld: \
                  TAGS) \
          || exit 1
 
-@endif ld
+@endif zlib
 
-.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-zlib install-info-zlib
+maybe-install-info-zlib:
+@if zlib
+maybe-install-info-zlib: install-info-zlib
 
-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) \
+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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
@@ -27609,25 +25873,25 @@ install-info-ld: \
                  install-info) \
          || exit 1
 
-@endif ld
+@endif zlib
 
-.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-zlib install-pdf-zlib
+maybe-install-pdf-zlib:
+@if zlib
+maybe-install-pdf-zlib: install-pdf-zlib
 
-install-pdf-ld: \
-    configure-ld \
-    pdf-ld 
-       @[ -f ./ld/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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
@@ -27635,25 +25899,25 @@ install-pdf-ld: \
                  install-pdf) \
          || exit 1
 
-@endif ld
+@endif zlib
 
-.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-zlib install-html-zlib
+maybe-install-html-zlib:
+@if zlib
+maybe-install-html-zlib: install-html-zlib
 
-install-html-ld: \
-    configure-ld \
-    html-ld 
-       @[ -f ./ld/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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
@@ -27661,24 +25925,24 @@ install-html-ld: \
                  install-html) \
          || exit 1
 
-@endif ld
+@endif zlib
 
-.PHONY: maybe-installcheck-ld installcheck-ld
-maybe-installcheck-ld:
-@if ld
-maybe-installcheck-ld: installcheck-ld
+.PHONY: maybe-installcheck-zlib installcheck-zlib
+maybe-installcheck-zlib:
+@if zlib
+maybe-installcheck-zlib: installcheck-zlib
 
-installcheck-ld: \
-    configure-ld 
-       @[ -f ./ld/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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
@@ -27686,23 +25950,23 @@ installcheck-ld: \
                  installcheck) \
          || exit 1
 
-@endif ld
+@endif zlib
 
-.PHONY: maybe-mostlyclean-ld mostlyclean-ld
-maybe-mostlyclean-ld:
-@if ld
-maybe-mostlyclean-ld: mostlyclean-ld
+.PHONY: maybe-mostlyclean-zlib mostlyclean-zlib
+maybe-mostlyclean-zlib:
+@if zlib
+maybe-mostlyclean-zlib: mostlyclean-zlib
 
-mostlyclean-ld: 
-       @[ -f ./ld/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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
@@ -27710,23 +25974,23 @@ mostlyclean-ld:
                  mostlyclean) \
          || exit 1
 
-@endif ld
+@endif zlib
 
-.PHONY: maybe-clean-ld clean-ld
-maybe-clean-ld:
-@if ld
-maybe-clean-ld: clean-ld
+.PHONY: maybe-clean-zlib clean-zlib
+maybe-clean-zlib:
+@if zlib
+maybe-clean-zlib: clean-zlib
 
-clean-ld: 
-       @[ -f ./ld/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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
@@ -27734,23 +25998,23 @@ clean-ld:
                  clean) \
          || exit 1
 
-@endif ld
+@endif zlib
 
-.PHONY: maybe-distclean-ld distclean-ld
-maybe-distclean-ld:
-@if ld
-maybe-distclean-ld: distclean-ld
+.PHONY: maybe-distclean-zlib distclean-zlib
+maybe-distclean-zlib:
+@if zlib
+maybe-distclean-zlib: distclean-zlib
 
-distclean-ld: 
-       @[ -f ./ld/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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
@@ -27758,23 +26022,23 @@ distclean-ld:
                  distclean) \
          || exit 1
 
-@endif ld
+@endif zlib
 
-.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-zlib maintainer-clean-zlib
+maybe-maintainer-clean-zlib:
+@if zlib
+maybe-maintainer-clean-zlib: maintainer-clean-zlib
 
-maintainer-clean-ld: 
-       @[ -f ./ld/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 ld" ; \
-       (cd $(HOST_SUBDIR)/ld && \
+       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}" \
@@ -27782,1562 +26046,672 @@ maintainer-clean-ld:
                  maintainer-clean) \
          || exit 1
 
-@endif ld
+@endif zlib
 
 
 
-.PHONY: configure-libcpp maybe-configure-libcpp
-maybe-configure-libcpp:
+.PHONY: configure-gdb maybe-configure-gdb
+maybe-configure-gdb:
 @if gcc-bootstrap
-configure-libcpp: stage_current
+configure-gdb: stage_current
 @endif gcc-bootstrap
-@if libcpp
-maybe-configure-libcpp: configure-libcpp
-configure-libcpp: 
+@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)/libcpp/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
+       test ! -f $(HOST_SUBDIR)/gdb/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdb ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/libcpp; \
-       cd "$(HOST_SUBDIR)/libcpp" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gdb; \
+       cd "$(HOST_SUBDIR)/gdb" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gdb/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
+       srcdiroption="--srcdir=$${topdir}/gdb"; \
+       libsrcdir="$$s/gdb"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif libcpp
+@endif gdb
 
 
 
-.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; \
-       srcdiroption="--srcdir=$${topdir}/libcpp"; \
-       libsrcdir="$$s/libcpp"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         $(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; \
-       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_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
+.PHONY: all-gdb maybe-all-gdb
+maybe-all-gdb:
+@if gcc-bootstrap
+all-gdb: stage_current
+@endif gcc-bootstrap
+@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; \
-       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; \
-       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) \
-         $(STAGE3_CONFIGURE_FLAGS)
-@endif libcpp-bootstrap
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/gdb && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+               $(TARGET-gdb))
+@endif gdb
 
-.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
+
+
+
+.PHONY: check-gdb maybe-check-gdb
+maybe-check-gdb:
+@if gdb
+maybe-check-gdb: check-gdb
+
+check-gdb:
+       @: $(MAKE); $(unstage)
        @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; \
-       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) \
-         $(STAGE4_CONFIGURE_FLAGS)
-@endif libcpp-bootstrap
+       (cd $(HOST_SUBDIR)/gdb && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
 
-.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
+@endif gdb
+
+.PHONY: install-gdb maybe-install-gdb
+maybe-install-gdb:
+@if gdb
+maybe-install-gdb: install-gdb
+
+install-gdb: installdirs
+       @: $(MAKE); $(unstage)
        @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; \
-       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) \
-         $(STAGEprofile_CONFIGURE_FLAGS)
-@endif libcpp-bootstrap
+       (cd $(HOST_SUBDIR)/gdb && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-.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
+@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; \
-       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; \
-       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) \
-         $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif libcpp-bootstrap
-
+       (cd $(HOST_SUBDIR)/gdb && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
+@endif gdb
 
+# Other targets (info, dvi, pdf, etc.)
 
+.PHONY: maybe-info-gdb info-gdb
+maybe-info-gdb:
+@if gdb
+maybe-info-gdb: info-gdb
 
-.PHONY: all-libcpp maybe-all-libcpp
-maybe-all-libcpp:
-@if gcc-bootstrap
-all-libcpp: stage_current
-@endif gcc-bootstrap
-@if libcpp
-TARGET-libcpp=all
-maybe-all-libcpp: all-libcpp
-all-libcpp: configure-libcpp
-       @r=`${PWD_COMMAND}`; export r; \
+info-gdb: \
+    configure-gdb 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gdb/Makefile ] || exit 0; \
+       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) \
+       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 && \
+         $(MAKE) $(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 gdb
 
+.PHONY: maybe-dvi-gdb dvi-gdb
+maybe-dvi-gdb:
+@if gdb
+maybe-dvi-gdb: dvi-gdb
 
-.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; \
+dvi-gdb: \
+    configure-gdb 
+       @: $(MAKE); $(unstage)
+       @[ -f ./gdb/Makefile ] || exit 0; \
+       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)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-libcpp)
+       $(HOST_EXPORTS) \
+       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 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 dvi) \
+         || exit 1
 
-maybe-clean-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)  \
-                clean
-@endif libcpp-bootstrap
+@endif gdb
 
+.PHONY: maybe-pdf-gdb pdf-gdb
+maybe-pdf-gdb:
+@if gdb
+maybe-pdf-gdb: pdf-gdb
 
-.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) \
-       $(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: 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) \
-       $(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)
-
-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: 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) \
-       (cd $(HOST_SUBDIR)/libcpp && \
-         $(MAKE) $(FLAGS_TO_PASS)  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)/libcpp && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@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
+pdf-gdb: \
+    configure-gdb 
        @: $(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-libcpp info-libcpp
-maybe-info-libcpp:
-@if libcpp
-maybe-info-libcpp: info-libcpp
-
-info-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 info) \
+                 pdf) \
          || exit 1
 
-@endif libcpp
+@endif gdb
 
-.PHONY: maybe-dvi-libcpp dvi-libcpp
-maybe-dvi-libcpp:
-@if libcpp
-maybe-dvi-libcpp: dvi-libcpp
+.PHONY: maybe-html-gdb html-gdb
+maybe-html-gdb:
+@if gdb
+maybe-html-gdb: html-gdb
 
-dvi-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+html-gdb: \
+    configure-gdb 
+       @: $(MAKE); $(unstage)
+       @[ -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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 dvi) \
+                 html) \
          || exit 1
 
-@endif libcpp
+@endif gdb
 
-.PHONY: maybe-pdf-libcpp pdf-libcpp
-maybe-pdf-libcpp:
-@if libcpp
-maybe-pdf-libcpp: pdf-libcpp
+.PHONY: maybe-TAGS-gdb TAGS-gdb
+maybe-TAGS-gdb:
+@if gdb
+maybe-TAGS-gdb: TAGS-gdb
 
-pdf-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+TAGS-gdb: \
+    configure-gdb 
+       @: $(MAKE); $(unstage)
+       @[ -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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 pdf) \
+                 TAGS) \
          || exit 1
 
-@endif libcpp
+@endif gdb
 
-.PHONY: maybe-html-libcpp html-libcpp
-maybe-html-libcpp:
-@if libcpp
-maybe-html-libcpp: html-libcpp
+.PHONY: maybe-install-info-gdb install-info-gdb
+maybe-install-info-gdb:
+@if gdb
+maybe-install-info-gdb: install-info-gdb
 
-html-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+install-info-gdb: \
+    configure-gdb \
+    info-gdb 
+       @: $(MAKE); $(unstage)
+       @[ -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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 html) \
+                 install-info) \
          || exit 1
 
-@endif libcpp
+@endif gdb
 
-.PHONY: maybe-TAGS-libcpp TAGS-libcpp
-maybe-TAGS-libcpp:
-@if libcpp
-maybe-TAGS-libcpp: TAGS-libcpp
+.PHONY: maybe-install-pdf-gdb install-pdf-gdb
+maybe-install-pdf-gdb:
+@if gdb
+maybe-install-pdf-gdb: install-pdf-gdb
 
-TAGS-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+install-pdf-gdb: \
+    configure-gdb \
+    pdf-gdb 
+       @: $(MAKE); $(unstage)
+       @[ -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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 TAGS) \
+                 install-pdf) \
          || exit 1
 
-@endif libcpp
+@endif gdb
 
-.PHONY: maybe-install-info-libcpp install-info-libcpp
-maybe-install-info-libcpp:
-@if libcpp
-maybe-install-info-libcpp: install-info-libcpp
+.PHONY: maybe-install-html-gdb install-html-gdb
+maybe-install-html-gdb:
+@if gdb
+maybe-install-html-gdb: install-html-gdb
 
-install-info-libcpp: \
-    configure-libcpp \
-    info-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+install-html-gdb: \
+    configure-gdb \
+    html-gdb 
+       @: $(MAKE); $(unstage)
+       @[ -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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-info) \
+                 install-html) \
          || exit 1
 
-@endif libcpp
+@endif gdb
 
-.PHONY: maybe-install-pdf-libcpp install-pdf-libcpp
-maybe-install-pdf-libcpp:
-@if libcpp
-maybe-install-pdf-libcpp: install-pdf-libcpp
+.PHONY: maybe-installcheck-gdb installcheck-gdb
+maybe-installcheck-gdb:
+@if gdb
+maybe-installcheck-gdb: installcheck-gdb
 
-install-pdf-libcpp: \
-    configure-libcpp \
-    pdf-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+installcheck-gdb: \
+    configure-gdb 
+       @: $(MAKE); $(unstage)
+       @[ -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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-pdf) \
+                 installcheck) \
          || exit 1
 
-@endif libcpp
+@endif gdb
 
-.PHONY: maybe-install-html-libcpp install-html-libcpp
-maybe-install-html-libcpp:
-@if libcpp
-maybe-install-html-libcpp: install-html-libcpp
+.PHONY: maybe-mostlyclean-gdb mostlyclean-gdb
+maybe-mostlyclean-gdb:
+@if gdb
+maybe-mostlyclean-gdb: mostlyclean-gdb
 
-install-html-libcpp: \
-    configure-libcpp \
-    html-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+mostlyclean-gdb: 
+       @: $(MAKE); $(unstage)
+       @[ -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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-html) \
+                 mostlyclean) \
          || exit 1
 
-@endif libcpp
+@endif gdb
 
-.PHONY: maybe-installcheck-libcpp installcheck-libcpp
-maybe-installcheck-libcpp:
-@if libcpp
-maybe-installcheck-libcpp: installcheck-libcpp
+.PHONY: maybe-clean-gdb clean-gdb
+maybe-clean-gdb:
+@if gdb
+maybe-clean-gdb: clean-gdb
 
-installcheck-libcpp: \
-    configure-libcpp 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+clean-gdb: 
+       @: $(MAKE); $(unstage)
+       @[ -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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 installcheck) \
+                 clean) \
          || exit 1
 
-@endif libcpp
+@endif gdb
 
-.PHONY: maybe-mostlyclean-libcpp mostlyclean-libcpp
-maybe-mostlyclean-libcpp:
-@if libcpp
-maybe-mostlyclean-libcpp: mostlyclean-libcpp
+.PHONY: maybe-distclean-gdb distclean-gdb
+maybe-distclean-gdb:
+@if gdb
+maybe-distclean-gdb: distclean-gdb
 
-mostlyclean-libcpp: 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+distclean-gdb: 
+       @: $(MAKE); $(unstage)
+       @[ -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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 mostlyclean) \
+                 distclean) \
          || exit 1
 
-@endif libcpp
+@endif gdb
 
-.PHONY: maybe-clean-libcpp clean-libcpp
-maybe-clean-libcpp:
-@if libcpp
-maybe-clean-libcpp: clean-libcpp
+.PHONY: maybe-maintainer-clean-gdb maintainer-clean-gdb
+maybe-maintainer-clean-gdb:
+@if gdb
+maybe-maintainer-clean-gdb: maintainer-clean-gdb
 
-clean-libcpp: 
-       @[ -f ./libcpp/Makefile ] || exit 0; \
+maintainer-clean-gdb: 
+       @: $(MAKE); $(unstage)
+       @[ -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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 clean) \
+                 maintainer-clean) \
          || exit 1
 
-@endif libcpp
-
-.PHONY: maybe-distclean-libcpp distclean-libcpp
-maybe-distclean-libcpp:
-@if libcpp
-maybe-distclean-libcpp: distclean-libcpp
-
-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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
-         $(MAKE) $(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 libcpp
-
-.PHONY: maybe-maintainer-clean-libcpp maintainer-clean-libcpp
-maybe-maintainer-clean-libcpp:
-@if libcpp
-maybe-maintainer-clean-libcpp: maintainer-clean-libcpp
-
-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 libcpp" ; \
-       (cd $(HOST_SUBDIR)/libcpp && \
-         $(MAKE) $(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 libcpp
+@endif gdb
 
 
 
-.PHONY: configure-libdecnumber maybe-configure-libdecnumber
-maybe-configure-libdecnumber:
+.PHONY: configure-expect maybe-configure-expect
+maybe-configure-expect:
 @if gcc-bootstrap
-configure-libdecnumber: stage_current
+configure-expect: stage_current
 @endif gcc-bootstrap
-@if libdecnumber
-maybe-configure-libdecnumber: configure-libdecnumber
-configure-libdecnumber: 
+@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)/libdecnumber/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
+       test ! -f $(HOST_SUBDIR)/expect/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/expect ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/libdecnumber; \
-       cd "$(HOST_SUBDIR)/libdecnumber" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/expect; \
+       cd "$(HOST_SUBDIR)/expect" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/expect/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-       libsrcdir="$$s/libdecnumber"; \
+       srcdiroption="--srcdir=$${topdir}/expect"; \
+       libsrcdir="$$s/expect"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif libdecnumber
+@endif expect
 
 
 
-.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)/libdecnumber
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE1_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/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)/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} \
-         $(STAGE1_CONFIGURE_FLAGS)
-@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:
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/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)/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_CONFIGURE_FLAGS)
-@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:
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+.PHONY: all-expect maybe-all-expect
+maybe-all-expect:
+@if gcc-bootstrap
+all-expect: stage_current
+@endif gcc-bootstrap
+@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; \
-       TFLAGS="$(STAGE3_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/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)/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) \
-         $(STAGE3_CONFIGURE_FLAGS)
-@endif libdecnumber-bootstrap
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/expect && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+               $(TARGET-expect))
+@endif expect
 
-.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)/libdecnumber
+
+
+
+.PHONY: check-expect maybe-check-expect
+maybe-check-expect:
+@if expect
+maybe-check-expect: check-expect
+
+check-expect:
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE4_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/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)/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) \
-         $(STAGE4_CONFIGURE_FLAGS)
-@endif libdecnumber-bootstrap
+       (cd $(HOST_SUBDIR)/expect && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
 
-.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)/libdecnumber
+@endif expect
+
+.PHONY: install-expect maybe-install-expect
+maybe-install-expect:
+@if expect
+maybe-install-expect: install-expect
+
+install-expect: installdirs
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/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)/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) \
-         $(STAGEprofile_CONFIGURE_FLAGS)
-@endif libdecnumber-bootstrap
+       (cd $(HOST_SUBDIR)/expect && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-.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)/libdecnumber
+@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; \
-       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libdecnumber/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)/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) \
-         $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif libdecnumber-bootstrap
-
+       (cd $(HOST_SUBDIR)/expect && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
+@endif expect
 
+# Other targets (info, dvi, pdf, etc.)
 
+.PHONY: maybe-info-expect info-expect
+maybe-info-expect:
+@if expect
+maybe-info-expect: info-expect
 
-.PHONY: all-libdecnumber maybe-all-libdecnumber
-maybe-all-libdecnumber:
-@if gcc-bootstrap
-all-libdecnumber: stage_current
-@endif gcc-bootstrap
-@if libdecnumber
-TARGET-libdecnumber=all
-maybe-all-libdecnumber: all-libdecnumber
-all-libdecnumber: configure-libdecnumber
-       @r=`${PWD_COMMAND}`; export r; \
+info-expect: \
+    configure-expect 
+       @: $(MAKE); $(unstage)
+       @[ -f ./expect/Makefile ] || exit 0; \
+       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
+       $(HOST_EXPORTS) \
+       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 && \
+         $(MAKE) $(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 expect
 
+.PHONY: maybe-dvi-expect dvi-expect
+maybe-dvi-expect:
+@if expect
+maybe-dvi-expect: dvi-expect
 
-.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; \
+dvi-expect: \
+    configure-expect 
+       @: $(MAKE); $(unstage)
+       @[ -f ./expect/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE1_TFLAGS)"; \
-       $(HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(STAGE1_CFLAGS)" \
-               CXXFLAGS="$(STAGE1_CXXFLAGS)" \
-               LIBCFLAGS="$(LIBCFLAGS)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_HOST_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-libdecnumber)
+       $(HOST_EXPORTS) \
+       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 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 dvi) \
+         || exit 1
 
-maybe-clean-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)/stage1-libdecnumber/Makefile ] || exit 0; \
-         $(MAKE) stage1-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-                clean
-@endif libdecnumber-bootstrap
+@endif expect
 
+.PHONY: maybe-pdf-expect pdf-expect
+maybe-pdf-expect:
+@if expect
+maybe-pdf-expect: pdf-expect
 
-.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; \
+pdf-expect: \
+    configure-expect 
+       @: $(MAKE); $(unstage)
+       @[ -f ./expect/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libdecnumber && \
-       $(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-libdecnumber)
+       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 && \
+         $(MAKE) $(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
 
-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)/stage2-libdecnumber/Makefile ] || exit 0; \
-         $(MAKE) stage2-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libdecnumber-bootstrap
+@endif expect
 
+.PHONY: maybe-html-expect html-expect
+maybe-html-expect:
+@if expect
+maybe-html-expect: html-expect
 
-.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; \
+html-expect: \
+    configure-expect 
+       @: $(MAKE); $(unstage)
+       @[ -f ./expect/Makefile ] || exit 0; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE3_TFLAGS)"; \
        $(HOST_EXPORTS) \
-       $(POSTSTAGE1_HOST_EXPORTS)  \
-       cd $(HOST_SUBDIR)/libdecnumber && \
-       $(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-libdecnumber)
+       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 && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                 html) \
+         || exit 1
 
-maybe-clean-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)/stage3-libdecnumber/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-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)/libdecnumber && \
-       $(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-libdecnumber)
-
-maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber
-clean-stage4: clean-stage4-libdecnumber
-clean-stage4-libdecnumber:
-       @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stage4-libdecnumber/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
-       @[ $(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 && \
-       $(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-libdecnumber)
-
-maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber
-clean-stageprofile: clean-stageprofile-libdecnumber
-clean-stageprofile-libdecnumber:
-       @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stageprofile-libdecnumber/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
-       @[ $(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 && \
-       $(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-libdecnumber)
-
-maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber
-clean-stagefeedback: clean-stagefeedback-libdecnumber
-clean-stagefeedback-libdecnumber:
-       @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
-       else \
-         [ -f $(HOST_SUBDIR)/stagefeedback-libdecnumber/Makefile ] || exit 0; \
-         $(MAKE) stagefeedback-start; \
-       fi; \
-       cd $(HOST_SUBDIR)/libdecnumber && \
-       $(MAKE) $(EXTRA_HOST_FLAGS)  \
-               $(POSTSTAGE1_FLAGS_TO_PASS)  \
-                clean
-@endif libdecnumber-bootstrap
-
-
-
-
-
-.PHONY: check-libdecnumber maybe-check-libdecnumber
-maybe-check-libdecnumber:
-@if libdecnumber
-maybe-check-libdecnumber: check-libdecnumber
-
-check-libdecnumber:
-       @: $(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)
-
-@endif libdecnumber
-
-.PHONY: install-libdecnumber maybe-install-libdecnumber
-maybe-install-libdecnumber:
-@if libdecnumber
-maybe-install-libdecnumber: install-libdecnumber
-
-install-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)
-
-@endif libdecnumber
+@endif expect
 
-.PHONY: install-strip-libdecnumber maybe-install-strip-libdecnumber
-maybe-install-strip-libdecnumber:
-@if libdecnumber
-maybe-install-strip-libdecnumber: install-strip-libdecnumber
+.PHONY: maybe-TAGS-expect TAGS-expect
+maybe-TAGS-expect:
+@if expect
+maybe-TAGS-expect: TAGS-expect
 
-install-strip-libdecnumber: installdirs
+TAGS-expect: \
+    configure-expect 
        @: $(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-libdecnumber info-libdecnumber
-maybe-info-libdecnumber:
-@if libdecnumber
-maybe-info-libdecnumber: info-libdecnumber
-
-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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
-         $(MAKE) $(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 libdecnumber
-
-.PHONY: maybe-dvi-libdecnumber dvi-libdecnumber
-maybe-dvi-libdecnumber:
-@if libdecnumber
-maybe-dvi-libdecnumber: dvi-libdecnumber
-
-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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
-         $(MAKE) $(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 libdecnumber
-
-.PHONY: maybe-pdf-libdecnumber pdf-libdecnumber
-maybe-pdf-libdecnumber:
-@if libdecnumber
-maybe-pdf-libdecnumber: pdf-libdecnumber
-
-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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
-         $(MAKE) $(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 libdecnumber
-
-.PHONY: maybe-html-libdecnumber html-libdecnumber
-maybe-html-libdecnumber:
-@if libdecnumber
-maybe-html-libdecnumber: html-libdecnumber
-
-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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
-         $(MAKE) $(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 libdecnumber
-
-.PHONY: maybe-TAGS-libdecnumber TAGS-libdecnumber
-maybe-TAGS-libdecnumber:
-@if libdecnumber
-maybe-TAGS-libdecnumber: TAGS-libdecnumber
-
-TAGS-libdecnumber: \
-    configure-libdecnumber 
-       @[ -f ./libdecnumber/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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       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}" \
@@ -29345,25 +26719,26 @@ TAGS-libdecnumber: \
                  TAGS) \
          || exit 1
 
-@endif libdecnumber
+@endif expect
 
-.PHONY: maybe-install-info-libdecnumber install-info-libdecnumber
-maybe-install-info-libdecnumber:
-@if libdecnumber
-maybe-install-info-libdecnumber: install-info-libdecnumber
+.PHONY: maybe-install-info-expect install-info-expect
+maybe-install-info-expect:
+@if expect
+maybe-install-info-expect: install-info-expect
 
-install-info-libdecnumber: \
-    configure-libdecnumber \
-    info-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+install-info-expect: \
+    configure-expect \
+    info-expect 
+       @: $(MAKE); $(unstage)
+       @[ -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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       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}" \
@@ -29371,25 +26746,26 @@ install-info-libdecnumber: \
                  install-info) \
          || exit 1
 
-@endif libdecnumber
+@endif expect
 
-.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-expect install-pdf-expect
+maybe-install-pdf-expect:
+@if expect
+maybe-install-pdf-expect: install-pdf-expect
 
-install-pdf-libdecnumber: \
-    configure-libdecnumber \
-    pdf-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+install-pdf-expect: \
+    configure-expect \
+    pdf-expect 
+       @: $(MAKE); $(unstage)
+       @[ -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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       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}" \
@@ -29397,25 +26773,26 @@ install-pdf-libdecnumber: \
                  install-pdf) \
          || exit 1
 
-@endif libdecnumber
+@endif expect
 
-.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-expect install-html-expect
+maybe-install-html-expect:
+@if expect
+maybe-install-html-expect: install-html-expect
 
-install-html-libdecnumber: \
-    configure-libdecnumber \
-    html-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+install-html-expect: \
+    configure-expect \
+    html-expect 
+       @: $(MAKE); $(unstage)
+       @[ -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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       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}" \
@@ -29423,24 +26800,25 @@ install-html-libdecnumber: \
                  install-html) \
          || exit 1
 
-@endif libdecnumber
+@endif expect
 
-.PHONY: maybe-installcheck-libdecnumber installcheck-libdecnumber
-maybe-installcheck-libdecnumber:
-@if libdecnumber
-maybe-installcheck-libdecnumber: installcheck-libdecnumber
+.PHONY: maybe-installcheck-expect installcheck-expect
+maybe-installcheck-expect:
+@if expect
+maybe-installcheck-expect: installcheck-expect
 
-installcheck-libdecnumber: \
-    configure-libdecnumber 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+installcheck-expect: \
+    configure-expect 
+       @: $(MAKE); $(unstage)
+       @[ -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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       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}" \
@@ -29448,23 +26826,24 @@ installcheck-libdecnumber: \
                  installcheck) \
          || exit 1
 
-@endif libdecnumber
+@endif expect
 
-.PHONY: maybe-mostlyclean-libdecnumber mostlyclean-libdecnumber
-maybe-mostlyclean-libdecnumber:
-@if libdecnumber
-maybe-mostlyclean-libdecnumber: mostlyclean-libdecnumber
+.PHONY: maybe-mostlyclean-expect mostlyclean-expect
+maybe-mostlyclean-expect:
+@if expect
+maybe-mostlyclean-expect: mostlyclean-expect
 
-mostlyclean-libdecnumber: 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+mostlyclean-expect: 
+       @: $(MAKE); $(unstage)
+       @[ -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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       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}" \
@@ -29472,23 +26851,24 @@ mostlyclean-libdecnumber:
                  mostlyclean) \
          || exit 1
 
-@endif libdecnumber
+@endif expect
 
-.PHONY: maybe-clean-libdecnumber clean-libdecnumber
-maybe-clean-libdecnumber:
-@if libdecnumber
-maybe-clean-libdecnumber: clean-libdecnumber
+.PHONY: maybe-clean-expect clean-expect
+maybe-clean-expect:
+@if expect
+maybe-clean-expect: clean-expect
 
-clean-libdecnumber: 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+clean-expect: 
+       @: $(MAKE); $(unstage)
+       @[ -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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       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}" \
@@ -29496,23 +26876,24 @@ clean-libdecnumber:
                  clean) \
          || exit 1
 
-@endif libdecnumber
+@endif expect
 
-.PHONY: maybe-distclean-libdecnumber distclean-libdecnumber
-maybe-distclean-libdecnumber:
-@if libdecnumber
-maybe-distclean-libdecnumber: distclean-libdecnumber
+.PHONY: maybe-distclean-expect distclean-expect
+maybe-distclean-expect:
+@if expect
+maybe-distclean-expect: distclean-expect
 
-distclean-libdecnumber: 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+distclean-expect: 
+       @: $(MAKE); $(unstage)
+       @[ -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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       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}" \
@@ -29520,23 +26901,24 @@ distclean-libdecnumber:
                  distclean) \
          || exit 1
 
-@endif libdecnumber
+@endif expect
 
-.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-expect maintainer-clean-expect
+maybe-maintainer-clean-expect:
+@if expect
+maybe-maintainer-clean-expect: maintainer-clean-expect
 
-maintainer-clean-libdecnumber: 
-       @[ -f ./libdecnumber/Makefile ] || exit 0; \
+maintainer-clean-expect: 
+       @: $(MAKE); $(unstage)
+       @[ -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 libdecnumber" ; \
-       (cd $(HOST_SUBDIR)/libdecnumber && \
+       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}" \
@@ -29544,128 +26926,128 @@ maintainer-clean-libdecnumber:
                  maintainer-clean) \
          || exit 1
 
-@endif libdecnumber
+@endif expect
 
 
 
-.PHONY: configure-libgui maybe-configure-libgui
-maybe-configure-libgui:
+.PHONY: configure-guile maybe-configure-guile
+maybe-configure-guile:
 @if gcc-bootstrap
-configure-libgui: stage_current
+configure-guile: stage_current
 @endif gcc-bootstrap
-@if libgui
-maybe-configure-libgui: configure-libgui
-configure-libgui: 
+@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)/libgui/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui ; \
+       test ! -f $(HOST_SUBDIR)/guile/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/guile ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/libgui; \
-       cd "$(HOST_SUBDIR)/libgui" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/guile; \
+       cd "$(HOST_SUBDIR)/guile" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libgui/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/guile/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgui"; \
-       libsrcdir="$$s/libgui"; \
+       srcdiroption="--srcdir=$${topdir}/guile"; \
+       libsrcdir="$$s/guile"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
          --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif libgui
+@endif guile
 
 
 
 
 
-.PHONY: all-libgui maybe-all-libgui
-maybe-all-libgui:
+.PHONY: all-guile maybe-all-guile
+maybe-all-guile:
 @if gcc-bootstrap
-all-libgui: stage_current
+all-guile: stage_current
 @endif gcc-bootstrap
-@if libgui
-TARGET-libgui=all
-maybe-all-libgui: all-libgui
-all-libgui: configure-libgui
-       @: $(MAKE); $(unstage)
+@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)/libgui && \
+       (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-libgui))
-@endif libgui
+               $(TARGET-guile))
+@endif guile
 
 
 
 
-.PHONY: check-libgui maybe-check-libgui
-maybe-check-libgui:
-@if libgui
-maybe-check-libgui: check-libgui
+.PHONY: check-guile maybe-check-guile
+maybe-check-guile:
+@if guile
+maybe-check-guile: check-guile
 
-check-libgui:
+check-guile:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libgui && \
+       (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif libgui
+@endif guile
 
-.PHONY: install-libgui maybe-install-libgui
-maybe-install-libgui:
-@if libgui
-maybe-install-libgui: install-libgui
+.PHONY: install-guile maybe-install-guile
+maybe-install-guile:
+@if guile
+maybe-install-guile: install-guile
 
-install-libgui: installdirs
+install-guile: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libgui && \
+       (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif libgui
+@endif guile
 
-.PHONY: install-strip-libgui maybe-install-strip-libgui
-maybe-install-strip-libgui:
-@if libgui
-maybe-install-strip-libgui: install-strip-libgui
+.PHONY: install-strip-guile maybe-install-strip-guile
+maybe-install-strip-guile:
+@if guile
+maybe-install-strip-guile: install-strip-guile
 
-install-strip-libgui: installdirs
+install-strip-guile: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libgui && \
+       (cd $(HOST_SUBDIR)/guile && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif libgui
+@endif guile
 
 # 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-guile info-guile
+maybe-info-guile:
+@if guile
+maybe-info-guile: info-guile
 
-info-libgui: \
-    configure-libgui 
+info-guile: \
+    configure-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./libgui/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       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}" \
@@ -29673,25 +27055,25 @@ info-libgui: \
                  info) \
          || exit 1
 
-@endif libgui
+@endif guile
 
-.PHONY: maybe-dvi-libgui dvi-libgui
-maybe-dvi-libgui:
-@if libgui
-maybe-dvi-libgui: dvi-libgui
+.PHONY: maybe-dvi-guile dvi-guile
+maybe-dvi-guile:
+@if guile
+maybe-dvi-guile: dvi-guile
 
-dvi-libgui: \
-    configure-libgui 
+dvi-guile: \
+    configure-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./libgui/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       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}" \
@@ -29699,25 +27081,25 @@ dvi-libgui: \
                  dvi) \
          || exit 1
 
-@endif libgui
+@endif guile
 
-.PHONY: maybe-pdf-libgui pdf-libgui
-maybe-pdf-libgui:
-@if libgui
-maybe-pdf-libgui: pdf-libgui
+.PHONY: maybe-pdf-guile pdf-guile
+maybe-pdf-guile:
+@if guile
+maybe-pdf-guile: pdf-guile
 
-pdf-libgui: \
-    configure-libgui 
+pdf-guile: \
+    configure-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./libgui/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       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}" \
@@ -29725,25 +27107,25 @@ pdf-libgui: \
                  pdf) \
          || exit 1
 
-@endif libgui
+@endif guile
 
-.PHONY: maybe-html-libgui html-libgui
-maybe-html-libgui:
-@if libgui
-maybe-html-libgui: html-libgui
+.PHONY: maybe-html-guile html-guile
+maybe-html-guile:
+@if guile
+maybe-html-guile: html-guile
 
-html-libgui: \
-    configure-libgui 
+html-guile: \
+    configure-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./libgui/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       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}" \
@@ -29751,25 +27133,25 @@ html-libgui: \
                  html) \
          || exit 1
 
-@endif libgui
+@endif guile
 
-.PHONY: maybe-TAGS-libgui TAGS-libgui
-maybe-TAGS-libgui:
-@if libgui
-maybe-TAGS-libgui: TAGS-libgui
+.PHONY: maybe-TAGS-guile TAGS-guile
+maybe-TAGS-guile:
+@if guile
+maybe-TAGS-guile: TAGS-guile
 
-TAGS-libgui: \
-    configure-libgui 
+TAGS-guile: \
+    configure-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./libgui/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       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}" \
@@ -29777,26 +27159,26 @@ TAGS-libgui: \
                  TAGS) \
          || exit 1
 
-@endif libgui
+@endif guile
 
-.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-guile install-info-guile
+maybe-install-info-guile:
+@if guile
+maybe-install-info-guile: install-info-guile
 
-install-info-libgui: \
-    configure-libgui \
-    info-libgui 
+install-info-guile: \
+    configure-guile \
+    info-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./libgui/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       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}" \
@@ -29804,26 +27186,26 @@ install-info-libgui: \
                  install-info) \
          || exit 1
 
-@endif libgui
+@endif guile
 
-.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-guile install-pdf-guile
+maybe-install-pdf-guile:
+@if guile
+maybe-install-pdf-guile: install-pdf-guile
 
-install-pdf-libgui: \
-    configure-libgui \
-    pdf-libgui 
+install-pdf-guile: \
+    configure-guile \
+    pdf-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./libgui/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       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}" \
@@ -29831,26 +27213,26 @@ install-pdf-libgui: \
                  install-pdf) \
          || exit 1
 
-@endif libgui
+@endif guile
 
-.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-guile install-html-guile
+maybe-install-html-guile:
+@if guile
+maybe-install-html-guile: install-html-guile
 
-install-html-libgui: \
-    configure-libgui \
-    html-libgui 
+install-html-guile: \
+    configure-guile \
+    html-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./libgui/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       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}" \
@@ -29858,25 +27240,25 @@ install-html-libgui: \
                  install-html) \
          || exit 1
 
-@endif libgui
+@endif guile
 
-.PHONY: maybe-installcheck-libgui installcheck-libgui
-maybe-installcheck-libgui:
-@if libgui
-maybe-installcheck-libgui: installcheck-libgui
+.PHONY: maybe-installcheck-guile installcheck-guile
+maybe-installcheck-guile:
+@if guile
+maybe-installcheck-guile: installcheck-guile
 
-installcheck-libgui: \
-    configure-libgui 
+installcheck-guile: \
+    configure-guile 
        @: $(MAKE); $(unstage)
-       @[ -f ./libgui/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       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}" \
@@ -29884,24 +27266,24 @@ installcheck-libgui: \
                  installcheck) \
          || exit 1
 
-@endif libgui
+@endif guile
 
-.PHONY: maybe-mostlyclean-libgui mostlyclean-libgui
-maybe-mostlyclean-libgui:
-@if libgui
-maybe-mostlyclean-libgui: mostlyclean-libgui
+.PHONY: maybe-mostlyclean-guile mostlyclean-guile
+maybe-mostlyclean-guile:
+@if guile
+maybe-mostlyclean-guile: mostlyclean-guile
 
-mostlyclean-libgui: 
+mostlyclean-guile: 
        @: $(MAKE); $(unstage)
-       @[ -f ./libgui/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       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}" \
@@ -29909,24 +27291,24 @@ mostlyclean-libgui:
                  mostlyclean) \
          || exit 1
 
-@endif libgui
+@endif guile
 
-.PHONY: maybe-clean-libgui clean-libgui
-maybe-clean-libgui:
-@if libgui
-maybe-clean-libgui: clean-libgui
+.PHONY: maybe-clean-guile clean-guile
+maybe-clean-guile:
+@if guile
+maybe-clean-guile: clean-guile
 
-clean-libgui: 
+clean-guile: 
        @: $(MAKE); $(unstage)
-       @[ -f ./libgui/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       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}" \
@@ -29934,24 +27316,24 @@ clean-libgui:
                  clean) \
          || exit 1
 
-@endif libgui
+@endif guile
 
-.PHONY: maybe-distclean-libgui distclean-libgui
-maybe-distclean-libgui:
-@if libgui
-maybe-distclean-libgui: distclean-libgui
+.PHONY: maybe-distclean-guile distclean-guile
+maybe-distclean-guile:
+@if guile
+maybe-distclean-guile: distclean-guile
 
-distclean-libgui: 
+distclean-guile: 
        @: $(MAKE); $(unstage)
-       @[ -f ./libgui/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       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}" \
@@ -29959,24 +27341,24 @@ distclean-libgui:
                  distclean) \
          || exit 1
 
-@endif libgui
+@endif guile
 
-.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-guile maintainer-clean-guile
+maybe-maintainer-clean-guile:
+@if guile
+maybe-maintainer-clean-guile: maintainer-clean-guile
 
-maintainer-clean-libgui: 
+maintainer-clean-guile: 
        @: $(MAKE); $(unstage)
-       @[ -f ./libgui/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 libgui" ; \
-       (cd $(HOST_SUBDIR)/libgui && \
+       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}" \
@@ -29984,587 +27366,128 @@ maintainer-clean-libgui:
                  maintainer-clean) \
          || exit 1
 
-@endif libgui
+@endif guile
 
 
 
-.PHONY: configure-libiberty maybe-configure-libiberty
-maybe-configure-libiberty:
+.PHONY: configure-tk maybe-configure-tk
+maybe-configure-tk:
 @if gcc-bootstrap
-configure-libiberty: stage_current
+configure-tk: stage_current
 @endif gcc-bootstrap
-@if libiberty
-maybe-configure-libiberty: configure-libiberty
-configure-libiberty: 
+@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)/libiberty/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
+       test ! -f $(HOST_SUBDIR)/tk/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tk ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/libiberty; \
-       cd "$(HOST_SUBDIR)/libiberty" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/tk; \
+       cd "$(HOST_SUBDIR)/tk" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/tk/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
+       srcdiroption="--srcdir=$${topdir}/tk"; \
+       libsrcdir="$$s/tk"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} @extra_host_libiberty_configure_flags@ \
+         --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif libiberty
+@endif tk
 
 
 
-.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
+
+
+.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)
        @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) \
-       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; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         $(STAGE1_CONFIGURE_FLAGS) \
-         @extra_host_libiberty_configure_flags@
-@endif libiberty-bootstrap
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/tk && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+               $(TARGET-tk))
+@endif tk
 
-.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
+
+
+
+.PHONY: check-tk maybe-check-tk
+maybe-check-tk:
+@if tk
+maybe-check-tk: check-tk
+
+check-tk:
+       @: $(MAKE); $(unstage)
        @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) \
-       $(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; \
-       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_CONFIGURE_FLAGS) \
-         @extra_host_libiberty_configure_flags@
-@endif libiberty-bootstrap
+       (cd $(HOST_SUBDIR)/tk && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
 
-.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
+@endif tk
+
+.PHONY: install-tk maybe-install-tk
+maybe-install-tk:
+@if tk
+maybe-install-tk: install-tk
+
+install-tk: installdirs
+       @: $(MAKE); $(unstage)
        @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) \
-       $(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; \
-       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) \
-         $(STAGE3_CONFIGURE_FLAGS) \
-         @extra_host_libiberty_configure_flags@
-@endif libiberty-bootstrap
+       (cd $(HOST_SUBDIR)/tk && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-.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
+@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; \
-       TFLAGS="$(STAGE4_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/libiberty/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 ; \
-       $(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) \
-         $(STAGE4_CONFIGURE_FLAGS) \
-         @extra_host_libiberty_configure_flags@
-@endif libiberty-bootstrap
+       (cd $(HOST_SUBDIR)/tk && \
+         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-.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) \
-       $(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; \
-       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) \
-         $(STAGEprofile_CONFIGURE_FLAGS) \
-         @extra_host_libiberty_configure_flags@
-@endif libiberty-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:
-       @[ $(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) \
-       $(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; \
-       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) \
-         $(STAGEfeedback_CONFIGURE_FLAGS) \
-         @extra_host_libiberty_configure_flags@
-@endif libiberty-bootstrap
-
-
-
-
-
-.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)  \
-               $(TARGET-libiberty))
-@endif libiberty
-
-
-
-.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; \
-       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)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
-               $(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; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
-       $(HOST_EXPORTS) \
-       $(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)
-
-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: 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) \
-       $(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)
-
-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: 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) \
-       $(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)
-
-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: 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) \
-       $(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: 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; \
-       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       $(HOST_EXPORTS) \
-       $(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: 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)/libiberty && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif libiberty
-
-.PHONY: install-libiberty maybe-install-libiberty
-maybe-install-libiberty:
-@if libiberty
-maybe-install-libiberty: install-libiberty
-
-install-libiberty: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libiberty && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif libiberty
-
-.PHONY: install-strip-libiberty maybe-install-strip-libiberty
-maybe-install-strip-libiberty:
-@if libiberty
-maybe-install-strip-libiberty: install-strip-libiberty
-
-install-strip-libiberty: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libiberty && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif libiberty
+@endif tk
 
 # 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-tk info-tk
+maybe-info-tk:
+@if tk
+maybe-info-tk: info-tk
 
-info-libiberty: \
-    configure-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+info-tk: \
+    configure-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) ; 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 tk" ; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30572,24 +27495,25 @@ info-libiberty: \
                  info) \
          || exit 1
 
-@endif libiberty
+@endif tk
 
-.PHONY: maybe-dvi-libiberty dvi-libiberty
-maybe-dvi-libiberty:
-@if libiberty
-maybe-dvi-libiberty: dvi-libiberty
+.PHONY: maybe-dvi-tk dvi-tk
+maybe-dvi-tk:
+@if tk
+maybe-dvi-tk: dvi-tk
 
-dvi-libiberty: \
-    configure-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+dvi-tk: \
+    configure-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) ; 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 tk" ; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30597,24 +27521,25 @@ dvi-libiberty: \
                  dvi) \
          || exit 1
 
-@endif libiberty
+@endif tk
 
-.PHONY: maybe-pdf-libiberty pdf-libiberty
-maybe-pdf-libiberty:
-@if libiberty
-maybe-pdf-libiberty: pdf-libiberty
+.PHONY: maybe-pdf-tk pdf-tk
+maybe-pdf-tk:
+@if tk
+maybe-pdf-tk: pdf-tk
 
-pdf-libiberty: \
-    configure-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+pdf-tk: \
+    configure-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) ; 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 tk" ; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30622,24 +27547,25 @@ pdf-libiberty: \
                  pdf) \
          || exit 1
 
-@endif libiberty
+@endif tk
 
-.PHONY: maybe-html-libiberty html-libiberty
-maybe-html-libiberty:
-@if libiberty
-maybe-html-libiberty: html-libiberty
+.PHONY: maybe-html-tk html-tk
+maybe-html-tk:
+@if tk
+maybe-html-tk: html-tk
 
-html-libiberty: \
-    configure-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+html-tk: \
+    configure-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) ; 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 tk" ; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30647,24 +27573,25 @@ html-libiberty: \
                  html) \
          || exit 1
 
-@endif libiberty
+@endif tk
 
-.PHONY: maybe-TAGS-libiberty TAGS-libiberty
-maybe-TAGS-libiberty:
-@if libiberty
-maybe-TAGS-libiberty: TAGS-libiberty
+.PHONY: maybe-TAGS-tk TAGS-tk
+maybe-TAGS-tk:
+@if tk
+maybe-TAGS-tk: TAGS-tk
 
-TAGS-libiberty: \
-    configure-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+TAGS-tk: \
+    configure-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) ; 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 tk" ; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30672,25 +27599,26 @@ TAGS-libiberty: \
                  TAGS) \
          || exit 1
 
-@endif libiberty
+@endif tk
 
-.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-tk install-info-tk
+maybe-install-info-tk:
+@if tk
+maybe-install-info-tk: install-info-tk
 
-install-info-libiberty: \
-    configure-libiberty \
-    info-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+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) ; 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 tk" ; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30698,25 +27626,26 @@ install-info-libiberty: \
                  install-info) \
          || exit 1
 
-@endif libiberty
+@endif tk
 
-.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-tk install-pdf-tk
+maybe-install-pdf-tk:
+@if tk
+maybe-install-pdf-tk: install-pdf-tk
 
-install-pdf-libiberty: \
-    configure-libiberty \
-    pdf-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+install-pdf-tk: \
+    configure-tk \
+    pdf-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) ; 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 tk" ; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30724,25 +27653,26 @@ install-pdf-libiberty: \
                  install-pdf) \
          || exit 1
 
-@endif libiberty
+@endif tk
 
-.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-tk install-html-tk
+maybe-install-html-tk:
+@if tk
+maybe-install-html-tk: install-html-tk
 
-install-html-libiberty: \
-    configure-libiberty \
-    html-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+install-html-tk: \
+    configure-tk \
+    html-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) ; 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 tk" ; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30750,24 +27680,25 @@ install-html-libiberty: \
                  install-html) \
          || exit 1
 
-@endif libiberty
+@endif tk
 
-.PHONY: maybe-installcheck-libiberty installcheck-libiberty
-maybe-installcheck-libiberty:
-@if libiberty
-maybe-installcheck-libiberty: installcheck-libiberty
+.PHONY: maybe-installcheck-tk installcheck-tk
+maybe-installcheck-tk:
+@if tk
+maybe-installcheck-tk: installcheck-tk
 
-installcheck-libiberty: \
-    configure-libiberty 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+installcheck-tk: \
+    configure-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) ; 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 tk" ; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30775,23 +27706,24 @@ installcheck-libiberty: \
                  installcheck) \
          || exit 1
 
-@endif libiberty
+@endif tk
 
-.PHONY: maybe-mostlyclean-libiberty mostlyclean-libiberty
-maybe-mostlyclean-libiberty:
-@if libiberty
-maybe-mostlyclean-libiberty: mostlyclean-libiberty
+.PHONY: maybe-mostlyclean-tk mostlyclean-tk
+maybe-mostlyclean-tk:
+@if tk
+maybe-mostlyclean-tk: mostlyclean-tk
 
-mostlyclean-libiberty: 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+mostlyclean-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) ; 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 tk" ; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30799,23 +27731,24 @@ mostlyclean-libiberty:
                  mostlyclean) \
          || exit 1
 
-@endif libiberty
+@endif tk
 
-.PHONY: maybe-clean-libiberty clean-libiberty
-maybe-clean-libiberty:
-@if libiberty
-maybe-clean-libiberty: clean-libiberty
+.PHONY: maybe-clean-tk clean-tk
+maybe-clean-tk:
+@if tk
+maybe-clean-tk: clean-tk
 
-clean-libiberty: 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+clean-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) ; 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 tk" ; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30823,23 +27756,24 @@ clean-libiberty:
                  clean) \
          || exit 1
 
-@endif libiberty
+@endif tk
 
-.PHONY: maybe-distclean-libiberty distclean-libiberty
-maybe-distclean-libiberty:
-@if libiberty
-maybe-distclean-libiberty: distclean-libiberty
+.PHONY: maybe-distclean-tk distclean-tk
+maybe-distclean-tk:
+@if tk
+maybe-distclean-tk: distclean-tk
 
-distclean-libiberty: 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+distclean-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) ; 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 tk" ; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30847,23 +27781,24 @@ distclean-libiberty:
                  distclean) \
          || exit 1
 
-@endif libiberty
+@endif tk
 
-.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-tk maintainer-clean-tk
+maybe-maintainer-clean-tk:
+@if tk
+maybe-maintainer-clean-tk: maintainer-clean-tk
 
-maintainer-clean-libiberty: 
-       @[ -f ./libiberty/Makefile ] || exit 0; \
+maintainer-clean-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) ; 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 tk" ; \
+       (cd $(HOST_SUBDIR)/tk && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -30871,116 +27806,122 @@ maintainer-clean-libiberty:
                  maintainer-clean) \
          || exit 1
 
-@endif libiberty
+@endif tk
 
 
 
-.PHONY: configure-libiconv maybe-configure-libiconv
-maybe-configure-libiconv:
+.PHONY: configure-libtermcap maybe-configure-libtermcap
+maybe-configure-libtermcap:
 @if gcc-bootstrap
-configure-libiconv: stage_current
+configure-libtermcap: stage_current
 @endif gcc-bootstrap
-@if libiconv
-maybe-configure-libiconv: configure-libiconv
-configure-libiconv: 
+@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)/libiconv/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv ; \
+       test ! -f $(HOST_SUBDIR)/libtermcap/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtermcap ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/libiconv; \
-       cd "$(HOST_SUBDIR)/libiconv" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/libtermcap; \
+       cd "$(HOST_SUBDIR)/libtermcap" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/libtermcap/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libiconv"; \
-       libsrcdir="$$s/libiconv"; \
+       srcdiroption="--srcdir=$${topdir}/libtermcap"; \
+       libsrcdir="$$s/libtermcap"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} --disable-shared \
+         --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif libiconv
+@endif libtermcap
 
 
 
 
 
-.PHONY: all-libiconv maybe-all-libiconv
-maybe-all-libiconv:
+.PHONY: all-libtermcap maybe-all-libtermcap
+maybe-all-libtermcap:
 @if gcc-bootstrap
-all-libiconv: stage_current
+all-libtermcap: stage_current
 @endif gcc-bootstrap
-@if libiconv
-TARGET-libiconv=all
-maybe-all-libiconv: all-libiconv
-all-libiconv: configure-libiconv
+@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)/libiconv && \
+       (cd $(HOST_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-libiconv))
-@endif libiconv
+               $(TARGET-libtermcap))
+@endif libtermcap
 
 
 
 
-.PHONY: check-libiconv maybe-check-libiconv
-maybe-check-libiconv:
-@if libiconv
-maybe-check-libiconv: check-libiconv
+.PHONY: check-libtermcap maybe-check-libtermcap
+maybe-check-libtermcap:
+@if libtermcap
+maybe-check-libtermcap: check-libtermcap
 
-check-libiconv:
+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)/libiconv && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif libiconv
-
-.PHONY: install-libiconv maybe-install-libiconv
-maybe-install-libiconv:
-@if libiconv
-maybe-install-libiconv: install-libiconv
-
-install-libiconv:
+       (cd $(HOST_SUBDIR)/libtermcap && \
+         $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif libiconv
+@endif libtermcap
 
-.PHONY: install-strip-libiconv maybe-install-strip-libiconv
-maybe-install-strip-libiconv:
-@if libiconv
-maybe-install-strip-libiconv: install-strip-libiconv
+.PHONY: install-strip-libtermcap maybe-install-strip-libtermcap
+maybe-install-strip-libtermcap:
+@if libtermcap
+maybe-install-strip-libtermcap: install-strip-libtermcap
 
-install-strip-libiconv:
+install-strip-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-strip)
 
-@endif libiconv
+@endif libtermcap
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-libiconv info-libiconv
-maybe-info-libiconv:
-@if libiconv
-maybe-info-libiconv: info-libiconv
+.PHONY: maybe-info-libtermcap info-libtermcap
+maybe-info-libtermcap:
+@if libtermcap
+maybe-info-libtermcap: info-libtermcap
 
-info-libiconv: \
-    configure-libiconv 
+info-libtermcap: \
+    configure-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/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 libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
+       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}" \
@@ -30988,25 +27929,25 @@ info-libiconv: \
                  info) \
          || exit 1
 
-@endif libiconv
+@endif libtermcap
 
-.PHONY: maybe-dvi-libiconv dvi-libiconv
-maybe-dvi-libiconv:
-@if libiconv
-maybe-dvi-libiconv: dvi-libiconv
+.PHONY: maybe-dvi-libtermcap dvi-libtermcap
+maybe-dvi-libtermcap:
+@if libtermcap
+maybe-dvi-libtermcap: dvi-libtermcap
 
-dvi-libiconv: \
-    configure-libiconv 
+dvi-libtermcap: \
+    configure-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/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 libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
+       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}" \
@@ -31014,25 +27955,25 @@ dvi-libiconv: \
                  dvi) \
          || exit 1
 
-@endif libiconv
+@endif libtermcap
 
-.PHONY: maybe-pdf-libiconv pdf-libiconv
-maybe-pdf-libiconv:
-@if libiconv
-maybe-pdf-libiconv: pdf-libiconv
+.PHONY: maybe-pdf-libtermcap pdf-libtermcap
+maybe-pdf-libtermcap:
+@if libtermcap
+maybe-pdf-libtermcap: pdf-libtermcap
 
-pdf-libiconv: \
-    configure-libiconv 
+pdf-libtermcap: \
+    configure-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/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 libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
+       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}" \
@@ -31040,25 +27981,25 @@ pdf-libiconv: \
                  pdf) \
          || exit 1
 
-@endif libiconv
+@endif libtermcap
 
-.PHONY: maybe-html-libiconv html-libiconv
-maybe-html-libiconv:
-@if libiconv
-maybe-html-libiconv: html-libiconv
+.PHONY: maybe-html-libtermcap html-libtermcap
+maybe-html-libtermcap:
+@if libtermcap
+maybe-html-libtermcap: html-libtermcap
 
-html-libiconv: \
-    configure-libiconv 
+html-libtermcap: \
+    configure-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/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 libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
+       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}" \
@@ -31066,25 +28007,25 @@ html-libiconv: \
                  html) \
          || exit 1
 
-@endif libiconv
+@endif libtermcap
 
-.PHONY: maybe-TAGS-libiconv TAGS-libiconv
-maybe-TAGS-libiconv:
-@if libiconv
-maybe-TAGS-libiconv: TAGS-libiconv
+.PHONY: maybe-TAGS-libtermcap TAGS-libtermcap
+maybe-TAGS-libtermcap:
+@if libtermcap
+maybe-TAGS-libtermcap: TAGS-libtermcap
 
-TAGS-libiconv: \
-    configure-libiconv 
+TAGS-libtermcap: \
+    configure-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/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 libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
+       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}" \
@@ -31092,284 +28033,269 @@ TAGS-libiconv: \
                  TAGS) \
          || exit 1
 
-@endif libiconv
-
-.PHONY: maybe-install-info-libiconv install-info-libiconv
-maybe-install-info-libiconv:
-@if libiconv
-maybe-install-info-libiconv: install-info-libiconv
-
-# libiconv doesn't support install-info.
-install-info-libiconv:
-
-@endif libiconv
-
-.PHONY: maybe-install-pdf-libiconv install-pdf-libiconv
-maybe-install-pdf-libiconv:
-@if libiconv
-maybe-install-pdf-libiconv: install-pdf-libiconv
-
-# libiconv doesn't support install-pdf.
-install-pdf-libiconv:
-
-@endif libiconv
-
-.PHONY: maybe-install-html-libiconv install-html-libiconv
-maybe-install-html-libiconv:
-@if libiconv
-maybe-install-html-libiconv: install-html-libiconv
-
-# libiconv doesn't support install-html.
-install-html-libiconv:
-
-@endif libiconv
+@endif libtermcap
 
-.PHONY: maybe-installcheck-libiconv installcheck-libiconv
-maybe-installcheck-libiconv:
-@if libiconv
-maybe-installcheck-libiconv: installcheck-libiconv
+.PHONY: maybe-install-info-libtermcap install-info-libtermcap
+maybe-install-info-libtermcap:
+@if libtermcap
+maybe-install-info-libtermcap: install-info-libtermcap
 
-installcheck-libiconv: \
-    configure-libiconv 
+install-info-libtermcap: \
+    configure-libtermcap \
+    info-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/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 libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 installcheck) \
+                 install-info) \
          || exit 1
 
-@endif libiconv
+@endif libtermcap
 
-.PHONY: maybe-mostlyclean-libiconv mostlyclean-libiconv
-maybe-mostlyclean-libiconv:
-@if libiconv
-maybe-mostlyclean-libiconv: mostlyclean-libiconv
+.PHONY: maybe-install-pdf-libtermcap install-pdf-libtermcap
+maybe-install-pdf-libtermcap:
+@if libtermcap
+maybe-install-pdf-libtermcap: install-pdf-libtermcap
 
-mostlyclean-libiconv: 
+install-pdf-libtermcap: \
+    configure-libtermcap \
+    pdf-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/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 mostlyclean in libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 mostlyclean) \
+                 install-pdf) \
          || exit 1
 
-@endif libiconv
+@endif libtermcap
 
-.PHONY: maybe-clean-libiconv clean-libiconv
-maybe-clean-libiconv:
-@if libiconv
-maybe-clean-libiconv: clean-libiconv
+.PHONY: maybe-install-html-libtermcap install-html-libtermcap
+maybe-install-html-libtermcap:
+@if libtermcap
+maybe-install-html-libtermcap: install-html-libtermcap
 
-clean-libiconv: 
+install-html-libtermcap: \
+    configure-libtermcap \
+    html-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/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 clean in libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 clean) \
+                 install-html) \
          || exit 1
 
-@endif libiconv
+@endif libtermcap
 
-.PHONY: maybe-distclean-libiconv distclean-libiconv
-maybe-distclean-libiconv:
-@if libiconv
-maybe-distclean-libiconv: distclean-libiconv
+.PHONY: maybe-installcheck-libtermcap installcheck-libtermcap
+maybe-installcheck-libtermcap:
+@if libtermcap
+maybe-installcheck-libtermcap: installcheck-libtermcap
 
-distclean-libiconv: 
+installcheck-libtermcap: \
+    configure-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/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 distclean in libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
+       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}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 distclean) \
+                 installcheck) \
          || exit 1
 
-@endif libiconv
+@endif libtermcap
 
-.PHONY: maybe-maintainer-clean-libiconv maintainer-clean-libiconv
-maybe-maintainer-clean-libiconv:
-@if libiconv
-maybe-maintainer-clean-libiconv: maintainer-clean-libiconv
+.PHONY: maybe-mostlyclean-libtermcap mostlyclean-libtermcap
+maybe-mostlyclean-libtermcap:
+@if libtermcap
+maybe-mostlyclean-libtermcap: mostlyclean-libtermcap
 
-maintainer-clean-libiconv: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./libiconv/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing maintainer-clean in libiconv" ; \
-       (cd $(HOST_SUBDIR)/libiconv && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 maintainer-clean) \
-         || exit 1
+# libtermcap doesn't support mostlyclean.
+mostlyclean-libtermcap:
 
-@endif libiconv
+@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:
 
-.PHONY: configure-libtool maybe-configure-libtool
-maybe-configure-libtool:
-@if gcc-bootstrap
-configure-libtool: stage_current
-@endif gcc-bootstrap
-@if libtool
-maybe-configure-libtool: configure-libtool
-configure-libtool: 
-       @: $(MAKE); $(unstage)
+@endif libtermcap
+
+.PHONY: maybe-distclean-libtermcap distclean-libtermcap
+maybe-distclean-libtermcap:
+@if libtermcap
+maybe-distclean-libtermcap: distclean-libtermcap
+
+# 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-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)
        @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 ; \
+       test ! -f $(HOST_SUBDIR)/utils/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/utils ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/libtool; \
-       cd "$(HOST_SUBDIR)/libtool" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/utils; \
+       cd "$(HOST_SUBDIR)/utils" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/libtool/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/utils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libtool"; \
-       libsrcdir="$$s/libtool"; \
+       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 libtool
+@endif utils
 
 
 
 
 
-.PHONY: all-libtool maybe-all-libtool
-maybe-all-libtool:
+.PHONY: all-utils maybe-all-utils
+maybe-all-utils:
 @if gcc-bootstrap
-all-libtool: stage_current
+all-utils: stage_current
 @endif gcc-bootstrap
-@if libtool
-TARGET-libtool=all
-maybe-all-libtool: all-libtool
-all-libtool: configure-libtool
+@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)/libtool && \
+       (cd $(HOST_SUBDIR)/utils && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-libtool))
-@endif libtool
+               $(TARGET-utils))
+@endif utils
 
 
 
 
-.PHONY: check-libtool maybe-check-libtool
-maybe-check-libtool:
-@if libtool
-maybe-check-libtool: check-libtool
+.PHONY: check-utils maybe-check-utils
+maybe-check-utils:
+@if utils
+maybe-check-utils: check-utils
 
-check-libtool:
-       @: $(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)
+check-utils:
 
-@endif libtool
+@endif utils
 
-.PHONY: install-libtool maybe-install-libtool
-maybe-install-libtool:
-@if libtool
-maybe-install-libtool: install-libtool
+.PHONY: install-utils maybe-install-utils
+maybe-install-utils:
+@if utils
+maybe-install-utils: install-utils
 
-install-libtool: installdirs
+install-utils: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libtool && \
+       (cd $(HOST_SUBDIR)/utils && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif libtool
+@endif utils
 
-.PHONY: install-strip-libtool maybe-install-strip-libtool
-maybe-install-strip-libtool:
-@if libtool
-maybe-install-strip-libtool: install-strip-libtool
+.PHONY: install-strip-utils maybe-install-strip-utils
+maybe-install-strip-utils:
+@if utils
+maybe-install-strip-utils: install-strip-utils
 
-install-strip-libtool: installdirs
+install-strip-utils: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/libtool && \
+       (cd $(HOST_SUBDIR)/utils && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif libtool
+@endif utils
 
 # 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-utils info-utils
+maybe-info-utils:
+@if utils
+maybe-info-utils: info-utils
 
-info-libtool: \
-    configure-libtool 
+info-utils: \
+    configure-utils 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/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 libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       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}" \
@@ -31377,25 +28303,25 @@ info-libtool: \
                  info) \
          || exit 1
 
-@endif libtool
+@endif utils
 
-.PHONY: maybe-dvi-libtool dvi-libtool
-maybe-dvi-libtool:
-@if libtool
-maybe-dvi-libtool: dvi-libtool
+.PHONY: maybe-dvi-utils dvi-utils
+maybe-dvi-utils:
+@if utils
+maybe-dvi-utils: dvi-utils
 
-dvi-libtool: \
-    configure-libtool 
+dvi-utils: \
+    configure-utils 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/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 libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       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}" \
@@ -31403,25 +28329,25 @@ dvi-libtool: \
                  dvi) \
          || exit 1
 
-@endif libtool
+@endif utils
 
-.PHONY: maybe-pdf-libtool pdf-libtool
-maybe-pdf-libtool:
-@if libtool
-maybe-pdf-libtool: pdf-libtool
+.PHONY: maybe-pdf-utils pdf-utils
+maybe-pdf-utils:
+@if utils
+maybe-pdf-utils: pdf-utils
 
-pdf-libtool: \
-    configure-libtool 
+pdf-utils: \
+    configure-utils 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/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 libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       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}" \
@@ -31429,25 +28355,25 @@ pdf-libtool: \
                  pdf) \
          || exit 1
 
-@endif libtool
+@endif utils
 
-.PHONY: maybe-html-libtool html-libtool
-maybe-html-libtool:
-@if libtool
-maybe-html-libtool: html-libtool
+.PHONY: maybe-html-utils html-utils
+maybe-html-utils:
+@if utils
+maybe-html-utils: html-utils
 
-html-libtool: \
-    configure-libtool 
+html-utils: \
+    configure-utils 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/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 libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       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}" \
@@ -31455,25 +28381,25 @@ html-libtool: \
                  html) \
          || exit 1
 
-@endif libtool
+@endif utils
 
-.PHONY: maybe-TAGS-libtool TAGS-libtool
-maybe-TAGS-libtool:
-@if libtool
-maybe-TAGS-libtool: TAGS-libtool
+.PHONY: maybe-TAGS-utils TAGS-utils
+maybe-TAGS-utils:
+@if utils
+maybe-TAGS-utils: TAGS-utils
 
-TAGS-libtool: \
-    configure-libtool 
+TAGS-utils: \
+    configure-utils 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/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 libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       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}" \
@@ -31481,26 +28407,26 @@ TAGS-libtool: \
                  TAGS) \
          || exit 1
 
-@endif libtool
+@endif utils
 
-.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-utils install-info-utils
+maybe-install-info-utils:
+@if utils
+maybe-install-info-utils: install-info-utils
 
-install-info-libtool: \
-    configure-libtool \
-    info-libtool 
+install-info-utils: \
+    configure-utils \
+    info-utils 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/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 libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       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}" \
@@ -31508,26 +28434,26 @@ install-info-libtool: \
                  install-info) \
          || exit 1
 
-@endif libtool
+@endif utils
 
-.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-utils install-pdf-utils
+maybe-install-pdf-utils:
+@if utils
+maybe-install-pdf-utils: install-pdf-utils
 
-install-pdf-libtool: \
-    configure-libtool \
-    pdf-libtool 
+install-pdf-utils: \
+    configure-utils \
+    pdf-utils 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/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 libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       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}" \
@@ -31535,26 +28461,26 @@ install-pdf-libtool: \
                  install-pdf) \
          || exit 1
 
-@endif libtool
+@endif utils
 
-.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-utils install-html-utils
+maybe-install-html-utils:
+@if utils
+maybe-install-html-utils: install-html-utils
 
-install-html-libtool: \
-    configure-libtool \
-    html-libtool 
+install-html-utils: \
+    configure-utils \
+    html-utils 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/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 libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       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}" \
@@ -31562,25 +28488,25 @@ install-html-libtool: \
                  install-html) \
          || exit 1
 
-@endif libtool
+@endif utils
 
-.PHONY: maybe-installcheck-libtool installcheck-libtool
-maybe-installcheck-libtool:
-@if libtool
-maybe-installcheck-libtool: installcheck-libtool
+.PHONY: maybe-installcheck-utils installcheck-utils
+maybe-installcheck-utils:
+@if utils
+maybe-installcheck-utils: installcheck-utils
 
-installcheck-libtool: \
-    configure-libtool 
+installcheck-utils: \
+    configure-utils 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/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 libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       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}" \
@@ -31588,24 +28514,24 @@ installcheck-libtool: \
                  installcheck) \
          || exit 1
 
-@endif libtool
+@endif utils
 
-.PHONY: maybe-mostlyclean-libtool mostlyclean-libtool
-maybe-mostlyclean-libtool:
-@if libtool
-maybe-mostlyclean-libtool: mostlyclean-libtool
+.PHONY: maybe-mostlyclean-utils mostlyclean-utils
+maybe-mostlyclean-utils:
+@if utils
+maybe-mostlyclean-utils: mostlyclean-utils
 
-mostlyclean-libtool: 
+mostlyclean-utils: 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/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 libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       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}" \
@@ -31613,24 +28539,24 @@ mostlyclean-libtool:
                  mostlyclean) \
          || exit 1
 
-@endif libtool
+@endif utils
 
-.PHONY: maybe-clean-libtool clean-libtool
-maybe-clean-libtool:
-@if libtool
-maybe-clean-libtool: clean-libtool
+.PHONY: maybe-clean-utils clean-utils
+maybe-clean-utils:
+@if utils
+maybe-clean-utils: clean-utils
 
-clean-libtool: 
+clean-utils: 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/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 libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       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}" \
@@ -31638,24 +28564,24 @@ clean-libtool:
                  clean) \
          || exit 1
 
-@endif libtool
+@endif utils
 
-.PHONY: maybe-distclean-libtool distclean-libtool
-maybe-distclean-libtool:
-@if libtool
-maybe-distclean-libtool: distclean-libtool
+.PHONY: maybe-distclean-utils distclean-utils
+maybe-distclean-utils:
+@if utils
+maybe-distclean-utils: distclean-utils
 
-distclean-libtool: 
+distclean-utils: 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/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 libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       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}" \
@@ -31663,24 +28589,24 @@ distclean-libtool:
                  distclean) \
          || exit 1
 
-@endif libtool
+@endif utils
 
-.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-utils maintainer-clean-utils
+maybe-maintainer-clean-utils:
+@if utils
+maybe-maintainer-clean-utils: maintainer-clean-utils
 
-maintainer-clean-libtool: 
+maintainer-clean-utils: 
        @: $(MAKE); $(unstage)
-       @[ -f ./libtool/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 libtool" ; \
-       (cd $(HOST_SUBDIR)/libtool && \
+       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}" \
@@ -31688,128 +28614,128 @@ maintainer-clean-libtool:
                  maintainer-clean) \
          || exit 1
 
-@endif libtool
+@endif utils
 
 
 
-.PHONY: configure-m4 maybe-configure-m4
-maybe-configure-m4:
+.PHONY: configure-gnattools maybe-configure-gnattools
+maybe-configure-gnattools:
 @if gcc-bootstrap
-configure-m4: stage_current
+configure-gnattools: stage_current
 @endif gcc-bootstrap
-@if m4
-maybe-configure-m4: configure-m4
-configure-m4: 
+@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)/m4/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/m4 ; \
+       test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/m4; \
-       cd "$(HOST_SUBDIR)/m4" || exit 1; \
+       echo Configuring in $(HOST_SUBDIR)/gnattools; \
+       cd "$(HOST_SUBDIR)/gnattools" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/m4/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/gnattools/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/m4"; \
-       libsrcdir="$$s/m4"; \
+       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 m4
+@endif gnattools
 
 
 
 
 
-.PHONY: all-m4 maybe-all-m4
-maybe-all-m4:
+.PHONY: all-gnattools maybe-all-gnattools
+maybe-all-gnattools:
 @if gcc-bootstrap
-all-m4: stage_current
+all-gnattools: stage_current
 @endif gcc-bootstrap
-@if m4
-TARGET-m4=all
-maybe-all-m4: all-m4
-all-m4: configure-m4
+@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)/m4 && \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-m4))
-@endif m4
+               $(TARGET-gnattools))
+@endif gnattools
 
 
 
 
-.PHONY: check-m4 maybe-check-m4
-maybe-check-m4:
-@if m4
-maybe-check-m4: check-m4
+.PHONY: check-gnattools maybe-check-gnattools
+maybe-check-gnattools:
+@if gnattools
+maybe-check-gnattools: check-gnattools
 
-check-m4:
+check-gnattools:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/m4 && \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif m4
+@endif gnattools
 
-.PHONY: install-m4 maybe-install-m4
-maybe-install-m4:
-@if m4
-maybe-install-m4: install-m4
+.PHONY: install-gnattools maybe-install-gnattools
+maybe-install-gnattools:
+@if gnattools
+maybe-install-gnattools: install-gnattools
 
-install-m4: installdirs
+install-gnattools: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/m4 && \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif m4
+@endif gnattools
 
-.PHONY: install-strip-m4 maybe-install-strip-m4
-maybe-install-strip-m4:
-@if m4
-maybe-install-strip-m4: install-strip-m4
+.PHONY: install-strip-gnattools maybe-install-strip-gnattools
+maybe-install-strip-gnattools:
+@if gnattools
+maybe-install-strip-gnattools: install-strip-gnattools
 
-install-strip-m4: installdirs
+install-strip-gnattools: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/m4 && \
+       (cd $(HOST_SUBDIR)/gnattools && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif m4
+@endif gnattools
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-m4 info-m4
-maybe-info-m4:
-@if m4
-maybe-info-m4: info-m4
+.PHONY: maybe-info-gnattools info-gnattools
+maybe-info-gnattools:
+@if gnattools
+maybe-info-gnattools: info-gnattools
 
-info-m4: \
-    configure-m4 
+info-gnattools: \
+    configure-gnattools 
        @: $(MAKE); $(unstage)
-       @[ -f ./m4/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 m4" ; \
-       (cd $(HOST_SUBDIR)/m4 && \
+       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}" \
@@ -31817,25 +28743,25 @@ info-m4: \
                  info) \
          || exit 1
 
-@endif m4
+@endif gnattools
 
-.PHONY: maybe-dvi-m4 dvi-m4
-maybe-dvi-m4:
-@if m4
-maybe-dvi-m4: dvi-m4
+.PHONY: maybe-dvi-gnattools dvi-gnattools
+maybe-dvi-gnattools:
+@if gnattools
+maybe-dvi-gnattools: dvi-gnattools
 
-dvi-m4: \
-    configure-m4 
+dvi-gnattools: \
+    configure-gnattools 
        @: $(MAKE); $(unstage)
-       @[ -f ./m4/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 m4" ; \
-       (cd $(HOST_SUBDIR)/m4 && \
+       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}" \
@@ -31843,25 +28769,25 @@ dvi-m4: \
                  dvi) \
          || exit 1
 
-@endif m4
+@endif gnattools
 
-.PHONY: maybe-pdf-m4 pdf-m4
-maybe-pdf-m4:
-@if m4
-maybe-pdf-m4: pdf-m4
+.PHONY: maybe-pdf-gnattools pdf-gnattools
+maybe-pdf-gnattools:
+@if gnattools
+maybe-pdf-gnattools: pdf-gnattools
 
-pdf-m4: \
-    configure-m4 
+pdf-gnattools: \
+    configure-gnattools 
        @: $(MAKE); $(unstage)
-       @[ -f ./m4/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 m4" ; \
-       (cd $(HOST_SUBDIR)/m4 && \
+       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}" \
@@ -31869,25 +28795,25 @@ pdf-m4: \
                  pdf) \
          || exit 1
 
-@endif m4
+@endif gnattools
 
-.PHONY: maybe-html-m4 html-m4
-maybe-html-m4:
-@if m4
-maybe-html-m4: html-m4
+.PHONY: maybe-html-gnattools html-gnattools
+maybe-html-gnattools:
+@if gnattools
+maybe-html-gnattools: html-gnattools
 
-html-m4: \
-    configure-m4 
+html-gnattools: \
+    configure-gnattools 
        @: $(MAKE); $(unstage)
-       @[ -f ./m4/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 m4" ; \
-       (cd $(HOST_SUBDIR)/m4 && \
+       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}" \
@@ -31895,25 +28821,25 @@ html-m4: \
                  html) \
          || exit 1
 
-@endif m4
+@endif gnattools
 
-.PHONY: maybe-TAGS-m4 TAGS-m4
-maybe-TAGS-m4:
-@if m4
-maybe-TAGS-m4: TAGS-m4
+.PHONY: maybe-TAGS-gnattools TAGS-gnattools
+maybe-TAGS-gnattools:
+@if gnattools
+maybe-TAGS-gnattools: TAGS-gnattools
 
-TAGS-m4: \
-    configure-m4 
+TAGS-gnattools: \
+    configure-gnattools 
        @: $(MAKE); $(unstage)
-       @[ -f ./m4/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 m4" ; \
-       (cd $(HOST_SUBDIR)/m4 && \
+       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}" \
@@ -31921,26 +28847,26 @@ TAGS-m4: \
                  TAGS) \
          || exit 1
 
-@endif m4
+@endif gnattools
 
-.PHONY: maybe-install-info-m4 install-info-m4
-maybe-install-info-m4:
-@if m4
-maybe-install-info-m4: install-info-m4
+.PHONY: maybe-install-info-gnattools install-info-gnattools
+maybe-install-info-gnattools:
+@if gnattools
+maybe-install-info-gnattools: install-info-gnattools
 
-install-info-m4: \
-    configure-m4 \
-    info-m4 
+install-info-gnattools: \
+    configure-gnattools \
+    info-gnattools 
        @: $(MAKE); $(unstage)
-       @[ -f ./m4/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 m4" ; \
-       (cd $(HOST_SUBDIR)/m4 && \
+       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}" \
@@ -31948,26 +28874,26 @@ install-info-m4: \
                  install-info) \
          || exit 1
 
-@endif m4
+@endif gnattools
 
-.PHONY: maybe-install-pdf-m4 install-pdf-m4
-maybe-install-pdf-m4:
-@if m4
-maybe-install-pdf-m4: install-pdf-m4
+.PHONY: maybe-install-pdf-gnattools install-pdf-gnattools
+maybe-install-pdf-gnattools:
+@if gnattools
+maybe-install-pdf-gnattools: install-pdf-gnattools
 
-install-pdf-m4: \
-    configure-m4 \
-    pdf-m4 
+install-pdf-gnattools: \
+    configure-gnattools \
+    pdf-gnattools 
        @: $(MAKE); $(unstage)
-       @[ -f ./m4/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 m4" ; \
-       (cd $(HOST_SUBDIR)/m4 && \
+       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}" \
@@ -31975,26 +28901,26 @@ install-pdf-m4: \
                  install-pdf) \
          || exit 1
 
-@endif m4
+@endif gnattools
 
-.PHONY: maybe-install-html-m4 install-html-m4
-maybe-install-html-m4:
-@if m4
-maybe-install-html-m4: install-html-m4
+.PHONY: maybe-install-html-gnattools install-html-gnattools
+maybe-install-html-gnattools:
+@if gnattools
+maybe-install-html-gnattools: install-html-gnattools
 
-install-html-m4: \
-    configure-m4 \
-    html-m4 
+install-html-gnattools: \
+    configure-gnattools \
+    html-gnattools 
        @: $(MAKE); $(unstage)
-       @[ -f ./m4/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 m4" ; \
-       (cd $(HOST_SUBDIR)/m4 && \
+       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}" \
@@ -32002,25 +28928,25 @@ install-html-m4: \
                  install-html) \
          || exit 1
 
-@endif m4
+@endif gnattools
 
-.PHONY: maybe-installcheck-m4 installcheck-m4
-maybe-installcheck-m4:
-@if m4
-maybe-installcheck-m4: installcheck-m4
+.PHONY: maybe-installcheck-gnattools installcheck-gnattools
+maybe-installcheck-gnattools:
+@if gnattools
+maybe-installcheck-gnattools: installcheck-gnattools
 
-installcheck-m4: \
-    configure-m4 
+installcheck-gnattools: \
+    configure-gnattools 
        @: $(MAKE); $(unstage)
-       @[ -f ./m4/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 m4" ; \
-       (cd $(HOST_SUBDIR)/m4 && \
+       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}" \
@@ -32028,24 +28954,24 @@ installcheck-m4: \
                  installcheck) \
          || exit 1
 
-@endif m4
+@endif gnattools
 
-.PHONY: maybe-mostlyclean-m4 mostlyclean-m4
-maybe-mostlyclean-m4:
-@if m4
-maybe-mostlyclean-m4: mostlyclean-m4
+.PHONY: maybe-mostlyclean-gnattools mostlyclean-gnattools
+maybe-mostlyclean-gnattools:
+@if gnattools
+maybe-mostlyclean-gnattools: mostlyclean-gnattools
 
-mostlyclean-m4: 
+mostlyclean-gnattools: 
        @: $(MAKE); $(unstage)
-       @[ -f ./m4/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 m4" ; \
-       (cd $(HOST_SUBDIR)/m4 && \
+       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}" \
@@ -32053,24 +28979,24 @@ mostlyclean-m4:
                  mostlyclean) \
          || exit 1
 
-@endif m4
+@endif gnattools
 
-.PHONY: maybe-clean-m4 clean-m4
-maybe-clean-m4:
-@if m4
-maybe-clean-m4: clean-m4
+.PHONY: maybe-clean-gnattools clean-gnattools
+maybe-clean-gnattools:
+@if gnattools
+maybe-clean-gnattools: clean-gnattools
 
-clean-m4: 
+clean-gnattools: 
        @: $(MAKE); $(unstage)
-       @[ -f ./m4/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 m4" ; \
-       (cd $(HOST_SUBDIR)/m4 && \
+       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}" \
@@ -32078,24 +29004,24 @@ clean-m4:
                  clean) \
          || exit 1
 
-@endif m4
+@endif gnattools
 
-.PHONY: maybe-distclean-m4 distclean-m4
-maybe-distclean-m4:
-@if m4
-maybe-distclean-m4: distclean-m4
+.PHONY: maybe-distclean-gnattools distclean-gnattools
+maybe-distclean-gnattools:
+@if gnattools
+maybe-distclean-gnattools: distclean-gnattools
 
-distclean-m4: 
+distclean-gnattools: 
        @: $(MAKE); $(unstage)
-       @[ -f ./m4/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 m4" ; \
-       (cd $(HOST_SUBDIR)/m4 && \
+       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}" \
@@ -32103,24 +29029,24 @@ distclean-m4:
                  distclean) \
          || exit 1
 
-@endif m4
+@endif gnattools
 
-.PHONY: maybe-maintainer-clean-m4 maintainer-clean-m4
-maybe-maintainer-clean-m4:
-@if m4
-maybe-maintainer-clean-m4: maintainer-clean-m4
+.PHONY: maybe-maintainer-clean-gnattools maintainer-clean-gnattools
+maybe-maintainer-clean-gnattools:
+@if gnattools
+maybe-maintainer-clean-gnattools: maintainer-clean-gnattools
 
-maintainer-clean-m4: 
+maintainer-clean-gnattools: 
        @: $(MAKE); $(unstage)
-       @[ -f ./m4/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 m4" ; \
-       (cd $(HOST_SUBDIR)/m4 && \
+       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}" \
@@ -32128,562 +29054,587 @@ maintainer-clean-m4:
                  maintainer-clean) \
          || exit 1
 
-@endif m4
+@endif gnattools
 
 
 
-.PHONY: configure-make maybe-configure-make
-maybe-configure-make:
+.PHONY: configure-lto-plugin maybe-configure-lto-plugin
+maybe-configure-lto-plugin:
 @if gcc-bootstrap
-configure-make: stage_current
+configure-lto-plugin: stage_current
 @endif gcc-bootstrap
-@if make
-maybe-configure-make: configure-make
-configure-make: 
-       @: $(MAKE); $(unstage)
+@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)/make/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/make ; \
+       test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \
        $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/make; \
-       cd "$(HOST_SUBDIR)/make" || exit 1; \
+       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)/make/ | \
+         *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/make"; \
-       libsrcdir="$$s/make"; \
+       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
+       libsrcdir="$$s/lto-plugin"; \
        $(SHELL) $${libsrcdir}/configure \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias} $${srcdiroption} --enable-shared \
          || exit 1
-@endif make
-
-
+@endif lto-plugin
 
 
 
-.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
-       @: $(MAKE); $(unstage)
+.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; \
-       $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/make && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-make))
-@endif make
-
-
-
-
-.PHONY: check-make maybe-check-make
-maybe-check-make:
-@if make
-maybe-check-make: check-make
+       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; \
+       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
+       libsrcdir="$$s/lto-plugin"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         $(STAGE1_CONFIGURE_FLAGS) \
+         --enable-shared
+@endif lto-plugin-bootstrap
 
-check-make:
-       @: $(MAKE); $(unstage)
+.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) \
-       (cd $(HOST_SUBDIR)/make && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif make
-
-.PHONY: install-make maybe-install-make
-maybe-install-make:
-@if make
-maybe-install-make: install-make
+       $(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; \
+       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
+       libsrcdir="$$s/lto-plugin"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE2_CONFIGURE_FLAGS) \
+         --enable-shared
+@endif lto-plugin-bootstrap
 
-install-make: installdirs
-       @: $(MAKE); $(unstage)
+.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) \
-       (cd $(HOST_SUBDIR)/make && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif make
-
-.PHONY: install-strip-make maybe-install-strip-make
-maybe-install-strip-make:
-@if make
-maybe-install-strip-make: install-strip-make
+       $(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; \
+       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
+       libsrcdir="$$s/lto-plugin"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE3_CONFIGURE_FLAGS) \
+         --enable-shared
+@endif lto-plugin-bootstrap
 
-install-strip-make: installdirs
-       @: $(MAKE); $(unstage)
+.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) \
-       (cd $(HOST_SUBDIR)/make && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif make
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-make info-make
-maybe-info-make:
-@if make
-maybe-info-make: info-make
+       $(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; \
+       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
+       libsrcdir="$$s/lto-plugin"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE4_CONFIGURE_FLAGS) \
+         --enable-shared
+@endif lto-plugin-bootstrap
 
-info-make: \
-    configure-make 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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 make
-
-.PHONY: maybe-dvi-make dvi-make
-maybe-dvi-make:
-@if make
-maybe-dvi-make: dvi-make
+       $(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; \
+       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
+       libsrcdir="$$s/lto-plugin"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEprofile_CONFIGURE_FLAGS) \
+         --enable-shared
+@endif lto-plugin-bootstrap
 
-dvi-make: \
-    configure-make 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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 make
+       $(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; \
+       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
+       libsrcdir="$$s/lto-plugin"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEfeedback_CONFIGURE_FLAGS) \
+         --enable-shared
+@endif lto-plugin-bootstrap
 
-.PHONY: maybe-pdf-make pdf-make
-maybe-pdf-make:
-@if make
-maybe-pdf-make: pdf-make
 
-pdf-make: \
-    configure-make 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 make
 
-.PHONY: maybe-html-make html-make
-maybe-html-make:
-@if make
-maybe-html-make: html-make
 
-html-make: \
-    configure-make 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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
+       $(HOST_EXPORTS)  \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
+               $(TARGET-lto-plugin))
+@endif lto-plugin
 
-@endif make
 
-.PHONY: maybe-TAGS-make TAGS-make
-maybe-TAGS-make:
-@if make
-maybe-TAGS-make: TAGS-make
 
-TAGS-make: \
-    configure-make 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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; \
-       $(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 && \
-         $(MAKE) $(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="$(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)   \
+               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(TARGET-stage1-lto-plugin)
 
-@endif make
+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)  \
+                clean
+@endif lto-plugin-bootstrap
 
-.PHONY: maybe-install-info-make install-info-make
-maybe-install-info-make:
-@if make
-maybe-install-info-make: install-info-make
 
-install-info-make: \
-    configure-make \
-    info-make 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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
+       $(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)  \
+               TFLAGS="$(STAGE2_TFLAGS)" \
+               $(TARGET-stage2-lto-plugin)
 
-@endif make
+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)  \
+                clean
+@endif lto-plugin-bootstrap
 
-.PHONY: maybe-install-pdf-make install-pdf-make
-maybe-install-pdf-make:
-@if make
-maybe-install-pdf-make: install-pdf-make
 
-install-pdf-make: \
-    configure-make \
-    pdf-make 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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
+       $(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)  \
+               TFLAGS="$(STAGE3_TFLAGS)" \
+               $(TARGET-stage3-lto-plugin)
 
-@endif make
+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)  \
+                clean
+@endif lto-plugin-bootstrap
 
-.PHONY: maybe-install-html-make install-html-make
-maybe-install-html-make:
-@if make
-maybe-install-html-make: install-html-make
 
-install-html-make: \
-    configure-make \
-    html-make 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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 make
+       $(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)  \
+               TFLAGS="$(STAGE4_TFLAGS)" \
+               $(TARGET-stage4-lto-plugin)
 
-.PHONY: maybe-installcheck-make installcheck-make
-maybe-installcheck-make:
-@if make
-maybe-installcheck-make: installcheck-make
-
-installcheck-make: \
-    configure-make 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 make
-
-.PHONY: maybe-mostlyclean-make mostlyclean-make
-maybe-mostlyclean-make:
-@if make
-maybe-mostlyclean-make: mostlyclean-make
-
-mostlyclean-make: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 make
-
-.PHONY: maybe-clean-make clean-make
-maybe-clean-make:
-@if make
-maybe-clean-make: clean-make
-
-clean-make: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 make
+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)  \
+                clean
+@endif lto-plugin-bootstrap
 
-.PHONY: maybe-distclean-make distclean-make
-maybe-distclean-make:
-@if make
-maybe-distclean-make: distclean-make
 
-distclean-make: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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 && \
-         $(MAKE) $(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)/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)  \
+               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               $(TARGET-stageprofile-lto-plugin)
 
-@endif make
+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)  \
+                clean
+@endif lto-plugin-bootstrap
 
-.PHONY: maybe-maintainer-clean-make maintainer-clean-make
-maybe-maintainer-clean-make:
-@if make
-maybe-maintainer-clean-make: maintainer-clean-make
 
-maintainer-clean-make: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./make/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
+.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) \
-       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
-
+       $(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)  \
+               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)  \
+                clean
+@endif lto-plugin-bootstrap
 
-.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)
-       @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 ; \
-       $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/mmalloc; \
-       cd "$(HOST_SUBDIR)/mmalloc" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/mmalloc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/mmalloc"; \
-       libsrcdir="$$s/mmalloc"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif mmalloc
 
 
 
 
+.PHONY: check-lto-plugin maybe-check-lto-plugin
+maybe-check-lto-plugin:
+@if lto-plugin
+maybe-check-lto-plugin: check-lto-plugin
 
-.PHONY: all-mmalloc maybe-all-mmalloc
-maybe-all-mmalloc:
-@if gcc-bootstrap
-all-mmalloc: stage_current
-@endif gcc-bootstrap
-@if mmalloc
-TARGET-mmalloc=all
-maybe-all-mmalloc: all-mmalloc
-all-mmalloc: configure-mmalloc
+check-lto-plugin:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/mmalloc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-mmalloc))
-@endif mmalloc
-
-
-
-
-.PHONY: check-mmalloc maybe-check-mmalloc
-maybe-check-mmalloc:
-@if mmalloc
-maybe-check-mmalloc: check-mmalloc
-
-check-mmalloc:
+       $(HOST_EXPORTS) \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
+         $(MAKE) $(FLAGS_TO_PASS)  check)
 
-@endif mmalloc
+@endif lto-plugin
 
-.PHONY: install-mmalloc maybe-install-mmalloc
-maybe-install-mmalloc:
-@if mmalloc
-maybe-install-mmalloc: install-mmalloc
+.PHONY: install-lto-plugin maybe-install-lto-plugin
+maybe-install-lto-plugin:
+@if lto-plugin
+maybe-install-lto-plugin: install-lto-plugin
 
-install-mmalloc: installdirs
+install-lto-plugin: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
          $(MAKE) $(FLAGS_TO_PASS)  install)
 
-@endif mmalloc
+@endif lto-plugin
 
-.PHONY: install-strip-mmalloc maybe-install-strip-mmalloc
-maybe-install-strip-mmalloc:
-@if mmalloc
-maybe-install-strip-mmalloc: install-strip-mmalloc
+.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-strip-mmalloc: 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)/mmalloc && \
+       (cd $(HOST_SUBDIR)/lto-plugin && \
          $(MAKE) $(FLAGS_TO_PASS)  install-strip)
 
-@endif mmalloc
+@endif lto-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-lto-plugin info-lto-plugin
+maybe-info-lto-plugin:
+@if lto-plugin
+maybe-info-lto-plugin: info-lto-plugin
 
-info-mmalloc: \
-    configure-mmalloc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing info in mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -32691,25 +29642,24 @@ info-mmalloc: \
                  info) \
          || exit 1
 
-@endif mmalloc
+@endif lto-plugin
 
-.PHONY: maybe-dvi-mmalloc dvi-mmalloc
-maybe-dvi-mmalloc:
-@if mmalloc
-maybe-dvi-mmalloc: dvi-mmalloc
+.PHONY: maybe-dvi-lto-plugin dvi-lto-plugin
+maybe-dvi-lto-plugin:
+@if lto-plugin
+maybe-dvi-lto-plugin: dvi-lto-plugin
 
-dvi-mmalloc: \
-    configure-mmalloc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing dvi in mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -32717,25 +29667,24 @@ dvi-mmalloc: \
                  dvi) \
          || exit 1
 
-@endif mmalloc
+@endif lto-plugin
 
-.PHONY: maybe-pdf-mmalloc pdf-mmalloc
-maybe-pdf-mmalloc:
-@if mmalloc
-maybe-pdf-mmalloc: pdf-mmalloc
+.PHONY: maybe-pdf-lto-plugin pdf-lto-plugin
+maybe-pdf-lto-plugin:
+@if lto-plugin
+maybe-pdf-lto-plugin: pdf-lto-plugin
 
-pdf-mmalloc: \
-    configure-mmalloc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing pdf in mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -32743,25 +29692,24 @@ pdf-mmalloc: \
                  pdf) \
          || exit 1
 
-@endif mmalloc
+@endif lto-plugin
 
-.PHONY: maybe-html-mmalloc html-mmalloc
-maybe-html-mmalloc:
-@if mmalloc
-maybe-html-mmalloc: html-mmalloc
+.PHONY: maybe-html-lto-plugin html-lto-plugin
+maybe-html-lto-plugin:
+@if lto-plugin
+maybe-html-lto-plugin: html-lto-plugin
 
-html-mmalloc: \
-    configure-mmalloc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing html in mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -32769,25 +29717,24 @@ html-mmalloc: \
                  html) \
          || exit 1
 
-@endif mmalloc
+@endif lto-plugin
 
-.PHONY: maybe-TAGS-mmalloc TAGS-mmalloc
-maybe-TAGS-mmalloc:
-@if mmalloc
-maybe-TAGS-mmalloc: TAGS-mmalloc
+.PHONY: maybe-TAGS-lto-plugin TAGS-lto-plugin
+maybe-TAGS-lto-plugin:
+@if lto-plugin
+maybe-TAGS-lto-plugin: TAGS-lto-plugin
 
-TAGS-mmalloc: \
-    configure-mmalloc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing TAGS in mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -32795,26 +29742,25 @@ TAGS-mmalloc: \
                  TAGS) \
          || exit 1
 
-@endif mmalloc
+@endif lto-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-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-mmalloc: \
-    configure-mmalloc \
-    info-mmalloc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 \
          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 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}" \
@@ -32822,26 +29768,25 @@ install-info-mmalloc: \
                  install-info) \
          || exit 1
 
-@endif mmalloc
+@endif lto-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-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-mmalloc: \
-    configure-mmalloc \
-    pdf-mmalloc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 \
          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 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}" \
@@ -32849,26 +29794,25 @@ install-pdf-mmalloc: \
                  install-pdf) \
          || exit 1
 
-@endif mmalloc
+@endif lto-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-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-mmalloc: \
-    configure-mmalloc \
-    html-mmalloc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 \
          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 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}" \
@@ -32876,25 +29820,24 @@ install-html-mmalloc: \
                  install-html) \
          || exit 1
 
-@endif mmalloc
+@endif lto-plugin
 
-.PHONY: maybe-installcheck-mmalloc installcheck-mmalloc
-maybe-installcheck-mmalloc:
-@if mmalloc
-maybe-installcheck-mmalloc: installcheck-mmalloc
+.PHONY: maybe-installcheck-lto-plugin installcheck-lto-plugin
+maybe-installcheck-lto-plugin:
+@if lto-plugin
+maybe-installcheck-lto-plugin: installcheck-lto-plugin
 
-installcheck-mmalloc: \
-    configure-mmalloc 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing installcheck in mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -32902,24 +29845,23 @@ installcheck-mmalloc: \
                  installcheck) \
          || exit 1
 
-@endif mmalloc
+@endif lto-plugin
 
-.PHONY: maybe-mostlyclean-mmalloc mostlyclean-mmalloc
-maybe-mostlyclean-mmalloc:
-@if mmalloc
-maybe-mostlyclean-mmalloc: mostlyclean-mmalloc
+.PHONY: maybe-mostlyclean-lto-plugin mostlyclean-lto-plugin
+maybe-mostlyclean-lto-plugin:
+@if lto-plugin
+maybe-mostlyclean-lto-plugin: mostlyclean-lto-plugin
 
-mostlyclean-mmalloc: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing mostlyclean in mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -32927,24 +29869,23 @@ mostlyclean-mmalloc:
                  mostlyclean) \
          || exit 1
 
-@endif mmalloc
+@endif lto-plugin
 
-.PHONY: maybe-clean-mmalloc clean-mmalloc
-maybe-clean-mmalloc:
-@if mmalloc
-maybe-clean-mmalloc: clean-mmalloc
+.PHONY: maybe-clean-lto-plugin clean-lto-plugin
+maybe-clean-lto-plugin:
+@if lto-plugin
+maybe-clean-lto-plugin: clean-lto-plugin
 
-clean-mmalloc: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing clean in mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -32952,24 +29893,23 @@ clean-mmalloc:
                  clean) \
          || exit 1
 
-@endif mmalloc
+@endif lto-plugin
 
-.PHONY: maybe-distclean-mmalloc distclean-mmalloc
-maybe-distclean-mmalloc:
-@if mmalloc
-maybe-distclean-mmalloc: distclean-mmalloc
+.PHONY: maybe-distclean-lto-plugin distclean-lto-plugin
+maybe-distclean-lto-plugin:
+@if lto-plugin
+maybe-distclean-lto-plugin: distclean-lto-plugin
 
-distclean-mmalloc: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       echo "Doing distclean in mmalloc" ; \
-       (cd $(HOST_SUBDIR)/mmalloc && \
+       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}" \
@@ -32977,24 +29917,23 @@ distclean-mmalloc:
                  distclean) \
          || exit 1
 
-@endif mmalloc
+@endif lto-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-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-mmalloc: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./mmalloc/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 \
          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 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}" \
@@ -33002,13247 +29941,156 @@ maintainer-clean-mmalloc:
                  maintainer-clean) \
          || exit 1
 
-@endif mmalloc
+@endif lto-plugin
+
+
+
+# ---------------------------------------
+# Modules which run on the target machine
+# ---------------------------------------
+
 
 
 
-.PHONY: configure-patch maybe-configure-patch
-maybe-configure-patch:
+.PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3
+maybe-configure-target-libstdc++-v3:
 @if gcc-bootstrap
-configure-patch: stage_current
+configure-target-libstdc++-v3: stage_current
 @endif gcc-bootstrap
-@if patch
-maybe-configure-patch: configure-patch
-configure-patch: 
-       @: $(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)/patch/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/patch ; \
-       $(HOST_EXPORTS)  \
-       echo Configuring in $(HOST_SUBDIR)/patch; \
-       cd "$(HOST_SUBDIR)/patch" || 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)/patch/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/patch"; \
-       libsrcdir="$$s/patch"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
+       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
+       libsrcdir="$$s/libstdc++-v3"; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif patch
-
-
-
-
-
-.PHONY: all-patch maybe-all-patch
-maybe-all-patch:
-@if gcc-bootstrap
-all-patch: stage_current
-@endif gcc-bootstrap
-@if patch
-TARGET-patch=all
-maybe-all-patch: all-patch
-all-patch: configure-patch
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS)  \
-       (cd $(HOST_SUBDIR)/patch && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-patch))
-@endif patch
-
-
+@endif target-libstdc++-v3
 
 
-.PHONY: check-patch maybe-check-patch
-maybe-check-patch:
-@if patch
-maybe-check-patch: check-patch
 
-check-patch:
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage1-target-libstdc++-v3 maybe-configure-stage1-target-libstdc++-v3
+maybe-configure-stage1-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3
+configure-stage1-target-libstdc++-v3:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/patch && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif patch
-
-.PHONY: install-patch maybe-install-patch
-maybe-install-patch:
-@if patch
-maybe-install-patch: install-patch
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 1 in $(TARGET_SUBDIR)/libstdc++-v3 ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
+       libsrcdir="$$s/libstdc++-v3"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-bootstrap
 
-install-patch: installdirs
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage2-target-libstdc++-v3 maybe-configure-stage2-target-libstdc++-v3
+maybe-configure-stage2-target-libstdc++-v3:
+@if target-libstdc++-v3-bootstrap
+maybe-configure-stage2-target-libstdc++-v3: configure-stage2-target-libstdc++-v3
+configure-stage2-target-libstdc++-v3:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/patch && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif patch
-
-.PHONY: install-strip-patch maybe-install-strip-patch
-maybe-install-strip-patch:
-@if patch
-maybe-install-strip-patch: install-strip-patch
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       echo "Checking multilib configuration for libstdc++-v3..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
+           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+       $(RAW_CXX_TARGET_EXPORTS) \
+        \
+       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
+       echo Configuring stage 2 in $(TARGET_SUBDIR)/libstdc++-v3 ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
+       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
+       libsrcdir="$$s/libstdc++-v3"; \
+       $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif target-libstdc++-v3-bootstrap
 
-install-strip-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-strip)
-
-@endif patch
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-patch info-patch
-maybe-info-patch:
-@if patch
-maybe-info-patch: info-patch
-
-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
-
-@endif patch
-
-.PHONY: maybe-dvi-patch dvi-patch
-maybe-dvi-patch:
-@if patch
-maybe-dvi-patch: dvi-patch
-
-dvi-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 dvi 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}" \
-                 dvi) \
-         || exit 1
-
-@endif patch
-
-.PHONY: maybe-pdf-patch pdf-patch
-maybe-pdf-patch:
-@if patch
-maybe-pdf-patch: pdf-patch
-
-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
-
-@endif patch
-
-.PHONY: maybe-html-patch html-patch
-maybe-html-patch:
-@if patch
-maybe-html-patch: html-patch
-
-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
-
-@endif patch
-
-.PHONY: maybe-TAGS-patch TAGS-patch
-maybe-TAGS-patch:
-@if patch
-maybe-TAGS-patch: TAGS-patch
-
-TAGS-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 TAGS 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}" \
-                 TAGS) \
-         || exit 1
-
-@endif patch
-
-.PHONY: maybe-install-info-patch install-info-patch
-maybe-install-info-patch:
-@if patch
-maybe-install-info-patch: install-info-patch
-
-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
-
-@endif patch
-
-.PHONY: maybe-install-pdf-patch install-pdf-patch
-maybe-install-pdf-patch:
-@if patch
-maybe-install-pdf-patch: install-pdf-patch
-
-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
-
-@endif patch
-
-.PHONY: maybe-install-html-patch install-html-patch
-maybe-install-html-patch:
-@if patch
-maybe-install-html-patch: install-html-patch
-
-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
-
-@endif patch
-
-.PHONY: maybe-installcheck-patch installcheck-patch
-maybe-installcheck-patch:
-@if patch
-maybe-installcheck-patch: installcheck-patch
-
-installcheck-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 installcheck 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}" \
-                 installcheck) \
-         || exit 1
-
-@endif patch
-
-.PHONY: maybe-mostlyclean-patch mostlyclean-patch
-maybe-mostlyclean-patch:
-@if patch
-maybe-mostlyclean-patch: mostlyclean-patch
-
-mostlyclean-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 mostlyclean 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}" \
-                 mostlyclean) \
-         || exit 1
-
-@endif patch
-
-.PHONY: maybe-clean-patch clean-patch
-maybe-clean-patch:
-@if patch
-maybe-clean-patch: clean-patch
-
-clean-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 clean 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}" \
-                 clean) \
-         || exit 1
-
-@endif patch
-
-.PHONY: maybe-distclean-patch distclean-patch
-maybe-distclean-patch:
-@if patch
-maybe-distclean-patch: distclean-patch
-
-distclean-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 distclean 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}" \
-                 distclean) \
-         || exit 1
-
-@endif patch
-
-.PHONY: maybe-maintainer-clean-patch maintainer-clean-patch
-maybe-maintainer-clean-patch:
-@if patch
-maybe-maintainer-clean-patch: maintainer-clean-patch
-
-maintainer-clean-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 maintainer-clean 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}" \
-                 maintainer-clean) \
-         || exit 1
-
-@endif patch
-
-
-
-.PHONY: configure-perl maybe-configure-perl
-maybe-configure-perl:
-@if gcc-bootstrap
-configure-perl: stage_current
-@endif gcc-bootstrap
-@if perl
-maybe-configure-perl: configure-perl
-configure-perl: 
-       @: $(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; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/perl/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/perl"; \
-       libsrcdir="$$s/perl"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif perl
-
-
-
-
-
-.PHONY: all-perl maybe-all-perl
-maybe-all-perl:
-@if gcc-bootstrap
-all-perl: stage_current
-@endif gcc-bootstrap
-@if perl
-TARGET-perl=all
-maybe-all-perl: all-perl
-all-perl: configure-perl
-       @: $(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
-
-
-
-
-.PHONY: check-perl maybe-check-perl
-maybe-check-perl:
-@if perl
-maybe-check-perl: check-perl
-
-check-perl:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/perl && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif perl
-
-.PHONY: install-perl maybe-install-perl
-maybe-install-perl:
-@if perl
-maybe-install-perl: install-perl
-
-install-perl: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/perl && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif perl
-
-.PHONY: install-strip-perl maybe-install-strip-perl
-maybe-install-strip-perl:
-@if perl
-maybe-install-strip-perl: install-strip-perl
-
-install-strip-perl: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/perl && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif perl
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-perl info-perl
-maybe-info-perl:
-@if perl
-maybe-info-perl: info-perl
-
-info-perl: \
-    configure-perl 
-       @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 perl
-
-.PHONY: maybe-dvi-perl dvi-perl
-maybe-dvi-perl:
-@if perl
-maybe-dvi-perl: dvi-perl
-
-dvi-perl: \
-    configure-perl 
-       @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 perl
-
-.PHONY: maybe-pdf-perl pdf-perl
-maybe-pdf-perl:
-@if perl
-maybe-pdf-perl: pdf-perl
-
-pdf-perl: \
-    configure-perl 
-       @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 perl
-
-.PHONY: maybe-html-perl html-perl
-maybe-html-perl:
-@if perl
-maybe-html-perl: html-perl
-
-html-perl: \
-    configure-perl 
-       @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 perl
-
-.PHONY: maybe-TAGS-perl TAGS-perl
-maybe-TAGS-perl:
-@if perl
-maybe-TAGS-perl: TAGS-perl
-
-TAGS-perl: \
-    configure-perl 
-       @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 perl
-
-.PHONY: maybe-install-info-perl install-info-perl
-maybe-install-info-perl:
-@if perl
-maybe-install-info-perl: install-info-perl
-
-install-info-perl: \
-    configure-perl \
-    info-perl 
-       @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 perl
-
-.PHONY: maybe-install-pdf-perl install-pdf-perl
-maybe-install-pdf-perl:
-@if perl
-maybe-install-pdf-perl: install-pdf-perl
-
-install-pdf-perl: \
-    configure-perl \
-    pdf-perl 
-       @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 perl
-
-.PHONY: maybe-install-html-perl install-html-perl
-maybe-install-html-perl:
-@if perl
-maybe-install-html-perl: install-html-perl
-
-install-html-perl: \
-    configure-perl \
-    html-perl 
-       @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 perl
-
-.PHONY: maybe-installcheck-perl installcheck-perl
-maybe-installcheck-perl:
-@if perl
-maybe-installcheck-perl: installcheck-perl
-
-installcheck-perl: \
-    configure-perl 
-       @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 perl
-
-.PHONY: maybe-mostlyclean-perl mostlyclean-perl
-maybe-mostlyclean-perl:
-@if perl
-maybe-mostlyclean-perl: mostlyclean-perl
-
-mostlyclean-perl: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 perl
-
-.PHONY: maybe-clean-perl clean-perl
-maybe-clean-perl:
-@if perl
-maybe-clean-perl: clean-perl
-
-clean-perl: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 perl
-
-.PHONY: maybe-distclean-perl distclean-perl
-maybe-distclean-perl:
-@if perl
-maybe-distclean-perl: distclean-perl
-
-distclean-perl: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 perl
-
-.PHONY: maybe-maintainer-clean-perl maintainer-clean-perl
-maybe-maintainer-clean-perl:
-@if perl
-maybe-maintainer-clean-perl: maintainer-clean-perl
-
-maintainer-clean-perl: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./perl/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 perl
-
-
-
-.PHONY: configure-prms maybe-configure-prms
-maybe-configure-prms:
-@if gcc-bootstrap
-configure-prms: stage_current
-@endif gcc-bootstrap
-@if prms
-maybe-configure-prms: configure-prms
-configure-prms: 
-       @: $(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; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/prms/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/prms"; \
-       libsrcdir="$$s/prms"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif prms
-
-
-
-
-
-.PHONY: all-prms maybe-all-prms
-maybe-all-prms:
-@if gcc-bootstrap
-all-prms: stage_current
-@endif gcc-bootstrap
-@if prms
-TARGET-prms=all
-maybe-all-prms: all-prms
-all-prms: configure-prms
-       @: $(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
-
-
-
-
-.PHONY: check-prms maybe-check-prms
-maybe-check-prms:
-@if prms
-maybe-check-prms: check-prms
-
-check-prms:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/prms && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif prms
-
-.PHONY: install-prms maybe-install-prms
-maybe-install-prms:
-@if prms
-maybe-install-prms: install-prms
-
-install-prms: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/prms && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif prms
-
-.PHONY: install-strip-prms maybe-install-strip-prms
-maybe-install-strip-prms:
-@if prms
-maybe-install-strip-prms: install-strip-prms
-
-install-strip-prms: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/prms && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif prms
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-prms info-prms
-maybe-info-prms:
-@if prms
-maybe-info-prms: info-prms
-
-info-prms: \
-    configure-prms 
-       @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 prms
-
-.PHONY: maybe-dvi-prms dvi-prms
-maybe-dvi-prms:
-@if prms
-maybe-dvi-prms: dvi-prms
-
-dvi-prms: \
-    configure-prms 
-       @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 prms
-
-.PHONY: maybe-pdf-prms pdf-prms
-maybe-pdf-prms:
-@if prms
-maybe-pdf-prms: pdf-prms
-
-pdf-prms: \
-    configure-prms 
-       @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 prms
-
-.PHONY: maybe-html-prms html-prms
-maybe-html-prms:
-@if prms
-maybe-html-prms: html-prms
-
-html-prms: \
-    configure-prms 
-       @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 prms
-
-.PHONY: maybe-TAGS-prms TAGS-prms
-maybe-TAGS-prms:
-@if prms
-maybe-TAGS-prms: TAGS-prms
-
-TAGS-prms: \
-    configure-prms 
-       @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 prms
-
-.PHONY: maybe-install-info-prms install-info-prms
-maybe-install-info-prms:
-@if prms
-maybe-install-info-prms: install-info-prms
-
-install-info-prms: \
-    configure-prms \
-    info-prms 
-       @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 prms
-
-.PHONY: maybe-install-pdf-prms install-pdf-prms
-maybe-install-pdf-prms:
-@if prms
-maybe-install-pdf-prms: install-pdf-prms
-
-install-pdf-prms: \
-    configure-prms \
-    pdf-prms 
-       @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 prms
-
-.PHONY: maybe-install-html-prms install-html-prms
-maybe-install-html-prms:
-@if prms
-maybe-install-html-prms: install-html-prms
-
-install-html-prms: \
-    configure-prms \
-    html-prms 
-       @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 prms
-
-.PHONY: maybe-installcheck-prms installcheck-prms
-maybe-installcheck-prms:
-@if prms
-maybe-installcheck-prms: installcheck-prms
-
-installcheck-prms: \
-    configure-prms 
-       @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 prms
-
-.PHONY: maybe-mostlyclean-prms mostlyclean-prms
-maybe-mostlyclean-prms:
-@if prms
-maybe-mostlyclean-prms: mostlyclean-prms
-
-mostlyclean-prms: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 prms
-
-.PHONY: maybe-clean-prms clean-prms
-maybe-clean-prms:
-@if prms
-maybe-clean-prms: clean-prms
-
-clean-prms: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 prms
-
-.PHONY: maybe-distclean-prms distclean-prms
-maybe-distclean-prms:
-@if prms
-maybe-distclean-prms: distclean-prms
-
-distclean-prms: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 prms
-
-.PHONY: maybe-maintainer-clean-prms maintainer-clean-prms
-maybe-maintainer-clean-prms:
-@if prms
-maybe-maintainer-clean-prms: maintainer-clean-prms
-
-maintainer-clean-prms: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./prms/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 prms
-
-
-
-.PHONY: configure-rcs maybe-configure-rcs
-maybe-configure-rcs:
-@if gcc-bootstrap
-configure-rcs: stage_current
-@endif gcc-bootstrap
-@if rcs
-maybe-configure-rcs: configure-rcs
-configure-rcs: 
-       @: $(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; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/rcs/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/rcs"; \
-       libsrcdir="$$s/rcs"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif rcs
-
-
-
-
-
-.PHONY: all-rcs maybe-all-rcs
-maybe-all-rcs:
-@if gcc-bootstrap
-all-rcs: stage_current
-@endif gcc-bootstrap
-@if rcs
-TARGET-rcs=all
-maybe-all-rcs: all-rcs
-all-rcs: configure-rcs
-       @: $(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
-
-
-
-
-.PHONY: check-rcs maybe-check-rcs
-maybe-check-rcs:
-@if rcs
-maybe-check-rcs: check-rcs
-
-check-rcs:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/rcs && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif rcs
-
-.PHONY: install-rcs maybe-install-rcs
-maybe-install-rcs:
-@if rcs
-maybe-install-rcs: install-rcs
-
-install-rcs: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/rcs && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif rcs
-
-.PHONY: install-strip-rcs maybe-install-strip-rcs
-maybe-install-strip-rcs:
-@if rcs
-maybe-install-strip-rcs: install-strip-rcs
-
-install-strip-rcs: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/rcs && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif rcs
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-rcs info-rcs
-maybe-info-rcs:
-@if rcs
-maybe-info-rcs: info-rcs
-
-info-rcs: \
-    configure-rcs 
-       @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 rcs
-
-.PHONY: maybe-dvi-rcs dvi-rcs
-maybe-dvi-rcs:
-@if rcs
-maybe-dvi-rcs: dvi-rcs
-
-dvi-rcs: \
-    configure-rcs 
-       @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 rcs
-
-.PHONY: maybe-pdf-rcs pdf-rcs
-maybe-pdf-rcs:
-@if rcs
-maybe-pdf-rcs: pdf-rcs
-
-pdf-rcs: \
-    configure-rcs 
-       @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 rcs
-
-.PHONY: maybe-html-rcs html-rcs
-maybe-html-rcs:
-@if rcs
-maybe-html-rcs: html-rcs
-
-html-rcs: \
-    configure-rcs 
-       @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 rcs
-
-.PHONY: maybe-TAGS-rcs TAGS-rcs
-maybe-TAGS-rcs:
-@if rcs
-maybe-TAGS-rcs: TAGS-rcs
-
-TAGS-rcs: \
-    configure-rcs 
-       @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 rcs
-
-.PHONY: maybe-install-info-rcs install-info-rcs
-maybe-install-info-rcs:
-@if rcs
-maybe-install-info-rcs: install-info-rcs
-
-install-info-rcs: \
-    configure-rcs \
-    info-rcs 
-       @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 rcs
-
-.PHONY: maybe-install-pdf-rcs install-pdf-rcs
-maybe-install-pdf-rcs:
-@if rcs
-maybe-install-pdf-rcs: install-pdf-rcs
-
-install-pdf-rcs: \
-    configure-rcs \
-    pdf-rcs 
-       @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 rcs
-
-.PHONY: maybe-install-html-rcs install-html-rcs
-maybe-install-html-rcs:
-@if rcs
-maybe-install-html-rcs: install-html-rcs
-
-install-html-rcs: \
-    configure-rcs \
-    html-rcs 
-       @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 rcs
-
-.PHONY: maybe-installcheck-rcs installcheck-rcs
-maybe-installcheck-rcs:
-@if rcs
-maybe-installcheck-rcs: installcheck-rcs
-
-installcheck-rcs: \
-    configure-rcs 
-       @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 rcs
-
-.PHONY: maybe-mostlyclean-rcs mostlyclean-rcs
-maybe-mostlyclean-rcs:
-@if rcs
-maybe-mostlyclean-rcs: mostlyclean-rcs
-
-mostlyclean-rcs: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 rcs
-
-.PHONY: maybe-clean-rcs clean-rcs
-maybe-clean-rcs:
-@if rcs
-maybe-clean-rcs: clean-rcs
-
-clean-rcs: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 rcs
-
-.PHONY: maybe-distclean-rcs distclean-rcs
-maybe-distclean-rcs:
-@if rcs
-maybe-distclean-rcs: distclean-rcs
-
-distclean-rcs: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 rcs
-
-.PHONY: maybe-maintainer-clean-rcs maintainer-clean-rcs
-maybe-maintainer-clean-rcs:
-@if rcs
-maybe-maintainer-clean-rcs: maintainer-clean-rcs
-
-maintainer-clean-rcs: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./rcs/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 rcs
-
-
-
-.PHONY: configure-readline maybe-configure-readline
-maybe-configure-readline:
-@if gcc-bootstrap
-configure-readline: stage_current
-@endif gcc-bootstrap
-@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)/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)/readline/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/readline"; \
-       libsrcdir="$$s/readline"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif readline
-
-
-
-
-
-.PHONY: all-readline maybe-all-readline
-maybe-all-readline:
-@if gcc-bootstrap
-all-readline: stage_current
-@endif gcc-bootstrap
-@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)/readline && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-readline))
-@endif readline
-
-
-
-
-.PHONY: check-readline maybe-check-readline
-maybe-check-readline:
-@if readline
-maybe-check-readline: check-readline
-
-check-readline:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/readline && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif readline
-
-.PHONY: install-readline maybe-install-readline
-maybe-install-readline:
-@if readline
-maybe-install-readline: install-readline
-
-install-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)
-
-@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-readline info-readline
-maybe-info-readline:
-@if readline
-maybe-info-readline: info-readline
-
-info-readline: \
-    configure-readline 
-       @: $(MAKE); $(unstage)
-       @[ -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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
-         $(MAKE) $(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 readline
-
-.PHONY: maybe-dvi-readline dvi-readline
-maybe-dvi-readline:
-@if readline
-maybe-dvi-readline: dvi-readline
-
-dvi-readline: \
-    configure-readline 
-       @: $(MAKE); $(unstage)
-       @[ -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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
-         $(MAKE) $(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 readline
-
-.PHONY: maybe-pdf-readline pdf-readline
-maybe-pdf-readline:
-@if readline
-maybe-pdf-readline: pdf-readline
-
-pdf-readline: \
-    configure-readline 
-       @: $(MAKE); $(unstage)
-       @[ -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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
-         $(MAKE) $(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 readline
-
-.PHONY: maybe-html-readline html-readline
-maybe-html-readline:
-@if readline
-maybe-html-readline: html-readline
-
-html-readline: \
-    configure-readline 
-       @: $(MAKE); $(unstage)
-       @[ -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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
-         $(MAKE) $(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 readline
-
-.PHONY: maybe-TAGS-readline TAGS-readline
-maybe-TAGS-readline:
-@if readline
-maybe-TAGS-readline: TAGS-readline
-
-TAGS-readline: \
-    configure-readline 
-       @: $(MAKE); $(unstage)
-       @[ -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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
-         $(MAKE) $(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 readline
-
-.PHONY: maybe-install-info-readline install-info-readline
-maybe-install-info-readline:
-@if readline
-maybe-install-info-readline: install-info-readline
-
-install-info-readline: \
-    configure-readline \
-    info-readline 
-       @: $(MAKE); $(unstage)
-       @[ -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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
-         $(MAKE) $(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 readline
-
-.PHONY: maybe-install-pdf-readline install-pdf-readline
-maybe-install-pdf-readline:
-@if readline
-maybe-install-pdf-readline: install-pdf-readline
-
-install-pdf-readline: \
-    configure-readline \
-    pdf-readline 
-       @: $(MAKE); $(unstage)
-       @[ -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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
-         $(MAKE) $(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 readline
-
-.PHONY: maybe-install-html-readline install-html-readline
-maybe-install-html-readline:
-@if readline
-maybe-install-html-readline: install-html-readline
-
-install-html-readline: \
-    configure-readline \
-    html-readline 
-       @: $(MAKE); $(unstage)
-       @[ -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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
-         $(MAKE) $(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 readline
-
-.PHONY: maybe-installcheck-readline installcheck-readline
-maybe-installcheck-readline:
-@if readline
-maybe-installcheck-readline: installcheck-readline
-
-installcheck-readline: \
-    configure-readline 
-       @: $(MAKE); $(unstage)
-       @[ -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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
-         $(MAKE) $(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 readline
-
-.PHONY: maybe-mostlyclean-readline mostlyclean-readline
-maybe-mostlyclean-readline:
-@if readline
-maybe-mostlyclean-readline: mostlyclean-readline
-
-mostlyclean-readline: 
-       @: $(MAKE); $(unstage)
-       @[ -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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
-         $(MAKE) $(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 readline
-
-.PHONY: maybe-clean-readline clean-readline
-maybe-clean-readline:
-@if readline
-maybe-clean-readline: clean-readline
-
-clean-readline: 
-       @: $(MAKE); $(unstage)
-       @[ -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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
-         $(MAKE) $(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 readline
-
-.PHONY: maybe-distclean-readline distclean-readline
-maybe-distclean-readline:
-@if readline
-maybe-distclean-readline: distclean-readline
-
-distclean-readline: 
-       @: $(MAKE); $(unstage)
-       @[ -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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
-         $(MAKE) $(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 readline
-
-.PHONY: maybe-maintainer-clean-readline maintainer-clean-readline
-maybe-maintainer-clean-readline:
-@if readline
-maybe-maintainer-clean-readline: maintainer-clean-readline
-
-maintainer-clean-readline: 
-       @: $(MAKE); $(unstage)
-       @[ -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 readline" ; \
-       (cd $(HOST_SUBDIR)/readline && \
-         $(MAKE) $(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 readline
-
-
-
-.PHONY: configure-release maybe-configure-release
-maybe-configure-release:
-@if gcc-bootstrap
-configure-release: stage_current
-@endif gcc-bootstrap
-@if release
-maybe-configure-release: configure-release
-configure-release: 
-       @: $(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; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/release/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/release"; \
-       libsrcdir="$$s/release"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif release
-
-
-
-
-
-.PHONY: all-release maybe-all-release
-maybe-all-release:
-@if gcc-bootstrap
-all-release: stage_current
-@endif gcc-bootstrap
-@if release
-TARGET-release=all
-maybe-all-release: all-release
-all-release: configure-release
-       @: $(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
-
-
-
-
-.PHONY: check-release maybe-check-release
-maybe-check-release:
-@if release
-maybe-check-release: check-release
-
-check-release:
-
-@endif release
-
-.PHONY: install-release maybe-install-release
-maybe-install-release:
-@if release
-maybe-install-release: install-release
-
-install-release:
-
-@endif release
-
-.PHONY: install-strip-release maybe-install-strip-release
-maybe-install-strip-release:
-@if release
-maybe-install-strip-release: install-strip-release
-
-install-strip-release:
-
-@endif release
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-release info-release
-maybe-info-release:
-@if release
-maybe-info-release: info-release
-
-info-release: \
-    configure-release 
-       @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 release
-
-.PHONY: maybe-dvi-release dvi-release
-maybe-dvi-release:
-@if release
-maybe-dvi-release: dvi-release
-
-dvi-release: \
-    configure-release 
-       @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 release
-
-.PHONY: maybe-pdf-release pdf-release
-maybe-pdf-release:
-@if release
-maybe-pdf-release: pdf-release
-
-pdf-release: \
-    configure-release 
-       @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 release
-
-.PHONY: maybe-html-release html-release
-maybe-html-release:
-@if release
-maybe-html-release: html-release
-
-html-release: \
-    configure-release 
-       @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 release
-
-.PHONY: maybe-TAGS-release TAGS-release
-maybe-TAGS-release:
-@if release
-maybe-TAGS-release: TAGS-release
-
-TAGS-release: \
-    configure-release 
-       @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 release
-
-.PHONY: maybe-install-info-release install-info-release
-maybe-install-info-release:
-@if release
-maybe-install-info-release: install-info-release
-
-install-info-release: \
-    configure-release \
-    info-release 
-       @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 release
-
-.PHONY: maybe-install-pdf-release install-pdf-release
-maybe-install-pdf-release:
-@if release
-maybe-install-pdf-release: install-pdf-release
-
-install-pdf-release: \
-    configure-release \
-    pdf-release 
-       @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 release
-
-.PHONY: maybe-install-html-release install-html-release
-maybe-install-html-release:
-@if release
-maybe-install-html-release: install-html-release
-
-install-html-release: \
-    configure-release \
-    html-release 
-       @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 release
-
-.PHONY: maybe-installcheck-release installcheck-release
-maybe-installcheck-release:
-@if release
-maybe-installcheck-release: installcheck-release
-
-installcheck-release: \
-    configure-release 
-       @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 release
-
-.PHONY: maybe-mostlyclean-release mostlyclean-release
-maybe-mostlyclean-release:
-@if release
-maybe-mostlyclean-release: mostlyclean-release
-
-mostlyclean-release: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 release
-
-.PHONY: maybe-clean-release clean-release
-maybe-clean-release:
-@if release
-maybe-clean-release: clean-release
-
-clean-release: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 release
-
-.PHONY: maybe-distclean-release distclean-release
-maybe-distclean-release:
-@if release
-maybe-distclean-release: distclean-release
-
-distclean-release: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 release
-
-.PHONY: maybe-maintainer-clean-release maintainer-clean-release
-maybe-maintainer-clean-release:
-@if release
-maybe-maintainer-clean-release: maintainer-clean-release
-
-maintainer-clean-release: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./release/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 release
-
-
-
-.PHONY: configure-recode maybe-configure-recode
-maybe-configure-recode:
-@if gcc-bootstrap
-configure-recode: stage_current
-@endif gcc-bootstrap
-@if recode
-maybe-configure-recode: configure-recode
-configure-recode: 
-       @: $(MAKE); $(unstage)
-       @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; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/recode/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/recode"; \
-       libsrcdir="$$s/recode"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif recode
-
-
-
-
-
-.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)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(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
-
-check-recode:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(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
-
-install-recode: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/recode && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif recode
-
-.PHONY: install-strip-recode maybe-install-strip-recode
-maybe-install-strip-recode:
-@if recode
-maybe-install-strip-recode: install-strip-recode
-
-install-strip-recode: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/recode && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@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
-
-html-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 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
-
-TAGS-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 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
-
-install-info-recode: \
-    configure-recode \
-    info-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-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
-
-.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; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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
-
-@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; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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
-
-@endif recode
-
-.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; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 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
-
-@endif recode
-
-.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; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 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
-
-@endif recode
-
-.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; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 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
-
-@endif recode
-
-.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; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 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
-
-
-
-.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)
-       @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 ; \
-       $(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
-
-
-
-
-
-.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-sed maybe-check-sed
-maybe-check-sed:
-@if sed
-maybe-check-sed: check-sed
-
-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)
-
-@endif sed
-
-.PHONY: install-sed maybe-install-sed
-maybe-install-sed:
-@if sed
-maybe-install-sed: install-sed
-
-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)
-
-@endif sed
-
-.PHONY: install-strip-sed maybe-install-strip-sed
-maybe-install-strip-sed:
-@if sed
-maybe-install-strip-sed: install-strip-sed
-
-install-strip-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-strip)
-
-@endif sed
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-sed info-sed
-maybe-info-sed:
-@if sed
-maybe-info-sed: info-sed
-
-info-sed: \
-    configure-sed 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 sed
-
-.PHONY: maybe-dvi-sed dvi-sed
-maybe-dvi-sed:
-@if sed
-maybe-dvi-sed: dvi-sed
-
-dvi-sed: \
-    configure-sed 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 sed
-
-.PHONY: maybe-pdf-sed pdf-sed
-maybe-pdf-sed:
-@if sed
-maybe-pdf-sed: pdf-sed
-
-pdf-sed: \
-    configure-sed 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 sed
-
-.PHONY: maybe-html-sed html-sed
-maybe-html-sed:
-@if sed
-maybe-html-sed: html-sed
-
-html-sed: \
-    configure-sed 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 sed
-
-.PHONY: maybe-TAGS-sed TAGS-sed
-maybe-TAGS-sed:
-@if sed
-maybe-TAGS-sed: TAGS-sed
-
-TAGS-sed: \
-    configure-sed 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 sed
-
-.PHONY: maybe-install-info-sed install-info-sed
-maybe-install-info-sed:
-@if sed
-maybe-install-info-sed: install-info-sed
-
-install-info-sed: \
-    configure-sed \
-    info-sed 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 sed
-
-.PHONY: maybe-install-pdf-sed install-pdf-sed
-maybe-install-pdf-sed:
-@if sed
-maybe-install-pdf-sed: install-pdf-sed
-
-install-pdf-sed: \
-    configure-sed \
-    pdf-sed 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 sed
-
-.PHONY: maybe-install-html-sed install-html-sed
-maybe-install-html-sed:
-@if sed
-maybe-install-html-sed: install-html-sed
-
-install-html-sed: \
-    configure-sed \
-    html-sed 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 sed
-
-.PHONY: maybe-installcheck-sed installcheck-sed
-maybe-installcheck-sed:
-@if sed
-maybe-installcheck-sed: installcheck-sed
-
-installcheck-sed: \
-    configure-sed 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 sed
-
-.PHONY: maybe-mostlyclean-sed mostlyclean-sed
-maybe-mostlyclean-sed:
-@if sed
-maybe-mostlyclean-sed: mostlyclean-sed
-
-mostlyclean-sed: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 sed
-
-.PHONY: maybe-clean-sed clean-sed
-maybe-clean-sed:
-@if sed
-maybe-clean-sed: clean-sed
-
-clean-sed: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 sed
-
-.PHONY: maybe-distclean-sed distclean-sed
-maybe-distclean-sed:
-@if sed
-maybe-distclean-sed: distclean-sed
-
-distclean-sed: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 sed
-
-.PHONY: maybe-maintainer-clean-sed maintainer-clean-sed
-maybe-maintainer-clean-sed:
-@if sed
-maybe-maintainer-clean-sed: maintainer-clean-sed
-
-maintainer-clean-sed: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./sed/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 sed
-
-
-
-.PHONY: configure-send-pr maybe-configure-send-pr
-maybe-configure-send-pr:
-@if gcc-bootstrap
-configure-send-pr: stage_current
-@endif gcc-bootstrap
-@if send-pr
-maybe-configure-send-pr: configure-send-pr
-configure-send-pr: 
-       @: $(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; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/send-pr/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/send-pr"; \
-       libsrcdir="$$s/send-pr"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif send-pr
-
-
-
-
-
-.PHONY: all-send-pr maybe-all-send-pr
-maybe-all-send-pr:
-@if gcc-bootstrap
-all-send-pr: 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
-       @: $(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
-
-
-
-
-.PHONY: check-send-pr maybe-check-send-pr
-maybe-check-send-pr:
-@if send-pr
-maybe-check-send-pr: check-send-pr
-
-check-send-pr:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/send-pr && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif send-pr
-
-.PHONY: install-send-pr maybe-install-send-pr
-maybe-install-send-pr:
-@if send-pr
-maybe-install-send-pr: install-send-pr
-
-install-send-pr: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/send-pr && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif send-pr
-
-.PHONY: install-strip-send-pr maybe-install-strip-send-pr
-maybe-install-strip-send-pr:
-@if send-pr
-maybe-install-strip-send-pr: install-strip-send-pr
-
-install-strip-send-pr: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/send-pr && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif send-pr
-
-# 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
-
-info-send-pr: \
-    configure-send-pr 
-       @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 send-pr
-
-.PHONY: maybe-dvi-send-pr dvi-send-pr
-maybe-dvi-send-pr:
-@if send-pr
-maybe-dvi-send-pr: dvi-send-pr
-
-dvi-send-pr: \
-    configure-send-pr 
-       @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 send-pr
-
-.PHONY: maybe-pdf-send-pr pdf-send-pr
-maybe-pdf-send-pr:
-@if send-pr
-maybe-pdf-send-pr: pdf-send-pr
-
-pdf-send-pr: \
-    configure-send-pr 
-       @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 send-pr
-
-.PHONY: maybe-html-send-pr html-send-pr
-maybe-html-send-pr:
-@if send-pr
-maybe-html-send-pr: html-send-pr
-
-html-send-pr: \
-    configure-send-pr 
-       @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 send-pr
-
-.PHONY: maybe-TAGS-send-pr TAGS-send-pr
-maybe-TAGS-send-pr:
-@if send-pr
-maybe-TAGS-send-pr: TAGS-send-pr
-
-TAGS-send-pr: \
-    configure-send-pr 
-       @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 send-pr
-
-.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
-
-install-info-send-pr: \
-    configure-send-pr \
-    info-send-pr 
-       @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 send-pr
-
-.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
-
-install-pdf-send-pr: \
-    configure-send-pr \
-    pdf-send-pr 
-       @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 send-pr
-
-.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
-
-install-html-send-pr: \
-    configure-send-pr \
-    html-send-pr 
-       @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 send-pr
-
-.PHONY: maybe-installcheck-send-pr installcheck-send-pr
-maybe-installcheck-send-pr:
-@if send-pr
-maybe-installcheck-send-pr: installcheck-send-pr
-
-installcheck-send-pr: \
-    configure-send-pr 
-       @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 send-pr
-
-.PHONY: maybe-mostlyclean-send-pr mostlyclean-send-pr
-maybe-mostlyclean-send-pr:
-@if send-pr
-maybe-mostlyclean-send-pr: mostlyclean-send-pr
-
-mostlyclean-send-pr: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 send-pr
-
-.PHONY: maybe-clean-send-pr clean-send-pr
-maybe-clean-send-pr:
-@if send-pr
-maybe-clean-send-pr: clean-send-pr
-
-clean-send-pr: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 send-pr
-
-.PHONY: maybe-distclean-send-pr distclean-send-pr
-maybe-distclean-send-pr:
-@if send-pr
-maybe-distclean-send-pr: distclean-send-pr
-
-distclean-send-pr: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 send-pr
-
-.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
-
-maintainer-clean-send-pr: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./send-pr/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 send-pr
-
-
-
-.PHONY: configure-shellutils maybe-configure-shellutils
-maybe-configure-shellutils:
-@if gcc-bootstrap
-configure-shellutils: stage_current
-@endif gcc-bootstrap
-@if shellutils
-maybe-configure-shellutils: configure-shellutils
-configure-shellutils: 
-       @: $(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; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/shellutils/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/shellutils"; \
-       libsrcdir="$$s/shellutils"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif shellutils
-
-
-
-
-
-.PHONY: all-shellutils maybe-all-shellutils
-maybe-all-shellutils:
-@if gcc-bootstrap
-all-shellutils: stage_current
-@endif gcc-bootstrap
-@if shellutils
-TARGET-shellutils=all
-maybe-all-shellutils: all-shellutils
-all-shellutils: configure-shellutils
-       @: $(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
-
-
-
-
-.PHONY: check-shellutils maybe-check-shellutils
-maybe-check-shellutils:
-@if shellutils
-maybe-check-shellutils: check-shellutils
-
-check-shellutils:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/shellutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif shellutils
-
-.PHONY: install-shellutils maybe-install-shellutils
-maybe-install-shellutils:
-@if shellutils
-maybe-install-shellutils: install-shellutils
-
-install-shellutils: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/shellutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif shellutils
-
-.PHONY: install-strip-shellutils maybe-install-strip-shellutils
-maybe-install-strip-shellutils:
-@if shellutils
-maybe-install-strip-shellutils: install-strip-shellutils
-
-install-strip-shellutils: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/shellutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif shellutils
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-shellutils info-shellutils
-maybe-info-shellutils:
-@if shellutils
-maybe-info-shellutils: info-shellutils
-
-info-shellutils: \
-    configure-shellutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 shellutils
-
-.PHONY: maybe-dvi-shellutils dvi-shellutils
-maybe-dvi-shellutils:
-@if shellutils
-maybe-dvi-shellutils: dvi-shellutils
-
-dvi-shellutils: \
-    configure-shellutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 shellutils
-
-.PHONY: maybe-pdf-shellutils pdf-shellutils
-maybe-pdf-shellutils:
-@if shellutils
-maybe-pdf-shellutils: pdf-shellutils
-
-pdf-shellutils: \
-    configure-shellutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 shellutils
-
-.PHONY: maybe-html-shellutils html-shellutils
-maybe-html-shellutils:
-@if shellutils
-maybe-html-shellutils: html-shellutils
-
-html-shellutils: \
-    configure-shellutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 shellutils
-
-.PHONY: maybe-TAGS-shellutils TAGS-shellutils
-maybe-TAGS-shellutils:
-@if shellutils
-maybe-TAGS-shellutils: TAGS-shellutils
-
-TAGS-shellutils: \
-    configure-shellutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 shellutils
-
-.PHONY: maybe-install-info-shellutils install-info-shellutils
-maybe-install-info-shellutils:
-@if shellutils
-maybe-install-info-shellutils: install-info-shellutils
-
-install-info-shellutils: \
-    configure-shellutils \
-    info-shellutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 shellutils
-
-.PHONY: maybe-install-pdf-shellutils install-pdf-shellutils
-maybe-install-pdf-shellutils:
-@if shellutils
-maybe-install-pdf-shellutils: install-pdf-shellutils
-
-install-pdf-shellutils: \
-    configure-shellutils \
-    pdf-shellutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 shellutils
-
-.PHONY: maybe-install-html-shellutils install-html-shellutils
-maybe-install-html-shellutils:
-@if shellutils
-maybe-install-html-shellutils: install-html-shellutils
-
-install-html-shellutils: \
-    configure-shellutils \
-    html-shellutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 shellutils
-
-.PHONY: maybe-installcheck-shellutils installcheck-shellutils
-maybe-installcheck-shellutils:
-@if shellutils
-maybe-installcheck-shellutils: installcheck-shellutils
-
-installcheck-shellutils: \
-    configure-shellutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 shellutils
-
-.PHONY: maybe-mostlyclean-shellutils mostlyclean-shellutils
-maybe-mostlyclean-shellutils:
-@if shellutils
-maybe-mostlyclean-shellutils: mostlyclean-shellutils
-
-mostlyclean-shellutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 shellutils
-
-.PHONY: maybe-clean-shellutils clean-shellutils
-maybe-clean-shellutils:
-@if shellutils
-maybe-clean-shellutils: clean-shellutils
-
-clean-shellutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 shellutils
-
-.PHONY: maybe-distclean-shellutils distclean-shellutils
-maybe-distclean-shellutils:
-@if shellutils
-maybe-distclean-shellutils: distclean-shellutils
-
-distclean-shellutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 shellutils
-
-.PHONY: maybe-maintainer-clean-shellutils maintainer-clean-shellutils
-maybe-maintainer-clean-shellutils:
-@if shellutils
-maybe-maintainer-clean-shellutils: maintainer-clean-shellutils
-
-maintainer-clean-shellutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./shellutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 shellutils
-
-
-
-.PHONY: configure-sid maybe-configure-sid
-maybe-configure-sid:
-@if gcc-bootstrap
-configure-sid: stage_current
-@endif gcc-bootstrap
-@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)/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)/sid/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/sid"; \
-       libsrcdir="$$s/sid"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif sid
-
-
-
-
-
-.PHONY: all-sid maybe-all-sid
-maybe-all-sid:
-@if gcc-bootstrap
-all-sid: stage_current
-@endif gcc-bootstrap
-@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)/sid && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-sid))
-@endif sid
-
-
-
-
-.PHONY: check-sid maybe-check-sid
-maybe-check-sid:
-@if sid
-maybe-check-sid: check-sid
-
-check-sid:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/sid && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif sid
-
-.PHONY: install-sid maybe-install-sid
-maybe-install-sid:
-@if sid
-maybe-install-sid: install-sid
-
-install-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)
-
-@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-sid info-sid
-maybe-info-sid:
-@if sid
-maybe-info-sid: info-sid
-
-info-sid: \
-    configure-sid 
-       @: $(MAKE); $(unstage)
-       @[ -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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
-         $(MAKE) $(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 sid
-
-.PHONY: maybe-dvi-sid dvi-sid
-maybe-dvi-sid:
-@if sid
-maybe-dvi-sid: dvi-sid
-
-dvi-sid: \
-    configure-sid 
-       @: $(MAKE); $(unstage)
-       @[ -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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
-         $(MAKE) $(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 sid
-
-.PHONY: maybe-pdf-sid pdf-sid
-maybe-pdf-sid:
-@if sid
-maybe-pdf-sid: pdf-sid
-
-pdf-sid: \
-    configure-sid 
-       @: $(MAKE); $(unstage)
-       @[ -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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
-         $(MAKE) $(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 sid
-
-.PHONY: maybe-html-sid html-sid
-maybe-html-sid:
-@if sid
-maybe-html-sid: html-sid
-
-html-sid: \
-    configure-sid 
-       @: $(MAKE); $(unstage)
-       @[ -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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
-         $(MAKE) $(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 sid
-
-.PHONY: maybe-TAGS-sid TAGS-sid
-maybe-TAGS-sid:
-@if sid
-maybe-TAGS-sid: TAGS-sid
-
-TAGS-sid: \
-    configure-sid 
-       @: $(MAKE); $(unstage)
-       @[ -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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
-         $(MAKE) $(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 sid
-
-.PHONY: maybe-install-info-sid install-info-sid
-maybe-install-info-sid:
-@if sid
-maybe-install-info-sid: install-info-sid
-
-install-info-sid: \
-    configure-sid \
-    info-sid 
-       @: $(MAKE); $(unstage)
-       @[ -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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
-         $(MAKE) $(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 sid
-
-.PHONY: maybe-install-pdf-sid install-pdf-sid
-maybe-install-pdf-sid:
-@if sid
-maybe-install-pdf-sid: install-pdf-sid
-
-install-pdf-sid: \
-    configure-sid \
-    pdf-sid 
-       @: $(MAKE); $(unstage)
-       @[ -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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
-         $(MAKE) $(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 sid
-
-.PHONY: maybe-install-html-sid install-html-sid
-maybe-install-html-sid:
-@if sid
-maybe-install-html-sid: install-html-sid
-
-install-html-sid: \
-    configure-sid \
-    html-sid 
-       @: $(MAKE); $(unstage)
-       @[ -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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
-         $(MAKE) $(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 sid
-
-.PHONY: maybe-installcheck-sid installcheck-sid
-maybe-installcheck-sid:
-@if sid
-maybe-installcheck-sid: installcheck-sid
-
-installcheck-sid: \
-    configure-sid 
-       @: $(MAKE); $(unstage)
-       @[ -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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
-         $(MAKE) $(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 sid
-
-.PHONY: maybe-mostlyclean-sid mostlyclean-sid
-maybe-mostlyclean-sid:
-@if sid
-maybe-mostlyclean-sid: mostlyclean-sid
-
-mostlyclean-sid: 
-       @: $(MAKE); $(unstage)
-       @[ -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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
-         $(MAKE) $(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 sid
-
-.PHONY: maybe-clean-sid clean-sid
-maybe-clean-sid:
-@if sid
-maybe-clean-sid: clean-sid
-
-clean-sid: 
-       @: $(MAKE); $(unstage)
-       @[ -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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
-         $(MAKE) $(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 sid
-
-.PHONY: maybe-distclean-sid distclean-sid
-maybe-distclean-sid:
-@if sid
-maybe-distclean-sid: distclean-sid
-
-distclean-sid: 
-       @: $(MAKE); $(unstage)
-       @[ -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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
-         $(MAKE) $(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 sid
-
-.PHONY: maybe-maintainer-clean-sid maintainer-clean-sid
-maybe-maintainer-clean-sid:
-@if sid
-maybe-maintainer-clean-sid: maintainer-clean-sid
-
-maintainer-clean-sid: 
-       @: $(MAKE); $(unstage)
-       @[ -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 sid" ; \
-       (cd $(HOST_SUBDIR)/sid && \
-         $(MAKE) $(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 sid
-
-
-
-.PHONY: configure-sim maybe-configure-sim
-maybe-configure-sim:
-@if gcc-bootstrap
-configure-sim: stage_current
-@endif gcc-bootstrap
-@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)/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)/sim/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/sim"; \
-       libsrcdir="$$s/sim"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif sim
-
-
-
-
-
-.PHONY: all-sim maybe-all-sim
-maybe-all-sim:
-@if gcc-bootstrap
-all-sim: stage_current
-@endif gcc-bootstrap
-@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)/sim && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-sim))
-@endif sim
-
-
-
-
-.PHONY: check-sim maybe-check-sim
-maybe-check-sim:
-@if sim
-maybe-check-sim: check-sim
-
-check-sim:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/sim && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif sim
-
-.PHONY: install-sim maybe-install-sim
-maybe-install-sim:
-@if sim
-maybe-install-sim: install-sim
-
-install-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)
-
-@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-sim info-sim
-maybe-info-sim:
-@if sim
-maybe-info-sim: info-sim
-
-info-sim: \
-    configure-sim 
-       @: $(MAKE); $(unstage)
-       @[ -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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
-         $(MAKE) $(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 sim
-
-.PHONY: maybe-dvi-sim dvi-sim
-maybe-dvi-sim:
-@if sim
-maybe-dvi-sim: dvi-sim
-
-dvi-sim: \
-    configure-sim 
-       @: $(MAKE); $(unstage)
-       @[ -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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
-         $(MAKE) $(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 sim
-
-.PHONY: maybe-pdf-sim pdf-sim
-maybe-pdf-sim:
-@if sim
-maybe-pdf-sim: pdf-sim
-
-pdf-sim: \
-    configure-sim 
-       @: $(MAKE); $(unstage)
-       @[ -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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
-         $(MAKE) $(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 sim
-
-.PHONY: maybe-html-sim html-sim
-maybe-html-sim:
-@if sim
-maybe-html-sim: html-sim
-
-html-sim: \
-    configure-sim 
-       @: $(MAKE); $(unstage)
-       @[ -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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
-         $(MAKE) $(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 sim
-
-.PHONY: maybe-TAGS-sim TAGS-sim
-maybe-TAGS-sim:
-@if sim
-maybe-TAGS-sim: TAGS-sim
-
-TAGS-sim: \
-    configure-sim 
-       @: $(MAKE); $(unstage)
-       @[ -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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
-         $(MAKE) $(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 sim
-
-.PHONY: maybe-install-info-sim install-info-sim
-maybe-install-info-sim:
-@if sim
-maybe-install-info-sim: install-info-sim
-
-install-info-sim: \
-    configure-sim \
-    info-sim 
-       @: $(MAKE); $(unstage)
-       @[ -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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
-         $(MAKE) $(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 sim
-
-.PHONY: maybe-install-pdf-sim install-pdf-sim
-maybe-install-pdf-sim:
-@if sim
-maybe-install-pdf-sim: install-pdf-sim
-
-install-pdf-sim: \
-    configure-sim \
-    pdf-sim 
-       @: $(MAKE); $(unstage)
-       @[ -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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
-         $(MAKE) $(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 sim
-
-.PHONY: maybe-install-html-sim install-html-sim
-maybe-install-html-sim:
-@if sim
-maybe-install-html-sim: install-html-sim
-
-install-html-sim: \
-    configure-sim \
-    html-sim 
-       @: $(MAKE); $(unstage)
-       @[ -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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
-         $(MAKE) $(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 sim
-
-.PHONY: maybe-installcheck-sim installcheck-sim
-maybe-installcheck-sim:
-@if sim
-maybe-installcheck-sim: installcheck-sim
-
-installcheck-sim: \
-    configure-sim 
-       @: $(MAKE); $(unstage)
-       @[ -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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
-         $(MAKE) $(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 sim
-
-.PHONY: maybe-mostlyclean-sim mostlyclean-sim
-maybe-mostlyclean-sim:
-@if sim
-maybe-mostlyclean-sim: mostlyclean-sim
-
-mostlyclean-sim: 
-       @: $(MAKE); $(unstage)
-       @[ -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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
-         $(MAKE) $(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 sim
-
-.PHONY: maybe-clean-sim clean-sim
-maybe-clean-sim:
-@if sim
-maybe-clean-sim: clean-sim
-
-clean-sim: 
-       @: $(MAKE); $(unstage)
-       @[ -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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
-         $(MAKE) $(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 sim
-
-.PHONY: maybe-distclean-sim distclean-sim
-maybe-distclean-sim:
-@if sim
-maybe-distclean-sim: distclean-sim
-
-distclean-sim: 
-       @: $(MAKE); $(unstage)
-       @[ -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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
-         $(MAKE) $(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 sim
-
-.PHONY: maybe-maintainer-clean-sim maintainer-clean-sim
-maybe-maintainer-clean-sim:
-@if sim
-maybe-maintainer-clean-sim: maintainer-clean-sim
-
-maintainer-clean-sim: 
-       @: $(MAKE); $(unstage)
-       @[ -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 sim" ; \
-       (cd $(HOST_SUBDIR)/sim && \
-         $(MAKE) $(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 sim
-
-
-
-.PHONY: configure-tar maybe-configure-tar
-maybe-configure-tar:
-@if gcc-bootstrap
-configure-tar: stage_current
-@endif gcc-bootstrap
-@if tar
-maybe-configure-tar: configure-tar
-configure-tar: 
-       @: $(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; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/tar/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/tar"; \
-       libsrcdir="$$s/tar"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif tar
-
-
-
-
-
-.PHONY: all-tar maybe-all-tar
-maybe-all-tar:
-@if gcc-bootstrap
-all-tar: stage_current
-@endif gcc-bootstrap
-@if tar
-TARGET-tar=all
-maybe-all-tar: all-tar
-all-tar: configure-tar
-       @: $(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
-
-
-
-
-.PHONY: check-tar maybe-check-tar
-maybe-check-tar:
-@if tar
-maybe-check-tar: check-tar
-
-check-tar:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/tar && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif tar
-
-.PHONY: install-tar maybe-install-tar
-maybe-install-tar:
-@if tar
-maybe-install-tar: install-tar
-
-install-tar: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/tar && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif tar
-
-.PHONY: install-strip-tar maybe-install-strip-tar
-maybe-install-strip-tar:
-@if tar
-maybe-install-strip-tar: install-strip-tar
-
-install-strip-tar: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/tar && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif tar
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-tar info-tar
-maybe-info-tar:
-@if tar
-maybe-info-tar: info-tar
-
-info-tar: \
-    configure-tar 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 tar
-
-.PHONY: maybe-dvi-tar dvi-tar
-maybe-dvi-tar:
-@if tar
-maybe-dvi-tar: dvi-tar
-
-dvi-tar: \
-    configure-tar 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 tar
-
-.PHONY: maybe-pdf-tar pdf-tar
-maybe-pdf-tar:
-@if tar
-maybe-pdf-tar: pdf-tar
-
-pdf-tar: \
-    configure-tar 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 tar
-
-.PHONY: maybe-html-tar html-tar
-maybe-html-tar:
-@if tar
-maybe-html-tar: html-tar
-
-html-tar: \
-    configure-tar 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 tar
-
-.PHONY: maybe-TAGS-tar TAGS-tar
-maybe-TAGS-tar:
-@if tar
-maybe-TAGS-tar: TAGS-tar
-
-TAGS-tar: \
-    configure-tar 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 tar
-
-.PHONY: maybe-install-info-tar install-info-tar
-maybe-install-info-tar:
-@if tar
-maybe-install-info-tar: install-info-tar
-
-install-info-tar: \
-    configure-tar \
-    info-tar 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 tar
-
-.PHONY: maybe-install-pdf-tar install-pdf-tar
-maybe-install-pdf-tar:
-@if tar
-maybe-install-pdf-tar: install-pdf-tar
-
-install-pdf-tar: \
-    configure-tar \
-    pdf-tar 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 tar
-
-.PHONY: maybe-install-html-tar install-html-tar
-maybe-install-html-tar:
-@if tar
-maybe-install-html-tar: install-html-tar
-
-install-html-tar: \
-    configure-tar \
-    html-tar 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 tar
-
-.PHONY: maybe-installcheck-tar installcheck-tar
-maybe-installcheck-tar:
-@if tar
-maybe-installcheck-tar: installcheck-tar
-
-installcheck-tar: \
-    configure-tar 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 tar
-
-.PHONY: maybe-mostlyclean-tar mostlyclean-tar
-maybe-mostlyclean-tar:
-@if tar
-maybe-mostlyclean-tar: mostlyclean-tar
-
-mostlyclean-tar: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 tar
-
-.PHONY: maybe-clean-tar clean-tar
-maybe-clean-tar:
-@if tar
-maybe-clean-tar: clean-tar
-
-clean-tar: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 tar
-
-.PHONY: maybe-distclean-tar distclean-tar
-maybe-distclean-tar:
-@if tar
-maybe-distclean-tar: distclean-tar
-
-distclean-tar: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 tar
-
-.PHONY: maybe-maintainer-clean-tar maintainer-clean-tar
-maybe-maintainer-clean-tar:
-@if tar
-maybe-maintainer-clean-tar: maintainer-clean-tar
-
-maintainer-clean-tar: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./tar/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 tar
-
-
-
-.PHONY: configure-texinfo maybe-configure-texinfo
-maybe-configure-texinfo:
-@if gcc-bootstrap
-configure-texinfo: stage_current
-@endif gcc-bootstrap
-@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)/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)/texinfo/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/texinfo"; \
-       libsrcdir="$$s/texinfo"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif texinfo
-
-
-
-
-
-.PHONY: all-texinfo maybe-all-texinfo
-maybe-all-texinfo:
-@if gcc-bootstrap
-all-texinfo: stage_current
-@endif gcc-bootstrap
-@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)/texinfo && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(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: install-texinfo maybe-install-texinfo
-maybe-install-texinfo:
-@if texinfo
-maybe-install-texinfo: install-texinfo
-
-install-texinfo:
-
-@endif texinfo
-
-.PHONY: install-strip-texinfo maybe-install-strip-texinfo
-maybe-install-strip-texinfo:
-@if texinfo
-maybe-install-strip-texinfo: install-strip-texinfo
-
-install-strip-texinfo:
-
-@endif texinfo
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-texinfo info-texinfo
-maybe-info-texinfo:
-@if texinfo
-maybe-info-texinfo: info-texinfo
-
-info-texinfo: \
-    configure-texinfo 
-       @: $(MAKE); $(unstage)
-       @[ -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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
-         $(MAKE) $(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 texinfo
-
-.PHONY: maybe-dvi-texinfo dvi-texinfo
-maybe-dvi-texinfo:
-@if texinfo
-maybe-dvi-texinfo: dvi-texinfo
-
-dvi-texinfo: \
-    configure-texinfo 
-       @: $(MAKE); $(unstage)
-       @[ -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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
-         $(MAKE) $(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 texinfo
-
-.PHONY: maybe-pdf-texinfo pdf-texinfo
-maybe-pdf-texinfo:
-@if texinfo
-maybe-pdf-texinfo: pdf-texinfo
-
-pdf-texinfo: \
-    configure-texinfo 
-       @: $(MAKE); $(unstage)
-       @[ -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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
-         $(MAKE) $(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 texinfo
-
-.PHONY: maybe-html-texinfo html-texinfo
-maybe-html-texinfo:
-@if texinfo
-maybe-html-texinfo: html-texinfo
-
-html-texinfo: \
-    configure-texinfo 
-       @: $(MAKE); $(unstage)
-       @[ -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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
-         $(MAKE) $(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 texinfo
-
-.PHONY: maybe-TAGS-texinfo TAGS-texinfo
-maybe-TAGS-texinfo:
-@if texinfo
-maybe-TAGS-texinfo: TAGS-texinfo
-
-TAGS-texinfo: \
-    configure-texinfo 
-       @: $(MAKE); $(unstage)
-       @[ -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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
-         $(MAKE) $(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 texinfo
-
-.PHONY: maybe-install-info-texinfo install-info-texinfo
-maybe-install-info-texinfo:
-@if texinfo
-maybe-install-info-texinfo: install-info-texinfo
-
-install-info-texinfo: \
-    configure-texinfo \
-    info-texinfo 
-       @: $(MAKE); $(unstage)
-       @[ -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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
-         $(MAKE) $(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 texinfo
-
-.PHONY: maybe-install-pdf-texinfo install-pdf-texinfo
-maybe-install-pdf-texinfo:
-@if texinfo
-maybe-install-pdf-texinfo: install-pdf-texinfo
-
-install-pdf-texinfo: \
-    configure-texinfo \
-    pdf-texinfo 
-       @: $(MAKE); $(unstage)
-       @[ -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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
-         $(MAKE) $(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 texinfo
-
-.PHONY: maybe-install-html-texinfo install-html-texinfo
-maybe-install-html-texinfo:
-@if texinfo
-maybe-install-html-texinfo: install-html-texinfo
-
-install-html-texinfo: \
-    configure-texinfo \
-    html-texinfo 
-       @: $(MAKE); $(unstage)
-       @[ -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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
-         $(MAKE) $(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 texinfo
-
-.PHONY: maybe-installcheck-texinfo installcheck-texinfo
-maybe-installcheck-texinfo:
-@if texinfo
-maybe-installcheck-texinfo: installcheck-texinfo
-
-installcheck-texinfo: \
-    configure-texinfo 
-       @: $(MAKE); $(unstage)
-       @[ -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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
-         $(MAKE) $(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 texinfo
-
-.PHONY: maybe-mostlyclean-texinfo mostlyclean-texinfo
-maybe-mostlyclean-texinfo:
-@if texinfo
-maybe-mostlyclean-texinfo: mostlyclean-texinfo
-
-mostlyclean-texinfo: 
-       @: $(MAKE); $(unstage)
-       @[ -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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
-         $(MAKE) $(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 texinfo
-
-.PHONY: maybe-clean-texinfo clean-texinfo
-maybe-clean-texinfo:
-@if texinfo
-maybe-clean-texinfo: clean-texinfo
-
-clean-texinfo: 
-       @: $(MAKE); $(unstage)
-       @[ -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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
-         $(MAKE) $(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 texinfo
-
-.PHONY: maybe-distclean-texinfo distclean-texinfo
-maybe-distclean-texinfo:
-@if texinfo
-maybe-distclean-texinfo: distclean-texinfo
-
-distclean-texinfo: 
-       @: $(MAKE); $(unstage)
-       @[ -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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
-         $(MAKE) $(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 texinfo
-
-.PHONY: maybe-maintainer-clean-texinfo maintainer-clean-texinfo
-maybe-maintainer-clean-texinfo:
-@if texinfo
-maybe-maintainer-clean-texinfo: maintainer-clean-texinfo
-
-maintainer-clean-texinfo: 
-       @: $(MAKE); $(unstage)
-       @[ -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 texinfo" ; \
-       (cd $(HOST_SUBDIR)/texinfo && \
-         $(MAKE) $(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 texinfo
-
-
-
-.PHONY: configure-textutils maybe-configure-textutils
-maybe-configure-textutils:
-@if gcc-bootstrap
-configure-textutils: stage_current
-@endif gcc-bootstrap
-@if textutils
-maybe-configure-textutils: configure-textutils
-configure-textutils: 
-       @: $(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; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/textutils/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/textutils"; \
-       libsrcdir="$$s/textutils"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif textutils
-
-
-
-
-
-.PHONY: all-textutils maybe-all-textutils
-maybe-all-textutils:
-@if gcc-bootstrap
-all-textutils: stage_current
-@endif gcc-bootstrap
-@if textutils
-TARGET-textutils=all
-maybe-all-textutils: all-textutils
-all-textutils: configure-textutils
-       @: $(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
-
-
-
-
-.PHONY: check-textutils maybe-check-textutils
-maybe-check-textutils:
-@if textutils
-maybe-check-textutils: check-textutils
-
-check-textutils:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/textutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif textutils
-
-.PHONY: install-textutils maybe-install-textutils
-maybe-install-textutils:
-@if textutils
-maybe-install-textutils: install-textutils
-
-install-textutils: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/textutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif textutils
-
-.PHONY: install-strip-textutils maybe-install-strip-textutils
-maybe-install-strip-textutils:
-@if textutils
-maybe-install-strip-textutils: install-strip-textutils
-
-install-strip-textutils: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/textutils && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif textutils
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-textutils info-textutils
-maybe-info-textutils:
-@if textutils
-maybe-info-textutils: info-textutils
-
-info-textutils: \
-    configure-textutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 textutils
-
-.PHONY: maybe-dvi-textutils dvi-textutils
-maybe-dvi-textutils:
-@if textutils
-maybe-dvi-textutils: dvi-textutils
-
-dvi-textutils: \
-    configure-textutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 textutils
-
-.PHONY: maybe-pdf-textutils pdf-textutils
-maybe-pdf-textutils:
-@if textutils
-maybe-pdf-textutils: pdf-textutils
-
-pdf-textutils: \
-    configure-textutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 textutils
-
-.PHONY: maybe-html-textutils html-textutils
-maybe-html-textutils:
-@if textutils
-maybe-html-textutils: html-textutils
-
-html-textutils: \
-    configure-textutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 textutils
-
-.PHONY: maybe-TAGS-textutils TAGS-textutils
-maybe-TAGS-textutils:
-@if textutils
-maybe-TAGS-textutils: TAGS-textutils
-
-TAGS-textutils: \
-    configure-textutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 textutils
-
-.PHONY: maybe-install-info-textutils install-info-textutils
-maybe-install-info-textutils:
-@if textutils
-maybe-install-info-textutils: install-info-textutils
-
-install-info-textutils: \
-    configure-textutils \
-    info-textutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 textutils
-
-.PHONY: maybe-install-pdf-textutils install-pdf-textutils
-maybe-install-pdf-textutils:
-@if textutils
-maybe-install-pdf-textutils: install-pdf-textutils
-
-install-pdf-textutils: \
-    configure-textutils \
-    pdf-textutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 textutils
-
-.PHONY: maybe-install-html-textutils install-html-textutils
-maybe-install-html-textutils:
-@if textutils
-maybe-install-html-textutils: install-html-textutils
-
-install-html-textutils: \
-    configure-textutils \
-    html-textutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 textutils
-
-.PHONY: maybe-installcheck-textutils installcheck-textutils
-maybe-installcheck-textutils:
-@if textutils
-maybe-installcheck-textutils: installcheck-textutils
-
-installcheck-textutils: \
-    configure-textutils 
-       @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 textutils
-
-.PHONY: maybe-mostlyclean-textutils mostlyclean-textutils
-maybe-mostlyclean-textutils:
-@if textutils
-maybe-mostlyclean-textutils: mostlyclean-textutils
-
-mostlyclean-textutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 textutils
-
-.PHONY: maybe-clean-textutils clean-textutils
-maybe-clean-textutils:
-@if textutils
-maybe-clean-textutils: clean-textutils
-
-clean-textutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 textutils
-
-.PHONY: maybe-distclean-textutils distclean-textutils
-maybe-distclean-textutils:
-@if textutils
-maybe-distclean-textutils: distclean-textutils
-
-distclean-textutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 textutils
-
-.PHONY: maybe-maintainer-clean-textutils maintainer-clean-textutils
-maybe-maintainer-clean-textutils:
-@if textutils
-maybe-maintainer-clean-textutils: maintainer-clean-textutils
-
-maintainer-clean-textutils: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./textutils/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 textutils
-
-
-
-.PHONY: configure-time maybe-configure-time
-maybe-configure-time:
-@if gcc-bootstrap
-configure-time: stage_current
-@endif gcc-bootstrap
-@if time
-maybe-configure-time: configure-time
-configure-time: 
-       @: $(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; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/time/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/time"; \
-       libsrcdir="$$s/time"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif time
-
-
-
-
-
-.PHONY: all-time maybe-all-time
-maybe-all-time:
-@if gcc-bootstrap
-all-time: stage_current
-@endif gcc-bootstrap
-@if time
-TARGET-time=all
-maybe-all-time: all-time
-all-time: configure-time
-       @: $(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
-
-
-
-
-.PHONY: check-time maybe-check-time
-maybe-check-time:
-@if time
-maybe-check-time: check-time
-
-check-time:
-       @: $(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)
-
-@endif time
-
-.PHONY: install-time maybe-install-time
-maybe-install-time:
-@if time
-maybe-install-time: install-time
-
-install-time: 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)
-
-@endif time
-
-.PHONY: install-strip-time maybe-install-strip-time
-maybe-install-strip-time:
-@if time
-maybe-install-strip-time: install-strip-time
-
-install-strip-time: 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-strip)
-
-@endif time
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-time info-time
-maybe-info-time:
-@if time
-maybe-info-time: info-time
-
-info-time: \
-    configure-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 info 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}" \
-                 info) \
-         || exit 1
-
-@endif time
-
-.PHONY: maybe-dvi-time dvi-time
-maybe-dvi-time:
-@if time
-maybe-dvi-time: dvi-time
-
-dvi-time: \
-    configure-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 dvi 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}" \
-                 dvi) \
-         || exit 1
-
-@endif time
-
-.PHONY: maybe-pdf-time pdf-time
-maybe-pdf-time:
-@if time
-maybe-pdf-time: pdf-time
-
-pdf-time: \
-    configure-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 pdf 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}" \
-                 pdf) \
-         || exit 1
-
-@endif time
-
-.PHONY: maybe-html-time html-time
-maybe-html-time:
-@if time
-maybe-html-time: html-time
-
-html-time: \
-    configure-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 html 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}" \
-                 html) \
-         || exit 1
-
-@endif time
-
-.PHONY: maybe-TAGS-time TAGS-time
-maybe-TAGS-time:
-@if time
-maybe-TAGS-time: TAGS-time
-
-TAGS-time: \
-    configure-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 TAGS 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}" \
-                 TAGS) \
-         || exit 1
-
-@endif time
-
-.PHONY: maybe-install-info-time install-info-time
-maybe-install-info-time:
-@if time
-maybe-install-info-time: install-info-time
-
-install-info-time: \
-    configure-time \
-    info-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 install-info 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}" \
-                 install-info) \
-         || exit 1
-
-@endif time
-
-.PHONY: maybe-install-pdf-time install-pdf-time
-maybe-install-pdf-time:
-@if time
-maybe-install-pdf-time: install-pdf-time
-
-install-pdf-time: \
-    configure-time \
-    pdf-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 install-pdf 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}" \
-                 install-pdf) \
-         || exit 1
-
-@endif time
-
-.PHONY: maybe-install-html-time install-html-time
-maybe-install-html-time:
-@if time
-maybe-install-html-time: install-html-time
-
-install-html-time: \
-    configure-time \
-    html-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 install-html 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}" \
-                 install-html) \
-         || exit 1
-
-@endif time
-
-.PHONY: maybe-installcheck-time installcheck-time
-maybe-installcheck-time:
-@if time
-maybe-installcheck-time: installcheck-time
-
-installcheck-time: \
-    configure-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 installcheck 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}" \
-                 installcheck) \
-         || exit 1
-
-@endif time
-
-.PHONY: maybe-mostlyclean-time mostlyclean-time
-maybe-mostlyclean-time:
-@if time
-maybe-mostlyclean-time: mostlyclean-time
-
-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
-
-@endif time
-
-.PHONY: maybe-clean-time clean-time
-maybe-clean-time:
-@if time
-maybe-clean-time: clean-time
-
-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
-
-@endif time
-
-.PHONY: maybe-distclean-time distclean-time
-maybe-distclean-time:
-@if time
-maybe-distclean-time: distclean-time
-
-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
-
-@endif time
-
-.PHONY: maybe-maintainer-clean-time maintainer-clean-time
-maybe-maintainer-clean-time:
-@if time
-maybe-maintainer-clean-time: maintainer-clean-time
-
-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
-
-@endif time
-
-
-
-.PHONY: configure-uudecode maybe-configure-uudecode
-maybe-configure-uudecode:
-@if gcc-bootstrap
-configure-uudecode: stage_current
-@endif gcc-bootstrap
-@if uudecode
-maybe-configure-uudecode: configure-uudecode
-configure-uudecode: 
-       @: $(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; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/uudecode/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/uudecode"; \
-       libsrcdir="$$s/uudecode"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif uudecode
-
-
-
-
-
-.PHONY: all-uudecode maybe-all-uudecode
-maybe-all-uudecode:
-@if gcc-bootstrap
-all-uudecode: stage_current
-@endif gcc-bootstrap
-@if uudecode
-TARGET-uudecode=all
-maybe-all-uudecode: all-uudecode
-all-uudecode: configure-uudecode
-       @: $(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
-
-
-
-
-.PHONY: check-uudecode maybe-check-uudecode
-maybe-check-uudecode:
-@if uudecode
-maybe-check-uudecode: check-uudecode
-
-check-uudecode:
-       @: $(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)
-
-@endif uudecode
-
-.PHONY: install-uudecode maybe-install-uudecode
-maybe-install-uudecode:
-@if uudecode
-maybe-install-uudecode: install-uudecode
-
-install-uudecode: 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)
-
-@endif uudecode
-
-.PHONY: install-strip-uudecode maybe-install-strip-uudecode
-maybe-install-strip-uudecode:
-@if uudecode
-maybe-install-strip-uudecode: install-strip-uudecode
-
-install-strip-uudecode: 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-strip)
-
-@endif uudecode
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-uudecode info-uudecode
-maybe-info-uudecode:
-@if uudecode
-maybe-info-uudecode: info-uudecode
-
-info-uudecode: \
-    configure-uudecode 
-       @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 uudecode
-
-.PHONY: maybe-dvi-uudecode dvi-uudecode
-maybe-dvi-uudecode:
-@if uudecode
-maybe-dvi-uudecode: dvi-uudecode
-
-dvi-uudecode: \
-    configure-uudecode 
-       @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 uudecode
-
-.PHONY: maybe-pdf-uudecode pdf-uudecode
-maybe-pdf-uudecode:
-@if uudecode
-maybe-pdf-uudecode: pdf-uudecode
-
-pdf-uudecode: \
-    configure-uudecode 
-       @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 uudecode
-
-.PHONY: maybe-html-uudecode html-uudecode
-maybe-html-uudecode:
-@if uudecode
-maybe-html-uudecode: html-uudecode
-
-html-uudecode: \
-    configure-uudecode 
-       @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 uudecode
-
-.PHONY: maybe-TAGS-uudecode TAGS-uudecode
-maybe-TAGS-uudecode:
-@if uudecode
-maybe-TAGS-uudecode: TAGS-uudecode
-
-TAGS-uudecode: \
-    configure-uudecode 
-       @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 uudecode
-
-.PHONY: maybe-install-info-uudecode install-info-uudecode
-maybe-install-info-uudecode:
-@if uudecode
-maybe-install-info-uudecode: install-info-uudecode
-
-install-info-uudecode: \
-    configure-uudecode \
-    info-uudecode 
-       @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 uudecode
-
-.PHONY: maybe-install-pdf-uudecode install-pdf-uudecode
-maybe-install-pdf-uudecode:
-@if uudecode
-maybe-install-pdf-uudecode: install-pdf-uudecode
-
-install-pdf-uudecode: \
-    configure-uudecode \
-    pdf-uudecode 
-       @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 uudecode
-
-.PHONY: maybe-install-html-uudecode install-html-uudecode
-maybe-install-html-uudecode:
-@if uudecode
-maybe-install-html-uudecode: install-html-uudecode
-
-install-html-uudecode: \
-    configure-uudecode \
-    html-uudecode 
-       @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 uudecode
-
-.PHONY: maybe-installcheck-uudecode installcheck-uudecode
-maybe-installcheck-uudecode:
-@if uudecode
-maybe-installcheck-uudecode: installcheck-uudecode
-
-installcheck-uudecode: \
-    configure-uudecode 
-       @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 uudecode
-
-.PHONY: maybe-mostlyclean-uudecode mostlyclean-uudecode
-maybe-mostlyclean-uudecode:
-@if uudecode
-maybe-mostlyclean-uudecode: mostlyclean-uudecode
-
-mostlyclean-uudecode: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 uudecode
-
-.PHONY: maybe-clean-uudecode clean-uudecode
-maybe-clean-uudecode:
-@if uudecode
-maybe-clean-uudecode: clean-uudecode
-
-clean-uudecode: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 uudecode
-
-.PHONY: maybe-distclean-uudecode distclean-uudecode
-maybe-distclean-uudecode:
-@if uudecode
-maybe-distclean-uudecode: distclean-uudecode
-
-distclean-uudecode: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 uudecode
-
-.PHONY: maybe-maintainer-clean-uudecode maintainer-clean-uudecode
-maybe-maintainer-clean-uudecode:
-@if uudecode
-maybe-maintainer-clean-uudecode: maintainer-clean-uudecode
-
-maintainer-clean-uudecode: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./uudecode/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 uudecode
-
-
-
-.PHONY: configure-wdiff maybe-configure-wdiff
-maybe-configure-wdiff:
-@if gcc-bootstrap
-configure-wdiff: stage_current
-@endif gcc-bootstrap
-@if wdiff
-maybe-configure-wdiff: configure-wdiff
-configure-wdiff: 
-       @: $(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; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/wdiff/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/wdiff"; \
-       libsrcdir="$$s/wdiff"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif wdiff
-
-
-
-
-
-.PHONY: all-wdiff maybe-all-wdiff
-maybe-all-wdiff:
-@if gcc-bootstrap
-all-wdiff: stage_current
-@endif gcc-bootstrap
-@if wdiff
-TARGET-wdiff=all
-maybe-all-wdiff: all-wdiff
-all-wdiff: configure-wdiff
-       @: $(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
-
-
-
-
-.PHONY: check-wdiff maybe-check-wdiff
-maybe-check-wdiff:
-@if wdiff
-maybe-check-wdiff: check-wdiff
-
-check-wdiff:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/wdiff && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif wdiff
-
-.PHONY: install-wdiff maybe-install-wdiff
-maybe-install-wdiff:
-@if wdiff
-maybe-install-wdiff: install-wdiff
-
-install-wdiff: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/wdiff && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif wdiff
-
-.PHONY: install-strip-wdiff maybe-install-strip-wdiff
-maybe-install-strip-wdiff:
-@if wdiff
-maybe-install-strip-wdiff: install-strip-wdiff
-
-install-strip-wdiff: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/wdiff && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif wdiff
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-wdiff info-wdiff
-maybe-info-wdiff:
-@if wdiff
-maybe-info-wdiff: info-wdiff
-
-info-wdiff: \
-    configure-wdiff 
-       @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 wdiff
-
-.PHONY: maybe-dvi-wdiff dvi-wdiff
-maybe-dvi-wdiff:
-@if wdiff
-maybe-dvi-wdiff: dvi-wdiff
-
-dvi-wdiff: \
-    configure-wdiff 
-       @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 wdiff
-
-.PHONY: maybe-pdf-wdiff pdf-wdiff
-maybe-pdf-wdiff:
-@if wdiff
-maybe-pdf-wdiff: pdf-wdiff
-
-pdf-wdiff: \
-    configure-wdiff 
-       @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 wdiff
-
-.PHONY: maybe-html-wdiff html-wdiff
-maybe-html-wdiff:
-@if wdiff
-maybe-html-wdiff: html-wdiff
-
-html-wdiff: \
-    configure-wdiff 
-       @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 wdiff
-
-.PHONY: maybe-TAGS-wdiff TAGS-wdiff
-maybe-TAGS-wdiff:
-@if wdiff
-maybe-TAGS-wdiff: TAGS-wdiff
-
-TAGS-wdiff: \
-    configure-wdiff 
-       @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 wdiff
-
-.PHONY: maybe-install-info-wdiff install-info-wdiff
-maybe-install-info-wdiff:
-@if wdiff
-maybe-install-info-wdiff: install-info-wdiff
-
-install-info-wdiff: \
-    configure-wdiff \
-    info-wdiff 
-       @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 wdiff
-
-.PHONY: maybe-install-pdf-wdiff install-pdf-wdiff
-maybe-install-pdf-wdiff:
-@if wdiff
-maybe-install-pdf-wdiff: install-pdf-wdiff
-
-install-pdf-wdiff: \
-    configure-wdiff \
-    pdf-wdiff 
-       @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 wdiff
-
-.PHONY: maybe-install-html-wdiff install-html-wdiff
-maybe-install-html-wdiff:
-@if wdiff
-maybe-install-html-wdiff: install-html-wdiff
-
-install-html-wdiff: \
-    configure-wdiff \
-    html-wdiff 
-       @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 wdiff
-
-.PHONY: maybe-installcheck-wdiff installcheck-wdiff
-maybe-installcheck-wdiff:
-@if wdiff
-maybe-installcheck-wdiff: installcheck-wdiff
-
-installcheck-wdiff: \
-    configure-wdiff 
-       @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 wdiff
-
-.PHONY: maybe-mostlyclean-wdiff mostlyclean-wdiff
-maybe-mostlyclean-wdiff:
-@if wdiff
-maybe-mostlyclean-wdiff: mostlyclean-wdiff
-
-mostlyclean-wdiff: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 wdiff
-
-.PHONY: maybe-clean-wdiff clean-wdiff
-maybe-clean-wdiff:
-@if wdiff
-maybe-clean-wdiff: clean-wdiff
-
-clean-wdiff: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 wdiff
-
-.PHONY: maybe-distclean-wdiff distclean-wdiff
-maybe-distclean-wdiff:
-@if wdiff
-maybe-distclean-wdiff: distclean-wdiff
-
-distclean-wdiff: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 wdiff
-
-.PHONY: maybe-maintainer-clean-wdiff maintainer-clean-wdiff
-maybe-maintainer-clean-wdiff:
-@if wdiff
-maybe-maintainer-clean-wdiff: maintainer-clean-wdiff
-
-maintainer-clean-wdiff: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./wdiff/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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
-
-@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: 
-       @: $(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
-
-
-
-
-
-.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
-       @: $(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
-
-@endif zip
-
-.PHONY: install-zip maybe-install-zip
-maybe-install-zip:
-@if zip
-maybe-install-zip: install-zip
-
-install-zip: 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)
-
-@endif zip
-
-.PHONY: install-strip-zip maybe-install-strip-zip
-maybe-install-strip-zip:
-@if zip
-maybe-install-strip-zip: install-strip-zip
-
-install-strip-zip: 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-strip)
-
-@endif zip
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-zip info-zip
-maybe-info-zip:
-@if zip
-maybe-info-zip: info-zip
-
-info-zip: \
-    configure-zip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
-         $(MAKE) $(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 zip
-
-.PHONY: maybe-dvi-zip dvi-zip
-maybe-dvi-zip:
-@if zip
-maybe-dvi-zip: dvi-zip
-
-dvi-zip: \
-    configure-zip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
-         $(MAKE) $(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 zip
-
-.PHONY: maybe-pdf-zip pdf-zip
-maybe-pdf-zip:
-@if zip
-maybe-pdf-zip: pdf-zip
-
-pdf-zip: \
-    configure-zip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
-         $(MAKE) $(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 zip
-
-.PHONY: maybe-html-zip html-zip
-maybe-html-zip:
-@if zip
-maybe-html-zip: html-zip
-
-html-zip: \
-    configure-zip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
-         $(MAKE) $(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 zip
-
-.PHONY: maybe-TAGS-zip TAGS-zip
-maybe-TAGS-zip:
-@if zip
-maybe-TAGS-zip: TAGS-zip
-
-TAGS-zip: \
-    configure-zip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
-         $(MAKE) $(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 zip
-
-.PHONY: maybe-install-info-zip install-info-zip
-maybe-install-info-zip:
-@if zip
-maybe-install-info-zip: install-info-zip
-
-install-info-zip: \
-    configure-zip \
-    info-zip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
-         $(MAKE) $(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 zip
-
-.PHONY: maybe-install-pdf-zip install-pdf-zip
-maybe-install-pdf-zip:
-@if zip
-maybe-install-pdf-zip: install-pdf-zip
-
-install-pdf-zip: \
-    configure-zip \
-    pdf-zip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
-         $(MAKE) $(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 zip
-
-.PHONY: maybe-install-html-zip install-html-zip
-maybe-install-html-zip:
-@if zip
-maybe-install-html-zip: install-html-zip
-
-install-html-zip: \
-    configure-zip \
-    html-zip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
-         $(MAKE) $(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 zip
-
-.PHONY: maybe-installcheck-zip installcheck-zip
-maybe-installcheck-zip:
-@if zip
-maybe-installcheck-zip: installcheck-zip
-
-installcheck-zip: \
-    configure-zip 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
-         $(MAKE) $(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 zip
-
-.PHONY: maybe-mostlyclean-zip mostlyclean-zip
-maybe-mostlyclean-zip:
-@if zip
-maybe-mostlyclean-zip: mostlyclean-zip
-
-mostlyclean-zip: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
-         $(MAKE) $(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 zip
-
-.PHONY: maybe-clean-zip clean-zip
-maybe-clean-zip:
-@if zip
-maybe-clean-zip: clean-zip
-
-clean-zip: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
-         $(MAKE) $(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 zip
-
-.PHONY: maybe-distclean-zip distclean-zip
-maybe-distclean-zip:
-@if zip
-maybe-distclean-zip: distclean-zip
-
-distclean-zip: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
-         $(MAKE) $(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 zip
-
-.PHONY: maybe-maintainer-clean-zip maintainer-clean-zip
-maybe-maintainer-clean-zip:
-@if zip
-maybe-maintainer-clean-zip: maintainer-clean-zip
-
-maintainer-clean-zip: 
-       @: $(MAKE); $(unstage)
-       @[ -f ./zip/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 zip" ; \
-       (cd $(HOST_SUBDIR)/zip && \
-         $(MAKE) $(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 zip
-
-
-
-.PHONY: configure-zlib maybe-configure-zlib
-maybe-configure-zlib:
-@if gcc-bootstrap
-configure-zlib: 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
-       @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) \
-       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; \
-       srcdiroption="--srcdir=$${topdir}/zlib"; \
-       libsrcdir="$$s/zlib"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         $(STAGE1_CONFIGURE_FLAGS)
-@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; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/zlib/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)/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_CONFIGURE_FLAGS)
-@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; \
-       TFLAGS="$(STAGE3_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/zlib/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)/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) \
-         $(STAGE3_CONFIGURE_FLAGS)
-@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; \
-       TFLAGS="$(STAGE4_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/zlib/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)/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) \
-         $(STAGE4_CONFIGURE_FLAGS)
-@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; \
-       TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/zlib/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)/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) \
-         $(STAGEprofile_CONFIGURE_FLAGS)
-@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; \
-       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       test ! -f $(HOST_SUBDIR)/zlib/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)/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) \
-         $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif zlib-bootstrap
-
-
-
-
-
-.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)  \
-       (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; \
-       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)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
-               $(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; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
-       $(HOST_EXPORTS) \
-       $(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)
-
-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-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) \
-       $(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)
-
-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-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) \
-       $(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)
-
-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: 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) \
-       $(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: 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; \
-       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       $(HOST_EXPORTS) \
-       $(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: check-zlib maybe-check-zlib
-maybe-check-zlib:
-@if zlib
-maybe-check-zlib: check-zlib
-
-check-zlib:
-
-@endif zlib
-
-.PHONY: install-zlib maybe-install-zlib
-maybe-install-zlib:
-@if zlib
-maybe-install-zlib: install-zlib
-
-install-zlib:
-
-@endif zlib
-
-.PHONY: install-strip-zlib maybe-install-strip-zlib
-maybe-install-strip-zlib:
-@if zlib
-maybe-install-strip-zlib: install-strip-zlib
-
-install-strip-zlib:
-
-@endif zlib
-
-# 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; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 && \
-         $(MAKE) $(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 zlib
-
-.PHONY: maybe-dvi-zlib dvi-zlib
-maybe-dvi-zlib:
-@if zlib
-maybe-dvi-zlib: dvi-zlib
-
-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 zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
-         $(MAKE) $(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 zlib
-
-.PHONY: maybe-pdf-zlib pdf-zlib
-maybe-pdf-zlib:
-@if zlib
-maybe-pdf-zlib: pdf-zlib
-
-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 zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
-         $(MAKE) $(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 zlib
-
-.PHONY: maybe-html-zlib html-zlib
-maybe-html-zlib:
-@if zlib
-maybe-html-zlib: html-zlib
-
-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 zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
-         $(MAKE) $(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 zlib
-
-.PHONY: maybe-TAGS-zlib TAGS-zlib
-maybe-TAGS-zlib:
-@if zlib
-maybe-TAGS-zlib: TAGS-zlib
-
-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 zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
-         $(MAKE) $(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 zlib
-
-.PHONY: maybe-install-info-zlib install-info-zlib
-maybe-install-info-zlib:
-@if zlib
-maybe-install-info-zlib: install-info-zlib
-
-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 zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
-         $(MAKE) $(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 zlib
-
-.PHONY: maybe-install-pdf-zlib install-pdf-zlib
-maybe-install-pdf-zlib:
-@if zlib
-maybe-install-pdf-zlib: install-pdf-zlib
-
-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 zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
-         $(MAKE) $(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 zlib
-
-.PHONY: maybe-install-html-zlib install-html-zlib
-maybe-install-html-zlib:
-@if zlib
-maybe-install-html-zlib: install-html-zlib
-
-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 zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
-         $(MAKE) $(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 zlib
-
-.PHONY: maybe-installcheck-zlib installcheck-zlib
-maybe-installcheck-zlib:
-@if zlib
-maybe-installcheck-zlib: installcheck-zlib
-
-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 zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
-         $(MAKE) $(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 zlib
-
-.PHONY: maybe-mostlyclean-zlib mostlyclean-zlib
-maybe-mostlyclean-zlib:
-@if zlib
-maybe-mostlyclean-zlib: mostlyclean-zlib
-
-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 zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
-         $(MAKE) $(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 zlib
-
-.PHONY: maybe-clean-zlib clean-zlib
-maybe-clean-zlib:
-@if zlib
-maybe-clean-zlib: clean-zlib
-
-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 zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
-         $(MAKE) $(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 zlib
-
-.PHONY: maybe-distclean-zlib distclean-zlib
-maybe-distclean-zlib:
-@if zlib
-maybe-distclean-zlib: distclean-zlib
-
-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 zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
-         $(MAKE) $(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 zlib
-
-.PHONY: maybe-maintainer-clean-zlib maintainer-clean-zlib
-maybe-maintainer-clean-zlib:
-@if zlib
-maybe-maintainer-clean-zlib: maintainer-clean-zlib
-
-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 zlib" ; \
-       (cd $(HOST_SUBDIR)/zlib && \
-         $(MAKE) $(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 zlib
-
-
-
-.PHONY: configure-gdb maybe-configure-gdb
-maybe-configure-gdb:
-@if gcc-bootstrap
-configure-gdb: stage_current
-@endif gcc-bootstrap
-@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)/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)/gdb/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/gdb"; \
-       libsrcdir="$$s/gdb"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif gdb
-
-
-
-
-
-.PHONY: all-gdb maybe-all-gdb
-maybe-all-gdb:
-@if gcc-bootstrap
-all-gdb: stage_current
-@endif gcc-bootstrap
-@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)/gdb && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-gdb))
-@endif gdb
-
-
-
-
-.PHONY: check-gdb maybe-check-gdb
-maybe-check-gdb:
-@if gdb
-maybe-check-gdb: check-gdb
-
-check-gdb:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/gdb && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif gdb
-
-.PHONY: install-gdb maybe-install-gdb
-maybe-install-gdb:
-@if gdb
-maybe-install-gdb: install-gdb
-
-install-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)
-
-@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-gdb info-gdb
-maybe-info-gdb:
-@if gdb
-maybe-info-gdb: info-gdb
-
-info-gdb: \
-    configure-gdb 
-       @: $(MAKE); $(unstage)
-       @[ -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 gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
-         $(MAKE) $(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 gdb
-
-.PHONY: maybe-dvi-gdb dvi-gdb
-maybe-dvi-gdb:
-@if gdb
-maybe-dvi-gdb: dvi-gdb
-
-dvi-gdb: \
-    configure-gdb 
-       @: $(MAKE); $(unstage)
-       @[ -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 gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
-         $(MAKE) $(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 gdb
-
-.PHONY: maybe-pdf-gdb pdf-gdb
-maybe-pdf-gdb:
-@if gdb
-maybe-pdf-gdb: pdf-gdb
-
-pdf-gdb: \
-    configure-gdb 
-       @: $(MAKE); $(unstage)
-       @[ -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 gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
-         $(MAKE) $(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 gdb
-
-.PHONY: maybe-html-gdb html-gdb
-maybe-html-gdb:
-@if gdb
-maybe-html-gdb: html-gdb
-
-html-gdb: \
-    configure-gdb 
-       @: $(MAKE); $(unstage)
-       @[ -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 gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
-         $(MAKE) $(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 gdb
-
-.PHONY: maybe-TAGS-gdb TAGS-gdb
-maybe-TAGS-gdb:
-@if gdb
-maybe-TAGS-gdb: TAGS-gdb
-
-TAGS-gdb: \
-    configure-gdb 
-       @: $(MAKE); $(unstage)
-       @[ -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 gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
-         $(MAKE) $(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 gdb
-
-.PHONY: maybe-install-info-gdb install-info-gdb
-maybe-install-info-gdb:
-@if gdb
-maybe-install-info-gdb: install-info-gdb
-
-install-info-gdb: \
-    configure-gdb \
-    info-gdb 
-       @: $(MAKE); $(unstage)
-       @[ -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 gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
-         $(MAKE) $(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 gdb
-
-.PHONY: maybe-install-pdf-gdb install-pdf-gdb
-maybe-install-pdf-gdb:
-@if gdb
-maybe-install-pdf-gdb: install-pdf-gdb
-
-install-pdf-gdb: \
-    configure-gdb \
-    pdf-gdb 
-       @: $(MAKE); $(unstage)
-       @[ -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 gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
-         $(MAKE) $(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 gdb
-
-.PHONY: maybe-install-html-gdb install-html-gdb
-maybe-install-html-gdb:
-@if gdb
-maybe-install-html-gdb: install-html-gdb
-
-install-html-gdb: \
-    configure-gdb \
-    html-gdb 
-       @: $(MAKE); $(unstage)
-       @[ -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 gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
-         $(MAKE) $(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 gdb
-
-.PHONY: maybe-installcheck-gdb installcheck-gdb
-maybe-installcheck-gdb:
-@if gdb
-maybe-installcheck-gdb: installcheck-gdb
-
-installcheck-gdb: \
-    configure-gdb 
-       @: $(MAKE); $(unstage)
-       @[ -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 gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
-         $(MAKE) $(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 gdb
-
-.PHONY: maybe-mostlyclean-gdb mostlyclean-gdb
-maybe-mostlyclean-gdb:
-@if gdb
-maybe-mostlyclean-gdb: mostlyclean-gdb
-
-mostlyclean-gdb: 
-       @: $(MAKE); $(unstage)
-       @[ -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 gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
-         $(MAKE) $(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 gdb
-
-.PHONY: maybe-clean-gdb clean-gdb
-maybe-clean-gdb:
-@if gdb
-maybe-clean-gdb: clean-gdb
-
-clean-gdb: 
-       @: $(MAKE); $(unstage)
-       @[ -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 gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
-         $(MAKE) $(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 gdb
-
-.PHONY: maybe-distclean-gdb distclean-gdb
-maybe-distclean-gdb:
-@if gdb
-maybe-distclean-gdb: distclean-gdb
-
-distclean-gdb: 
-       @: $(MAKE); $(unstage)
-       @[ -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 gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
-         $(MAKE) $(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 gdb
-
-.PHONY: maybe-maintainer-clean-gdb maintainer-clean-gdb
-maybe-maintainer-clean-gdb:
-@if gdb
-maybe-maintainer-clean-gdb: maintainer-clean-gdb
-
-maintainer-clean-gdb: 
-       @: $(MAKE); $(unstage)
-       @[ -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 gdb" ; \
-       (cd $(HOST_SUBDIR)/gdb && \
-         $(MAKE) $(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 gdb
-
-
-
-.PHONY: configure-expect maybe-configure-expect
-maybe-configure-expect:
-@if gcc-bootstrap
-configure-expect: stage_current
-@endif gcc-bootstrap
-@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)/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)/expect/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/expect"; \
-       libsrcdir="$$s/expect"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif expect
-
-
-
-
-
-.PHONY: all-expect maybe-all-expect
-maybe-all-expect:
-@if gcc-bootstrap
-all-expect: stage_current
-@endif gcc-bootstrap
-@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)/expect && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-expect))
-@endif expect
-
-
-
-
-.PHONY: check-expect maybe-check-expect
-maybe-check-expect:
-@if expect
-maybe-check-expect: check-expect
-
-check-expect:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/expect && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif expect
-
-.PHONY: install-expect maybe-install-expect
-maybe-install-expect:
-@if expect
-maybe-install-expect: install-expect
-
-install-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)
-
-@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-expect info-expect
-maybe-info-expect:
-@if expect
-maybe-info-expect: info-expect
-
-info-expect: \
-    configure-expect 
-       @: $(MAKE); $(unstage)
-       @[ -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 expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
-         $(MAKE) $(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 expect
-
-.PHONY: maybe-dvi-expect dvi-expect
-maybe-dvi-expect:
-@if expect
-maybe-dvi-expect: dvi-expect
-
-dvi-expect: \
-    configure-expect 
-       @: $(MAKE); $(unstage)
-       @[ -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 expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
-         $(MAKE) $(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
-
-pdf-expect: \
-    configure-expect 
-       @: $(MAKE); $(unstage)
-       @[ -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 expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
-         $(MAKE) $(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 expect
-
-.PHONY: maybe-html-expect html-expect
-maybe-html-expect:
-@if expect
-maybe-html-expect: html-expect
-
-html-expect: \
-    configure-expect 
-       @: $(MAKE); $(unstage)
-       @[ -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 expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
-         $(MAKE) $(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 expect
-
-.PHONY: maybe-TAGS-expect TAGS-expect
-maybe-TAGS-expect:
-@if expect
-maybe-TAGS-expect: TAGS-expect
-
-TAGS-expect: \
-    configure-expect 
-       @: $(MAKE); $(unstage)
-       @[ -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 expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
-         $(MAKE) $(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 expect
-
-.PHONY: maybe-install-info-expect install-info-expect
-maybe-install-info-expect:
-@if expect
-maybe-install-info-expect: install-info-expect
-
-install-info-expect: \
-    configure-expect \
-    info-expect 
-       @: $(MAKE); $(unstage)
-       @[ -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 expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
-         $(MAKE) $(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 expect
-
-.PHONY: maybe-install-pdf-expect install-pdf-expect
-maybe-install-pdf-expect:
-@if expect
-maybe-install-pdf-expect: install-pdf-expect
-
-install-pdf-expect: \
-    configure-expect \
-    pdf-expect 
-       @: $(MAKE); $(unstage)
-       @[ -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 expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
-         $(MAKE) $(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 expect
-
-.PHONY: maybe-install-html-expect install-html-expect
-maybe-install-html-expect:
-@if expect
-maybe-install-html-expect: install-html-expect
-
-install-html-expect: \
-    configure-expect \
-    html-expect 
-       @: $(MAKE); $(unstage)
-       @[ -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 expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
-         $(MAKE) $(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 expect
-
-.PHONY: maybe-installcheck-expect installcheck-expect
-maybe-installcheck-expect:
-@if expect
-maybe-installcheck-expect: installcheck-expect
-
-installcheck-expect: \
-    configure-expect 
-       @: $(MAKE); $(unstage)
-       @[ -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 expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
-         $(MAKE) $(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 expect
-
-.PHONY: maybe-mostlyclean-expect mostlyclean-expect
-maybe-mostlyclean-expect:
-@if expect
-maybe-mostlyclean-expect: mostlyclean-expect
-
-mostlyclean-expect: 
-       @: $(MAKE); $(unstage)
-       @[ -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 expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
-         $(MAKE) $(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 expect
-
-.PHONY: maybe-clean-expect clean-expect
-maybe-clean-expect:
-@if expect
-maybe-clean-expect: clean-expect
-
-clean-expect: 
-       @: $(MAKE); $(unstage)
-       @[ -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 expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
-         $(MAKE) $(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 expect
-
-.PHONY: maybe-distclean-expect distclean-expect
-maybe-distclean-expect:
-@if expect
-maybe-distclean-expect: distclean-expect
-
-distclean-expect: 
-       @: $(MAKE); $(unstage)
-       @[ -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 expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
-         $(MAKE) $(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 expect
-
-.PHONY: maybe-maintainer-clean-expect maintainer-clean-expect
-maybe-maintainer-clean-expect:
-@if expect
-maybe-maintainer-clean-expect: maintainer-clean-expect
-
-maintainer-clean-expect: 
-       @: $(MAKE); $(unstage)
-       @[ -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 expect" ; \
-       (cd $(HOST_SUBDIR)/expect && \
-         $(MAKE) $(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 expect
-
-
-
-.PHONY: configure-guile maybe-configure-guile
-maybe-configure-guile:
-@if gcc-bootstrap
-configure-guile: stage_current
-@endif gcc-bootstrap
-@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)/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)/guile/ | \
-               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}  \
-         || exit 1
-@endif guile
-
-
-
-
-
-.PHONY: all-guile maybe-all-guile
-maybe-all-guile:
-@if gcc-bootstrap
-all-guile: stage_current
-@endif gcc-bootstrap
-@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)/guile && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(TARGET-guile))
-@endif guile
-
-
-
-
-.PHONY: check-guile maybe-check-guile
-maybe-check-guile:
-@if guile
-maybe-check-guile: check-guile
-
-check-guile:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/guile && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif guile
-
-.PHONY: install-guile maybe-install-guile
-maybe-install-guile:
-@if guile
-maybe-install-guile: install-guile
-
-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 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-guile info-guile
-maybe-info-guile:
-@if guile
-maybe-info-guile: info-guile
-
-info-guile: \
-    configure-guile 
-       @: $(MAKE); $(unstage)
-       @[ -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 guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
-         $(MAKE) $(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 guile
-
-.PHONY: maybe-dvi-guile dvi-guile
-maybe-dvi-guile:
-@if guile
-maybe-dvi-guile: dvi-guile
-
-dvi-guile: \
-    configure-guile 
-       @: $(MAKE); $(unstage)
-       @[ -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 guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
-         $(MAKE) $(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 guile
-
-.PHONY: maybe-pdf-guile pdf-guile
-maybe-pdf-guile:
-@if guile
-maybe-pdf-guile: pdf-guile
-
-pdf-guile: \
-    configure-guile 
-       @: $(MAKE); $(unstage)
-       @[ -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 guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
-         $(MAKE) $(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 guile
-
-.PHONY: maybe-html-guile html-guile
-maybe-html-guile:
-@if guile
-maybe-html-guile: html-guile
-
-html-guile: \
-    configure-guile 
-       @: $(MAKE); $(unstage)
-       @[ -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 guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
-         $(MAKE) $(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 guile
-
-.PHONY: maybe-TAGS-guile TAGS-guile
-maybe-TAGS-guile:
-@if guile
-maybe-TAGS-guile: TAGS-guile
-
-TAGS-guile: \
-    configure-guile 
-       @: $(MAKE); $(unstage)
-       @[ -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 guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
-         $(MAKE) $(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 guile
-
-.PHONY: maybe-install-info-guile install-info-guile
-maybe-install-info-guile:
-@if guile
-maybe-install-info-guile: install-info-guile
-
-install-info-guile: \
-    configure-guile \
-    info-guile 
-       @: $(MAKE); $(unstage)
-       @[ -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 guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
-         $(MAKE) $(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 guile
-
-.PHONY: maybe-install-pdf-guile install-pdf-guile
-maybe-install-pdf-guile:
-@if guile
-maybe-install-pdf-guile: install-pdf-guile
-
-install-pdf-guile: \
-    configure-guile \
-    pdf-guile 
-       @: $(MAKE); $(unstage)
-       @[ -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 guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
-         $(MAKE) $(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 guile
-
-.PHONY: maybe-install-html-guile install-html-guile
-maybe-install-html-guile:
-@if guile
-maybe-install-html-guile: install-html-guile
-
-install-html-guile: \
-    configure-guile \
-    html-guile 
-       @: $(MAKE); $(unstage)
-       @[ -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 guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
-         $(MAKE) $(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 guile
-
-.PHONY: maybe-installcheck-guile installcheck-guile
-maybe-installcheck-guile:
-@if guile
-maybe-installcheck-guile: installcheck-guile
-
-installcheck-guile: \
-    configure-guile 
-       @: $(MAKE); $(unstage)
-       @[ -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 guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
-         $(MAKE) $(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 guile
-
-.PHONY: maybe-mostlyclean-guile mostlyclean-guile
-maybe-mostlyclean-guile:
-@if guile
-maybe-mostlyclean-guile: mostlyclean-guile
-
-mostlyclean-guile: 
-       @: $(MAKE); $(unstage)
-       @[ -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 guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
-         $(MAKE) $(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 guile
-
-.PHONY: maybe-clean-guile clean-guile
-maybe-clean-guile:
-@if guile
-maybe-clean-guile: clean-guile
-
-clean-guile: 
-       @: $(MAKE); $(unstage)
-       @[ -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 guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
-         $(MAKE) $(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 guile
-
-.PHONY: maybe-distclean-guile distclean-guile
-maybe-distclean-guile:
-@if guile
-maybe-distclean-guile: distclean-guile
-
-distclean-guile: 
-       @: $(MAKE); $(unstage)
-       @[ -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 guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
-         $(MAKE) $(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 guile
-
-.PHONY: maybe-maintainer-clean-guile maintainer-clean-guile
-maybe-maintainer-clean-guile:
-@if guile
-maybe-maintainer-clean-guile: maintainer-clean-guile
-
-maintainer-clean-guile: 
-       @: $(MAKE); $(unstage)
-       @[ -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 guile" ; \
-       (cd $(HOST_SUBDIR)/guile && \
-         $(MAKE) $(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 guile
-
-
-
-.PHONY: configure-tk maybe-configure-tk
-maybe-configure-tk:
-@if gcc-bootstrap
-configure-tk: stage_current
-@endif gcc-bootstrap
-@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)/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)/tk/ | \
-               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}  \
-         || exit 1
-@endif tk
-
-
-
-
-
-.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)
-       @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)  \
-               $(TARGET-tk))
-@endif tk
-
-
-
-
-.PHONY: check-tk maybe-check-tk
-maybe-check-tk:
-@if tk
-maybe-check-tk: check-tk
-
-check-tk:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/tk && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif tk
-
-.PHONY: install-tk maybe-install-tk
-maybe-install-tk:
-@if tk
-maybe-install-tk: install-tk
-
-install-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)
-
-@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-tk info-tk
-maybe-info-tk:
-@if tk
-maybe-info-tk: info-tk
-
-info-tk: \
-    configure-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) ; 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; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 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; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 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; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 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; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; 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 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
-
-@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) ; 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 
-       @: $(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) ; 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
-
-@endif tk
-
-.PHONY: maybe-install-html-tk install-html-tk
-maybe-install-html-tk:
-@if tk
-maybe-install-html-tk: install-html-tk
-
-install-html-tk: \
-    configure-tk \
-    html-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) ; 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
-
-@endif tk
-
-.PHONY: maybe-installcheck-tk installcheck-tk
-maybe-installcheck-tk:
-@if tk
-maybe-installcheck-tk: installcheck-tk
-
-installcheck-tk: \
-    configure-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) ; 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
-
-@endif tk
-
-.PHONY: maybe-mostlyclean-tk mostlyclean-tk
-maybe-mostlyclean-tk:
-@if tk
-maybe-mostlyclean-tk: mostlyclean-tk
-
-mostlyclean-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) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 mostlyclean) \
-         || exit 1
-
-@endif tk
-
-.PHONY: maybe-clean-tk clean-tk
-maybe-clean-tk:
-@if tk
-maybe-clean-tk: clean-tk
-
-clean-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) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 clean) \
-         || exit 1
-
-@endif tk
-
-.PHONY: maybe-distclean-tk distclean-tk
-maybe-distclean-tk:
-@if tk
-maybe-distclean-tk: distclean-tk
-
-distclean-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) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 distclean) \
-         || exit 1
-
-@endif tk
-
-.PHONY: maybe-maintainer-clean-tk maintainer-clean-tk
-maybe-maintainer-clean-tk:
-@if tk
-maybe-maintainer-clean-tk: maintainer-clean-tk
-
-maintainer-clean-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) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       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}" \
-                 "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}  \
-         || 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
-
-.PHONY: install-strip-libtermcap maybe-install-strip-libtermcap
-maybe-install-strip-libtermcap:
-@if libtermcap
-maybe-install-strip-libtermcap: install-strip-libtermcap
-
-install-strip-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-strip)
-
-@endif libtermcap
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-libtermcap info-libtermcap
-maybe-info-libtermcap:
-@if libtermcap
-maybe-info-libtermcap: info-libtermcap
-
-info-libtermcap: \
-    configure-libtermcap 
-       @: $(MAKE); $(unstage)
-       @[ -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 libtermcap" ; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
-         $(MAKE) $(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 libtermcap
-
-.PHONY: maybe-dvi-libtermcap dvi-libtermcap
-maybe-dvi-libtermcap:
-@if libtermcap
-maybe-dvi-libtermcap: dvi-libtermcap
-
-dvi-libtermcap: \
-    configure-libtermcap 
-       @: $(MAKE); $(unstage)
-       @[ -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 libtermcap" ; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
-         $(MAKE) $(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 libtermcap
-
-.PHONY: maybe-pdf-libtermcap pdf-libtermcap
-maybe-pdf-libtermcap:
-@if libtermcap
-maybe-pdf-libtermcap: pdf-libtermcap
-
-pdf-libtermcap: \
-    configure-libtermcap 
-       @: $(MAKE); $(unstage)
-       @[ -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 libtermcap" ; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
-         $(MAKE) $(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 libtermcap
-
-.PHONY: maybe-html-libtermcap html-libtermcap
-maybe-html-libtermcap:
-@if libtermcap
-maybe-html-libtermcap: html-libtermcap
-
-html-libtermcap: \
-    configure-libtermcap 
-       @: $(MAKE); $(unstage)
-       @[ -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 libtermcap" ; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
-         $(MAKE) $(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 libtermcap
-
-.PHONY: maybe-TAGS-libtermcap TAGS-libtermcap
-maybe-TAGS-libtermcap:
-@if libtermcap
-maybe-TAGS-libtermcap: TAGS-libtermcap
-
-TAGS-libtermcap: \
-    configure-libtermcap 
-       @: $(MAKE); $(unstage)
-       @[ -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 libtermcap" ; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
-         $(MAKE) $(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 libtermcap
-
-.PHONY: maybe-install-info-libtermcap install-info-libtermcap
-maybe-install-info-libtermcap:
-@if libtermcap
-maybe-install-info-libtermcap: install-info-libtermcap
-
-install-info-libtermcap: \
-    configure-libtermcap \
-    info-libtermcap 
-       @: $(MAKE); $(unstage)
-       @[ -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 libtermcap" ; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
-         $(MAKE) $(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 libtermcap
-
-.PHONY: maybe-install-pdf-libtermcap install-pdf-libtermcap
-maybe-install-pdf-libtermcap:
-@if libtermcap
-maybe-install-pdf-libtermcap: install-pdf-libtermcap
-
-install-pdf-libtermcap: \
-    configure-libtermcap \
-    pdf-libtermcap 
-       @: $(MAKE); $(unstage)
-       @[ -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 libtermcap" ; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
-         $(MAKE) $(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 libtermcap
-
-.PHONY: maybe-install-html-libtermcap install-html-libtermcap
-maybe-install-html-libtermcap:
-@if libtermcap
-maybe-install-html-libtermcap: install-html-libtermcap
-
-install-html-libtermcap: \
-    configure-libtermcap \
-    html-libtermcap 
-       @: $(MAKE); $(unstage)
-       @[ -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 libtermcap" ; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
-         $(MAKE) $(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 libtermcap
-
-.PHONY: maybe-installcheck-libtermcap installcheck-libtermcap
-maybe-installcheck-libtermcap:
-@if libtermcap
-maybe-installcheck-libtermcap: installcheck-libtermcap
-
-installcheck-libtermcap: \
-    configure-libtermcap 
-       @: $(MAKE); $(unstage)
-       @[ -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 libtermcap" ; \
-       (cd $(HOST_SUBDIR)/libtermcap && \
-         $(MAKE) $(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 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
-
-# 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-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)
-       @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; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(HOST_SUBDIR)/utils/ | \
-               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
-
-
-
-
-
-.PHONY: all-utils maybe-all-utils
-maybe-all-utils:
-@if gcc-bootstrap
-all-utils: stage_current
-@endif gcc-bootstrap
-@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)/utils && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-               $(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: install-utils maybe-install-utils
-maybe-install-utils:
-@if utils
-maybe-install-utils: install-utils
-
-install-utils: 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)
-
-@endif utils
-
-.PHONY: install-strip-utils maybe-install-strip-utils
-maybe-install-strip-utils:
-@if utils
-maybe-install-strip-utils: install-strip-utils
-
-install-strip-utils: 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-strip)
-
-@endif utils
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-utils info-utils
-maybe-info-utils:
-@if utils
-maybe-info-utils: info-utils
-
-info-utils: \
-    configure-utils 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 info) \
-         || exit 1
-
-@endif utils
-
-.PHONY: maybe-dvi-utils dvi-utils
-maybe-dvi-utils:
-@if utils
-maybe-dvi-utils: dvi-utils
-
-dvi-utils: \
-    configure-utils 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 dvi) \
-         || exit 1
-
-@endif utils
-
-.PHONY: maybe-pdf-utils pdf-utils
-maybe-pdf-utils:
-@if utils
-maybe-pdf-utils: pdf-utils
-
-pdf-utils: \
-    configure-utils 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 pdf) \
-         || exit 1
-
-@endif utils
-
-.PHONY: maybe-html-utils html-utils
-maybe-html-utils:
-@if utils
-maybe-html-utils: html-utils
-
-html-utils: \
-    configure-utils 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 html) \
-         || exit 1
-
-@endif utils
-
-.PHONY: maybe-TAGS-utils TAGS-utils
-maybe-TAGS-utils:
-@if utils
-maybe-TAGS-utils: TAGS-utils
-
-TAGS-utils: \
-    configure-utils 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 TAGS) \
-         || exit 1
-
-@endif utils
-
-.PHONY: maybe-install-info-utils install-info-utils
-maybe-install-info-utils:
-@if utils
-maybe-install-info-utils: install-info-utils
-
-install-info-utils: \
-    configure-utils \
-    info-utils 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 install-info) \
-         || exit 1
-
-@endif utils
-
-.PHONY: maybe-install-pdf-utils install-pdf-utils
-maybe-install-pdf-utils:
-@if utils
-maybe-install-pdf-utils: install-pdf-utils
-
-install-pdf-utils: \
-    configure-utils \
-    pdf-utils 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 install-pdf) \
-         || exit 1
-
-@endif utils
-
-.PHONY: maybe-install-html-utils install-html-utils
-maybe-install-html-utils:
-@if utils
-maybe-install-html-utils: install-html-utils
-
-install-html-utils: \
-    configure-utils \
-    html-utils 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 install-html) \
-         || exit 1
-
-@endif utils
-
-.PHONY: maybe-installcheck-utils installcheck-utils
-maybe-installcheck-utils:
-@if utils
-maybe-installcheck-utils: installcheck-utils
-
-installcheck-utils: \
-    configure-utils 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 installcheck) \
-         || exit 1
-
-@endif utils
-
-.PHONY: maybe-mostlyclean-utils mostlyclean-utils
-maybe-mostlyclean-utils:
-@if utils
-maybe-mostlyclean-utils: mostlyclean-utils
-
-mostlyclean-utils: 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 mostlyclean) \
-         || exit 1
-
-@endif utils
-
-.PHONY: maybe-clean-utils clean-utils
-maybe-clean-utils:
-@if utils
-maybe-clean-utils: clean-utils
-
-clean-utils: 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 clean) \
-         || exit 1
-
-@endif utils
-
-.PHONY: maybe-distclean-utils distclean-utils
-maybe-distclean-utils:
-@if utils
-maybe-distclean-utils: distclean-utils
-
-distclean-utils: 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 distclean) \
-         || exit 1
-
-@endif utils
-
-.PHONY: maybe-maintainer-clean-utils maintainer-clean-utils
-maybe-maintainer-clean-utils:
-@if utils
-maybe-maintainer-clean-utils: maintainer-clean-utils
-
-maintainer-clean-utils: 
-       @: $(MAKE); $(unstage)
-       @[ -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 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
-
-
-
-.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: 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
-       @: $(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
-
-
-
-
-.PHONY: check-gnattools maybe-check-gnattools
-maybe-check-gnattools:
-@if gnattools
-maybe-check-gnattools: check-gnattools
-
-check-gnattools:
-       @: $(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)
-
-@endif gnattools
-
-.PHONY: install-gnattools maybe-install-gnattools
-maybe-install-gnattools:
-@if gnattools
-maybe-install-gnattools: install-gnattools
-
-install-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)
-
-@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-gnattools info-gnattools
-maybe-info-gnattools:
-@if gnattools
-maybe-info-gnattools: info-gnattools
-
-info-gnattools: \
-    configure-gnattools 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 info) \
-         || exit 1
-
-@endif gnattools
-
-.PHONY: maybe-dvi-gnattools dvi-gnattools
-maybe-dvi-gnattools:
-@if gnattools
-maybe-dvi-gnattools: dvi-gnattools
-
-dvi-gnattools: \
-    configure-gnattools 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 dvi) \
-         || exit 1
-
-@endif gnattools
-
-.PHONY: maybe-pdf-gnattools pdf-gnattools
-maybe-pdf-gnattools:
-@if gnattools
-maybe-pdf-gnattools: pdf-gnattools
-
-pdf-gnattools: \
-    configure-gnattools 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 pdf) \
-         || exit 1
-
-@endif gnattools
-
-.PHONY: maybe-html-gnattools html-gnattools
-maybe-html-gnattools:
-@if gnattools
-maybe-html-gnattools: html-gnattools
-
-html-gnattools: \
-    configure-gnattools 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 html) \
-         || exit 1
-
-@endif gnattools
-
-.PHONY: maybe-TAGS-gnattools TAGS-gnattools
-maybe-TAGS-gnattools:
-@if gnattools
-maybe-TAGS-gnattools: TAGS-gnattools
-
-TAGS-gnattools: \
-    configure-gnattools 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 TAGS) \
-         || exit 1
-
-@endif gnattools
-
-.PHONY: maybe-install-info-gnattools install-info-gnattools
-maybe-install-info-gnattools:
-@if gnattools
-maybe-install-info-gnattools: install-info-gnattools
-
-install-info-gnattools: \
-    configure-gnattools \
-    info-gnattools 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 install-info) \
-         || exit 1
-
-@endif gnattools
-
-.PHONY: maybe-install-pdf-gnattools install-pdf-gnattools
-maybe-install-pdf-gnattools:
-@if gnattools
-maybe-install-pdf-gnattools: install-pdf-gnattools
-
-install-pdf-gnattools: \
-    configure-gnattools \
-    pdf-gnattools 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 install-pdf) \
-         || exit 1
-
-@endif gnattools
-
-.PHONY: maybe-install-html-gnattools install-html-gnattools
-maybe-install-html-gnattools:
-@if gnattools
-maybe-install-html-gnattools: install-html-gnattools
-
-install-html-gnattools: \
-    configure-gnattools \
-    html-gnattools 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 install-html) \
-         || exit 1
-
-@endif gnattools
-
-.PHONY: maybe-installcheck-gnattools installcheck-gnattools
-maybe-installcheck-gnattools:
-@if gnattools
-maybe-installcheck-gnattools: installcheck-gnattools
-
-installcheck-gnattools: \
-    configure-gnattools 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 installcheck) \
-         || exit 1
-
-@endif gnattools
-
-.PHONY: maybe-mostlyclean-gnattools mostlyclean-gnattools
-maybe-mostlyclean-gnattools:
-@if gnattools
-maybe-mostlyclean-gnattools: mostlyclean-gnattools
-
-mostlyclean-gnattools: 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 mostlyclean) \
-         || exit 1
-
-@endif gnattools
-
-.PHONY: maybe-clean-gnattools clean-gnattools
-maybe-clean-gnattools:
-@if gnattools
-maybe-clean-gnattools: clean-gnattools
-
-clean-gnattools: 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 clean) \
-         || exit 1
-
-@endif gnattools
-
-.PHONY: maybe-distclean-gnattools distclean-gnattools
-maybe-distclean-gnattools:
-@if gnattools
-maybe-distclean-gnattools: distclean-gnattools
-
-distclean-gnattools: 
-       @: $(MAKE); $(unstage)
-       @[ -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 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}" \
-                 distclean) \
-         || exit 1
-
-@endif gnattools
-
-.PHONY: maybe-maintainer-clean-gnattools maintainer-clean-gnattools
-maybe-maintainer-clean-gnattools:
-@if gnattools
-maybe-maintainer-clean-gnattools: maintainer-clean-gnattools
-
-maintainer-clean-gnattools: 
-       @: $(MAKE); $(unstage)
-       @[ -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 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; \
-       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
-       libsrcdir="$$s/lto-plugin"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} --enable-shared \
-         || 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; \
-       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
-       libsrcdir="$$s/lto-plugin"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         $(STAGE1_CONFIGURE_FLAGS) \
-         --enable-shared
-@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; \
-       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
-       libsrcdir="$$s/lto-plugin"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE2_CONFIGURE_FLAGS) \
-         --enable-shared
-@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; \
-       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
-       libsrcdir="$$s/lto-plugin"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE3_CONFIGURE_FLAGS) \
-         --enable-shared
-@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; \
-       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
-       libsrcdir="$$s/lto-plugin"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE4_CONFIGURE_FLAGS) \
-         --enable-shared
-@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; \
-       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
-       libsrcdir="$$s/lto-plugin"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEprofile_CONFIGURE_FLAGS) \
-         --enable-shared
-@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; \
-       srcdiroption="--srcdir=$${topdir}/lto-plugin"; \
-       libsrcdir="$$s/lto-plugin"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGEfeedback_CONFIGURE_FLAGS) \
-         --enable-shared
-@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)  \
-               $(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)   \
-               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)  \
-                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)  \
-               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)  \
-                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)  \
-               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)  \
-                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)  \
-               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)  \
-                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)  \
-               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)  \
-                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)  \
-               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)  \
-                clean
-@endif lto-plugin-bootstrap
-
-
-
-
-
-.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; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(FLAGS_TO_PASS)  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
-
-install-lto-plugin: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif lto-plugin
-
-.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-strip-lto-plugin: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif lto-plugin
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-lto-plugin info-lto-plugin
-maybe-info-lto-plugin:
-@if lto-plugin
-maybe-info-lto-plugin: info-lto-plugin
-
-info-lto-plugin: \
-    configure-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing info in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 info) \
-         || exit 1
-
-@endif lto-plugin
-
-.PHONY: maybe-dvi-lto-plugin dvi-lto-plugin
-maybe-dvi-lto-plugin:
-@if lto-plugin
-maybe-dvi-lto-plugin: dvi-lto-plugin
-
-dvi-lto-plugin: \
-    configure-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing dvi in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 dvi) \
-         || exit 1
-
-@endif lto-plugin
-
-.PHONY: maybe-pdf-lto-plugin pdf-lto-plugin
-maybe-pdf-lto-plugin:
-@if lto-plugin
-maybe-pdf-lto-plugin: pdf-lto-plugin
-
-pdf-lto-plugin: \
-    configure-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing pdf in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 pdf) \
-         || exit 1
-
-@endif lto-plugin
-
-.PHONY: maybe-html-lto-plugin html-lto-plugin
-maybe-html-lto-plugin:
-@if lto-plugin
-maybe-html-lto-plugin: html-lto-plugin
-
-html-lto-plugin: \
-    configure-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing html in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 html) \
-         || exit 1
-
-@endif lto-plugin
-
-.PHONY: maybe-TAGS-lto-plugin TAGS-lto-plugin
-maybe-TAGS-lto-plugin:
-@if lto-plugin
-maybe-TAGS-lto-plugin: TAGS-lto-plugin
-
-TAGS-lto-plugin: \
-    configure-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing TAGS in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 TAGS) \
-         || exit 1
-
-@endif lto-plugin
-
-.PHONY: maybe-install-info-lto-plugin install-info-lto-plugin
-maybe-install-info-lto-plugin:
-@if lto-plugin
-maybe-install-info-lto-plugin: install-info-lto-plugin
-
-install-info-lto-plugin: \
-    configure-lto-plugin \
-    info-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing install-info in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-info) \
-         || exit 1
-
-@endif lto-plugin
-
-.PHONY: maybe-install-pdf-lto-plugin install-pdf-lto-plugin
-maybe-install-pdf-lto-plugin:
-@if lto-plugin
-maybe-install-pdf-lto-plugin: install-pdf-lto-plugin
-
-install-pdf-lto-plugin: \
-    configure-lto-plugin \
-    pdf-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing install-pdf in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-pdf) \
-         || exit 1
-
-@endif lto-plugin
-
-.PHONY: maybe-install-html-lto-plugin install-html-lto-plugin
-maybe-install-html-lto-plugin:
-@if lto-plugin
-maybe-install-html-lto-plugin: install-html-lto-plugin
-
-install-html-lto-plugin: \
-    configure-lto-plugin \
-    html-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing install-html in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 install-html) \
-         || exit 1
-
-@endif lto-plugin
-
-.PHONY: maybe-installcheck-lto-plugin installcheck-lto-plugin
-maybe-installcheck-lto-plugin:
-@if lto-plugin
-maybe-installcheck-lto-plugin: installcheck-lto-plugin
-
-installcheck-lto-plugin: \
-    configure-lto-plugin 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing installcheck in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 installcheck) \
-         || exit 1
-
-@endif lto-plugin
-
-.PHONY: maybe-mostlyclean-lto-plugin mostlyclean-lto-plugin
-maybe-mostlyclean-lto-plugin:
-@if lto-plugin
-maybe-mostlyclean-lto-plugin: mostlyclean-lto-plugin
-
-mostlyclean-lto-plugin: 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing mostlyclean in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 mostlyclean) \
-         || exit 1
-
-@endif lto-plugin
-
-.PHONY: maybe-clean-lto-plugin clean-lto-plugin
-maybe-clean-lto-plugin:
-@if lto-plugin
-maybe-clean-lto-plugin: clean-lto-plugin
-
-clean-lto-plugin: 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing clean in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 clean) \
-         || exit 1
-
-@endif lto-plugin
-
-.PHONY: maybe-distclean-lto-plugin distclean-lto-plugin
-maybe-distclean-lto-plugin:
-@if lto-plugin
-maybe-distclean-lto-plugin: distclean-lto-plugin
-
-distclean-lto-plugin: 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing distclean in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 distclean) \
-         || exit 1
-
-@endif lto-plugin
-
-.PHONY: maybe-maintainer-clean-lto-plugin maintainer-clean-lto-plugin
-maybe-maintainer-clean-lto-plugin:
-@if lto-plugin
-maybe-maintainer-clean-lto-plugin: maintainer-clean-lto-plugin
-
-maintainer-clean-lto-plugin: 
-       @[ -f ./lto-plugin/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       echo "Doing maintainer-clean in lto-plugin" ; \
-       (cd $(HOST_SUBDIR)/lto-plugin && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                 maintainer-clean) \
-         || exit 1
-
-@endif lto-plugin
-
-
-
-# ---------------------------------------
-# Modules which run on the target machine
-# ---------------------------------------
-
-
-
-
-.PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3
-maybe-configure-target-libstdc++-v3:
-@if gcc-bootstrap
-configure-target-libstdc++-v3: stage_current
-@endif gcc-bootstrap
-@if target-libstdc++-v3
-maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3
-configure-target-libstdc++-v3: 
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for libstdc++-v3..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       $(RAW_CXX_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
-       cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-       libsrcdir="$$s/libstdc++-v3"; \
-       rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption}  \
-         || exit 1
-@endif target-libstdc++-v3
-
-
-
-.PHONY: configure-stage1-target-libstdc++-v3 maybe-configure-stage1-target-libstdc++-v3
-maybe-configure-stage1-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3
-configure-stage1-target-libstdc++-v3:
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE1_TFLAGS)"; \
-       echo "Checking multilib configuration for libstdc++-v3..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-       libsrcdir="$$s/libstdc++-v3"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         $(STAGE1_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
-
-.PHONY: configure-stage2-target-libstdc++-v3 maybe-configure-stage2-target-libstdc++-v3
-maybe-configure-stage2-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stage2-target-libstdc++-v3: configure-stage2-target-libstdc++-v3
-configure-stage2-target-libstdc++-v3:
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
-       echo "Checking multilib configuration for libstdc++-v3..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-           mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-        \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-       cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-       libsrcdir="$$s/libstdc++-v3"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         --with-build-libsubdir=$(HOST_SUBDIR) \
-         $(STAGE2_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
-
-.PHONY: configure-stage3-target-libstdc++-v3 maybe-configure-stage3-target-libstdc++-v3
-maybe-configure-stage3-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stage3-target-libstdc++-v3: configure-stage3-target-libstdc++-v3
-configure-stage3-target-libstdc++-v3:
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
+.PHONY: 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)"; \
@@ -47245,464 +31093,7 @@ dvi-target-libmudflap: \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(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-libmudflap
-
-.PHONY: maybe-pdf-target-libmudflap pdf-target-libmudflap
-maybe-pdf-target-libmudflap:
-@if target-libmudflap
-maybe-pdf-target-libmudflap: pdf-target-libmudflap
-
-pdf-target-libmudflap: \
-    configure-target-libmudflap 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(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-libmudflap
-
-.PHONY: maybe-html-target-libmudflap html-target-libmudflap
-maybe-html-target-libmudflap:
-@if target-libmudflap
-maybe-html-target-libmudflap: html-target-libmudflap
-
-html-target-libmudflap: \
-    configure-target-libmudflap 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(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-libmudflap
-
-.PHONY: maybe-TAGS-target-libmudflap TAGS-target-libmudflap
-maybe-TAGS-target-libmudflap:
-@if target-libmudflap
-maybe-TAGS-target-libmudflap: TAGS-target-libmudflap
-
-TAGS-target-libmudflap: \
-    configure-target-libmudflap 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(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-libmudflap
-
-.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
-
-install-info-target-libmudflap: \
-    configure-target-libmudflap \
-    info-target-libmudflap 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(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-libmudflap
-
-.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
-
-install-pdf-target-libmudflap: \
-    configure-target-libmudflap \
-    pdf-target-libmudflap 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-pdf in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(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-libmudflap
-
-.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
-
-install-html-target-libmudflap: \
-    configure-target-libmudflap \
-    html-target-libmudflap 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-html in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(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-libmudflap
-
-.PHONY: maybe-installcheck-target-libmudflap installcheck-target-libmudflap
-maybe-installcheck-target-libmudflap:
-@if target-libmudflap
-maybe-installcheck-target-libmudflap: installcheck-target-libmudflap
-
-installcheck-target-libmudflap: \
-    configure-target-libmudflap 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  installcheck) \
-         || exit 1
-
-@endif target-libmudflap
-
-.PHONY: maybe-mostlyclean-target-libmudflap mostlyclean-target-libmudflap
-maybe-mostlyclean-target-libmudflap:
-@if target-libmudflap
-maybe-mostlyclean-target-libmudflap: mostlyclean-target-libmudflap
-
-mostlyclean-target-libmudflap: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(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-libmudflap
-
-.PHONY: maybe-clean-target-libmudflap clean-target-libmudflap
-maybe-clean-target-libmudflap:
-@if target-libmudflap
-maybe-clean-target-libmudflap: clean-target-libmudflap
-
-clean-target-libmudflap: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(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-libmudflap
-
-.PHONY: maybe-distclean-target-libmudflap distclean-target-libmudflap
-maybe-distclean-target-libmudflap:
-@if target-libmudflap
-maybe-distclean-target-libmudflap: distclean-target-libmudflap
-
-distclean-target-libmudflap: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(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-libmudflap
-
-.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
-
-maintainer-clean-target-libmudflap: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libmudflap" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libmudflap && \
-         $(MAKE) $(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-libmudflap
-
-
-
-
-
-.PHONY: configure-target-libssp maybe-configure-target-libssp
-maybe-configure-target-libssp:
-@if gcc-bootstrap
-configure-target-libssp: stage_current
-@endif gcc-bootstrap
-@if target-libssp
-maybe-configure-target-libssp: configure-target-libssp
-configure-target-libssp: 
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for libssp..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libssp/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libssp/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libssp/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libssp/Makefile; \
-           mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \
-         fi; \
-       else \
-         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)  \
-       echo Configuring in $(TARGET_SUBDIR)/libssp; \
-       cd "$(TARGET_SUBDIR)/libssp" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libssp/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libssp"; \
-       libsrcdir="$$s/libssp"; \
-       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-libssp
-
-
-
-
-
-.PHONY: all-target-libssp maybe-all-target-libssp
-maybe-all-target-libssp:
-@if gcc-bootstrap
-all-target-libssp: stage_current
-@endif gcc-bootstrap
-@if target-libssp
-TARGET-target-libssp=all
-maybe-all-target-libssp: all-target-libssp
-all-target-libssp: configure-target-libssp
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libssp && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libssp))
-@endif target-libssp
-
-
-
-
-
-.PHONY: check-target-libssp maybe-check-target-libssp
-maybe-check-target-libssp:
-@if target-libssp
-maybe-check-target-libssp: check-target-libssp
-
-check-target-libssp:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libssp && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-libssp
-
-.PHONY: install-target-libssp maybe-install-target-libssp
-maybe-install-target-libssp:
-@if target-libssp
-maybe-install-target-libssp: install-target-libssp
-
-install-target-libssp: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libssp && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-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
-maybe-info-target-libssp:
-@if target-libssp
-maybe-info-target-libssp: info-target-libssp
-
-info-target-libssp: \
-    configure-target-libssp 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libssp" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  info) \
-         || exit 1
-
-@endif target-libssp
-
-.PHONY: maybe-dvi-target-libssp dvi-target-libssp
-maybe-dvi-target-libssp:
-@if target-libssp
-maybe-dvi-target-libssp: dvi-target-libssp
-
-dvi-target-libssp: \
-    configure-target-libssp 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libssp" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47710,25 +31101,25 @@ dvi-target-libssp: \
                   dvi) \
          || exit 1
 
-@endif target-libssp
+@endif target-libmudflap
 
-.PHONY: maybe-pdf-target-libssp pdf-target-libssp
-maybe-pdf-target-libssp:
-@if target-libssp
-maybe-pdf-target-libssp: pdf-target-libssp
+.PHONY: maybe-pdf-target-libmudflap pdf-target-libmudflap
+maybe-pdf-target-libmudflap:
+@if target-libmudflap
+maybe-pdf-target-libmudflap: pdf-target-libmudflap
 
-pdf-target-libssp: \
-    configure-target-libssp 
+pdf-target-libmudflap: \
+    configure-target-libmudflap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmudflap/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)/libmudflap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47736,25 +31127,25 @@ pdf-target-libssp: \
                   pdf) \
          || exit 1
 
-@endif target-libssp
+@endif target-libmudflap
 
-.PHONY: maybe-html-target-libssp html-target-libssp
-maybe-html-target-libssp:
-@if target-libssp
-maybe-html-target-libssp: html-target-libssp
+.PHONY: maybe-html-target-libmudflap html-target-libmudflap
+maybe-html-target-libmudflap:
+@if target-libmudflap
+maybe-html-target-libmudflap: html-target-libmudflap
 
-html-target-libssp: \
-    configure-target-libssp 
+html-target-libmudflap: \
+    configure-target-libmudflap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmudflap/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)/libmudflap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47762,25 +31153,25 @@ html-target-libssp: \
                   html) \
          || exit 1
 
-@endif target-libssp
+@endif target-libmudflap
 
-.PHONY: maybe-TAGS-target-libssp TAGS-target-libssp
-maybe-TAGS-target-libssp:
-@if target-libssp
-maybe-TAGS-target-libssp: TAGS-target-libssp
+.PHONY: maybe-TAGS-target-libmudflap TAGS-target-libmudflap
+maybe-TAGS-target-libmudflap:
+@if target-libmudflap
+maybe-TAGS-target-libmudflap: TAGS-target-libmudflap
 
-TAGS-target-libssp: \
-    configure-target-libssp 
+TAGS-target-libmudflap: \
+    configure-target-libmudflap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmudflap/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)/libmudflap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47788,26 +31179,26 @@ TAGS-target-libssp: \
                   TAGS) \
          || exit 1
 
-@endif target-libssp
+@endif target-libmudflap
 
-.PHONY: maybe-install-info-target-libssp install-info-target-libssp
-maybe-install-info-target-libssp:
-@if target-libssp
-maybe-install-info-target-libssp: install-info-target-libssp
+.PHONY: maybe-install-info-target-libmudflap install-info-target-libmudflap
+maybe-install-info-target-libmudflap:
+@if target-libmudflap
+maybe-install-info-target-libmudflap: install-info-target-libmudflap
 
-install-info-target-libssp: \
-    configure-target-libssp \
-    info-target-libssp 
+install-info-target-libmudflap: \
+    configure-target-libmudflap \
+    info-target-libmudflap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmudflap/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)/libmudflap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47815,26 +31206,26 @@ install-info-target-libssp: \
                   install-info) \
          || exit 1
 
-@endif target-libssp
+@endif target-libmudflap
 
-.PHONY: maybe-install-pdf-target-libssp install-pdf-target-libssp
-maybe-install-pdf-target-libssp:
-@if target-libssp
-maybe-install-pdf-target-libssp: install-pdf-target-libssp
+.PHONY: maybe-install-pdf-target-libmudflap install-pdf-target-libmudflap
+maybe-install-pdf-target-libmudflap:
+@if target-libmudflap
+maybe-install-pdf-target-libmudflap: install-pdf-target-libmudflap
 
-install-pdf-target-libssp: \
-    configure-target-libssp \
-    pdf-target-libssp 
+install-pdf-target-libmudflap: \
+    configure-target-libmudflap \
+    pdf-target-libmudflap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmudflap/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)/libmudflap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47842,26 +31233,26 @@ install-pdf-target-libssp: \
                   install-pdf) \
          || exit 1
 
-@endif target-libssp
+@endif target-libmudflap
 
-.PHONY: maybe-install-html-target-libssp install-html-target-libssp
-maybe-install-html-target-libssp:
-@if target-libssp
-maybe-install-html-target-libssp: install-html-target-libssp
+.PHONY: maybe-install-html-target-libmudflap install-html-target-libmudflap
+maybe-install-html-target-libmudflap:
+@if target-libmudflap
+maybe-install-html-target-libmudflap: install-html-target-libmudflap
 
-install-html-target-libssp: \
-    configure-target-libssp \
-    html-target-libssp 
+install-html-target-libmudflap: \
+    configure-target-libmudflap \
+    html-target-libmudflap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmudflap/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)/libmudflap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47869,25 +31260,25 @@ install-html-target-libssp: \
                   install-html) \
          || exit 1
 
-@endif target-libssp
+@endif target-libmudflap
 
-.PHONY: maybe-installcheck-target-libssp installcheck-target-libssp
-maybe-installcheck-target-libssp:
-@if target-libssp
-maybe-installcheck-target-libssp: installcheck-target-libssp
+.PHONY: maybe-installcheck-target-libmudflap installcheck-target-libmudflap
+maybe-installcheck-target-libmudflap:
+@if target-libmudflap
+maybe-installcheck-target-libmudflap: installcheck-target-libmudflap
 
-installcheck-target-libssp: \
-    configure-target-libssp 
+installcheck-target-libmudflap: \
+    configure-target-libmudflap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmudflap/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)/libmudflap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47895,24 +31286,24 @@ installcheck-target-libssp: \
                   installcheck) \
          || exit 1
 
-@endif target-libssp
+@endif target-libmudflap
 
-.PHONY: maybe-mostlyclean-target-libssp mostlyclean-target-libssp
-maybe-mostlyclean-target-libssp:
-@if target-libssp
-maybe-mostlyclean-target-libssp: mostlyclean-target-libssp
+.PHONY: maybe-mostlyclean-target-libmudflap mostlyclean-target-libmudflap
+maybe-mostlyclean-target-libmudflap:
+@if target-libmudflap
+maybe-mostlyclean-target-libmudflap: mostlyclean-target-libmudflap
 
-mostlyclean-target-libssp: 
+mostlyclean-target-libmudflap: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmudflap/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)/libmudflap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47920,24 +31311,24 @@ mostlyclean-target-libssp:
                   mostlyclean) \
          || exit 1
 
-@endif target-libssp
+@endif target-libmudflap
 
-.PHONY: maybe-clean-target-libssp clean-target-libssp
-maybe-clean-target-libssp:
-@if target-libssp
-maybe-clean-target-libssp: clean-target-libssp
+.PHONY: maybe-clean-target-libmudflap clean-target-libmudflap
+maybe-clean-target-libmudflap:
+@if target-libmudflap
+maybe-clean-target-libmudflap: clean-target-libmudflap
 
-clean-target-libssp: 
+clean-target-libmudflap: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmudflap/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)/libmudflap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47945,24 +31336,24 @@ clean-target-libssp:
                   clean) \
          || exit 1
 
-@endif target-libssp
+@endif target-libmudflap
 
-.PHONY: maybe-distclean-target-libssp distclean-target-libssp
-maybe-distclean-target-libssp:
-@if target-libssp
-maybe-distclean-target-libssp: distclean-target-libssp
+.PHONY: maybe-distclean-target-libmudflap distclean-target-libmudflap
+maybe-distclean-target-libmudflap:
+@if target-libmudflap
+maybe-distclean-target-libmudflap: distclean-target-libmudflap
 
-distclean-target-libssp: 
+distclean-target-libmudflap: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmudflap/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)/libmudflap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47970,24 +31361,24 @@ distclean-target-libssp:
                   distclean) \
          || exit 1
 
-@endif target-libssp
+@endif target-libmudflap
 
-.PHONY: maybe-maintainer-clean-target-libssp maintainer-clean-target-libssp
-maybe-maintainer-clean-target-libssp:
-@if target-libssp
-maybe-maintainer-clean-target-libssp: maintainer-clean-target-libssp
+.PHONY: maybe-maintainer-clean-target-libmudflap maintainer-clean-target-libmudflap
+maybe-maintainer-clean-target-libmudflap:
+@if target-libmudflap
+maybe-maintainer-clean-target-libmudflap: maintainer-clean-target-libmudflap
 
-maintainer-clean-target-libssp: 
+maintainer-clean-target-libmudflap: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libmudflap/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)/libmudflap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libssp && \
+       (cd $(TARGET_SUBDIR)/libmudflap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -47995,145 +31386,145 @@ maintainer-clean-target-libssp:
                   maintainer-clean) \
          || exit 1
 
-@endif target-libssp
+@endif target-libmudflap
 
 
 
 
 
-.PHONY: configure-target-newlib maybe-configure-target-newlib
-maybe-configure-target-newlib:
+.PHONY: configure-target-libssp maybe-configure-target-libssp
+maybe-configure-target-libssp:
 @if gcc-bootstrap
-configure-target-newlib: stage_current
+configure-target-libssp: stage_current
 @endif gcc-bootstrap
-@if target-newlib
-maybe-configure-target-newlib: configure-target-newlib
-configure-target-newlib: 
+@if target-libssp
+maybe-configure-target-libssp: configure-target-libssp
+configure-target-libssp: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for newlib..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/newlib/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/newlib/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/newlib/multilib.tmp; \
+       echo "Checking multilib configuration for libssp..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libssp/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libssp/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libssp/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/newlib/Makefile; \
-           mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libssp/Makefile; \
+           mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \
+         mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
+       test ! -f $(TARGET_SUBDIR)/libssp/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \
        $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/newlib; \
-       cd "$(TARGET_SUBDIR)/newlib" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/libssp; \
+       cd "$(TARGET_SUBDIR)/libssp" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/newlib/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libssp/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/newlib"; \
-       libsrcdir="$$s/newlib"; \
+       srcdiroption="--srcdir=$${topdir}/libssp"; \
+       libsrcdir="$$s/libssp"; \
        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-newlib
+@endif target-libssp
 
 
 
 
 
-.PHONY: all-target-newlib maybe-all-target-newlib
-maybe-all-target-newlib:
+.PHONY: all-target-libssp maybe-all-target-libssp
+maybe-all-target-libssp:
 @if gcc-bootstrap
-all-target-newlib: stage_current
+all-target-libssp: stage_current
 @endif gcc-bootstrap
-@if target-newlib
-TARGET-target-newlib=all
-maybe-all-target-newlib: all-target-newlib
-all-target-newlib: configure-target-newlib
+@if target-libssp
+TARGET-target-libssp=all
+maybe-all-target-libssp: all-target-libssp
+all-target-libssp: configure-target-libssp
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libssp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-newlib))
-@endif target-newlib
+               $(TARGET-target-libssp))
+@endif target-libssp
 
 
 
 
 
-.PHONY: check-target-newlib maybe-check-target-newlib
-maybe-check-target-newlib:
-@if target-newlib
-maybe-check-target-newlib: check-target-newlib
+.PHONY: check-target-libssp maybe-check-target-libssp
+maybe-check-target-libssp:
+@if target-libssp
+maybe-check-target-libssp: check-target-libssp
 
-check-target-newlib:
+check-target-libssp:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libssp && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
-@endif target-newlib
+@endif target-libssp
 
-.PHONY: install-target-newlib maybe-install-target-newlib
-maybe-install-target-newlib:
-@if target-newlib
-maybe-install-target-newlib: install-target-newlib
+.PHONY: install-target-libssp maybe-install-target-libssp
+maybe-install-target-libssp:
+@if target-libssp
+maybe-install-target-libssp: install-target-libssp
 
-install-target-newlib: installdirs
+install-target-libssp: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libssp && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-newlib
+@endif target-libssp
 
-.PHONY: install-strip-target-newlib maybe-install-strip-target-newlib
-maybe-install-strip-target-newlib:
-@if target-newlib
-maybe-install-strip-target-newlib: install-strip-target-newlib
+.PHONY: install-strip-target-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-newlib: installdirs
+install-strip-target-libssp: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libssp && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif target-newlib
+@endif target-libssp
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-target-newlib info-target-newlib
-maybe-info-target-newlib:
-@if target-newlib
-maybe-info-target-newlib: info-target-newlib
+.PHONY: maybe-info-target-libssp info-target-libssp
+maybe-info-target-libssp:
+@if target-libssp
+maybe-info-target-libssp: info-target-libssp
 
-info-target-newlib: \
-    configure-target-newlib 
+info-target-libssp: \
+    configure-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/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)/newlib" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libssp" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libssp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48141,25 +31532,25 @@ info-target-newlib: \
                   info) \
          || exit 1
 
-@endif target-newlib
+@endif target-libssp
 
-.PHONY: maybe-dvi-target-newlib dvi-target-newlib
-maybe-dvi-target-newlib:
-@if target-newlib
-maybe-dvi-target-newlib: dvi-target-newlib
+.PHONY: maybe-dvi-target-libssp dvi-target-libssp
+maybe-dvi-target-libssp:
+@if target-libssp
+maybe-dvi-target-libssp: dvi-target-libssp
 
-dvi-target-newlib: \
-    configure-target-newlib 
+dvi-target-libssp: \
+    configure-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/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)/newlib" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libssp" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libssp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48167,25 +31558,25 @@ dvi-target-newlib: \
                   dvi) \
          || exit 1
 
-@endif target-newlib
+@endif target-libssp
 
-.PHONY: maybe-pdf-target-newlib pdf-target-newlib
-maybe-pdf-target-newlib:
-@if target-newlib
-maybe-pdf-target-newlib: pdf-target-newlib
+.PHONY: maybe-pdf-target-libssp pdf-target-libssp
+maybe-pdf-target-libssp:
+@if target-libssp
+maybe-pdf-target-libssp: pdf-target-libssp
 
-pdf-target-newlib: \
-    configure-target-newlib 
+pdf-target-libssp: \
+    configure-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/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)/newlib" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libssp" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libssp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -48193,925 +31584,404 @@ pdf-target-newlib: \
                   pdf) \
          || exit 1
 
-@endif target-newlib
-
-.PHONY: maybe-html-target-newlib html-target-newlib
-maybe-html-target-newlib:
-@if target-newlib
-maybe-html-target-newlib: html-target-newlib
-
-html-target-newlib: \
-    configure-target-newlib 
-       @: $(MAKE); $(unstage)
-       @[ -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" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
-         $(MAKE) $(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-newlib
-
-.PHONY: maybe-TAGS-target-newlib TAGS-target-newlib
-maybe-TAGS-target-newlib:
-@if target-newlib
-maybe-TAGS-target-newlib: TAGS-target-newlib
-
-TAGS-target-newlib: \
-    configure-target-newlib 
-       @: $(MAKE); $(unstage)
-       @[ -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" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
-         $(MAKE) $(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-newlib
-
-.PHONY: maybe-install-info-target-newlib install-info-target-newlib
-maybe-install-info-target-newlib:
-@if target-newlib
-maybe-install-info-target-newlib: install-info-target-newlib
-
-install-info-target-newlib: \
-    configure-target-newlib \
-    info-target-newlib 
-       @: $(MAKE); $(unstage)
-       @[ -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" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
-         $(MAKE) $(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-newlib
-
-.PHONY: maybe-install-pdf-target-newlib install-pdf-target-newlib
-maybe-install-pdf-target-newlib:
-@if target-newlib
-maybe-install-pdf-target-newlib: install-pdf-target-newlib
-
-install-pdf-target-newlib: \
-    configure-target-newlib \
-    pdf-target-newlib 
-       @: $(MAKE); $(unstage)
-       @[ -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" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
-         $(MAKE) $(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-newlib
+@endif target-libssp
 
-.PHONY: maybe-install-html-target-newlib install-html-target-newlib
-maybe-install-html-target-newlib:
-@if target-newlib
-maybe-install-html-target-newlib: install-html-target-newlib
+.PHONY: maybe-html-target-libssp html-target-libssp
+maybe-html-target-libssp:
+@if target-libssp
+maybe-html-target-libssp: html-target-libssp
 
-install-html-target-newlib: \
-    configure-target-newlib \
-    html-target-newlib 
+html-target-libssp: \
+    configure-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/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)/newlib" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libssp" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libssp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  install-html) \
+                  html) \
          || exit 1
 
-@endif target-newlib
+@endif target-libssp
 
-.PHONY: maybe-installcheck-target-newlib installcheck-target-newlib
-maybe-installcheck-target-newlib:
-@if target-newlib
-maybe-installcheck-target-newlib: installcheck-target-newlib
+.PHONY: maybe-TAGS-target-libssp TAGS-target-libssp
+maybe-TAGS-target-libssp:
+@if target-libssp
+maybe-TAGS-target-libssp: TAGS-target-libssp
 
-installcheck-target-newlib: \
-    configure-target-newlib 
+TAGS-target-libssp: \
+    configure-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/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)/newlib" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libssp" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libssp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  installcheck) \
+                  TAGS) \
          || exit 1
 
-@endif target-newlib
+@endif target-libssp
 
-.PHONY: maybe-mostlyclean-target-newlib mostlyclean-target-newlib
-maybe-mostlyclean-target-newlib:
-@if target-newlib
-maybe-mostlyclean-target-newlib: mostlyclean-target-newlib
+.PHONY: maybe-install-info-target-libssp install-info-target-libssp
+maybe-install-info-target-libssp:
+@if target-libssp
+maybe-install-info-target-libssp: install-info-target-libssp
 
-mostlyclean-target-newlib: 
+install-info-target-libssp: \
+    configure-target-libssp \
+    info-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/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)/newlib" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libssp" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libssp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  mostlyclean) \
+                  install-info) \
          || exit 1
 
-@endif target-newlib
+@endif target-libssp
 
-.PHONY: maybe-clean-target-newlib clean-target-newlib
-maybe-clean-target-newlib:
-@if target-newlib
-maybe-clean-target-newlib: clean-target-newlib
+.PHONY: maybe-install-pdf-target-libssp install-pdf-target-libssp
+maybe-install-pdf-target-libssp:
+@if target-libssp
+maybe-install-pdf-target-libssp: install-pdf-target-libssp
 
-clean-target-newlib: 
+install-pdf-target-libssp: \
+    configure-target-libssp \
+    pdf-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/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)/newlib" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libssp" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libssp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  clean) \
+                  install-pdf) \
          || exit 1
 
-@endif target-newlib
+@endif target-libssp
 
-.PHONY: maybe-distclean-target-newlib distclean-target-newlib
-maybe-distclean-target-newlib:
-@if target-newlib
-maybe-distclean-target-newlib: distclean-target-newlib
+.PHONY: maybe-install-html-target-libssp install-html-target-libssp
+maybe-install-html-target-libssp:
+@if target-libssp
+maybe-install-html-target-libssp: install-html-target-libssp
 
-distclean-target-newlib: 
+install-html-target-libssp: \
+    configure-target-libssp \
+    html-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/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)/newlib" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libssp" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libssp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  distclean) \
+                  install-html) \
          || exit 1
 
-@endif target-newlib
+@endif target-libssp
 
-.PHONY: maybe-maintainer-clean-target-newlib maintainer-clean-target-newlib
-maybe-maintainer-clean-target-newlib:
-@if target-newlib
-maybe-maintainer-clean-target-newlib: maintainer-clean-target-newlib
+.PHONY: maybe-installcheck-target-libssp installcheck-target-libssp
+maybe-installcheck-target-libssp:
+@if target-libssp
+maybe-installcheck-target-libssp: installcheck-target-libssp
 
-maintainer-clean-target-newlib: 
+installcheck-target-libssp: \
+    configure-target-libssp 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/newlib/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)/newlib" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libssp" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/newlib && \
+       (cd $(TARGET_SUBDIR)/libssp && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  maintainer-clean) \
-         || exit 1
-
-@endif target-newlib
-
-
-
-
-
-.PHONY: configure-target-libgcc maybe-configure-target-libgcc
-maybe-configure-target-libgcc:
-@if gcc-bootstrap
-configure-target-libgcc: stage_current
-@endif gcc-bootstrap
-@if target-libgcc
-maybe-configure-target-libgcc: configure-target-libgcc
-configure-target-libgcc: 
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for libgcc..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
-           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libgcc; \
-       cd "$(TARGET_SUBDIR)/libgcc" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       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}  \
+                  installcheck) \
          || exit 1
-@endif target-libgcc
-
-
-
-.PHONY: configure-stage1-target-libgcc maybe-configure-stage1-target-libgcc
-maybe-configure-stage1-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-configure-stage1-target-libgcc: configure-stage1-target-libgcc
-configure-stage1-target-libgcc:
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE1_TFLAGS)"; \
-       echo "Checking multilib configuration for libgcc..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
-           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
-       $(NORMAL_TARGET_EXPORTS) \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(TARGET_SUBDIR)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
-       cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libgcc"; \
-       libsrcdir="$$s/libgcc"; \
-       $(SHELL) $${libsrcdir}/configure \
-         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-         --target=${target_alias} $${srcdiroption} \
-         $(STAGE1_CONFIGURE_FLAGS)
-@endif target-libgcc-bootstrap
-
-.PHONY: configure-stage2-target-libgcc maybe-configure-stage2-target-libgcc
-maybe-configure-stage2-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-configure-stage2-target-libgcc: configure-stage2-target-libgcc
-configure-stage2-target-libgcc:
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
-       echo "Checking multilib configuration for libgcc..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
-           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
-       $(NORMAL_TARGET_EXPORTS) \
-        \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(TARGET_SUBDIR)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
-       cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       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_CONFIGURE_FLAGS)
-@endif target-libgcc-bootstrap
-
-.PHONY: configure-stage3-target-libgcc maybe-configure-stage3-target-libgcc
-maybe-configure-stage3-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-configure-stage3-target-libgcc: configure-stage3-target-libgcc
-configure-stage3-target-libgcc:
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE3_TFLAGS)"; \
-       echo "Checking multilib configuration for libgcc..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
-           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
-       $(NORMAL_TARGET_EXPORTS) \
-        \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(TARGET_SUBDIR)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
-       cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       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) \
-         $(STAGE3_CONFIGURE_FLAGS)
-@endif target-libgcc-bootstrap
-
-.PHONY: configure-stage4-target-libgcc maybe-configure-stage4-target-libgcc
-maybe-configure-stage4-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-configure-stage4-target-libgcc: configure-stage4-target-libgcc
-configure-stage4-target-libgcc:
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE4_TFLAGS)"; \
-       echo "Checking multilib configuration for libgcc..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
-           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
-       $(NORMAL_TARGET_EXPORTS) \
-        \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(TARGET_SUBDIR)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
-       cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       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) \
-         $(STAGE4_CONFIGURE_FLAGS)
-@endif target-libgcc-bootstrap
-
-.PHONY: configure-stageprofile-target-libgcc maybe-configure-stageprofile-target-libgcc
-maybe-configure-stageprofile-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-configure-stageprofile-target-libgcc: configure-stageprofile-target-libgcc
-configure-stageprofile-target-libgcc:
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEprofile_TFLAGS)"; \
-       echo "Checking multilib configuration for libgcc..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
-           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
-       $(NORMAL_TARGET_EXPORTS) \
-        \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(TARGET_SUBDIR)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
-       cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       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) \
-         $(STAGEprofile_CONFIGURE_FLAGS)
-@endif target-libgcc-bootstrap
-
-.PHONY: configure-stagefeedback-target-libgcc maybe-configure-stagefeedback-target-libgcc
-maybe-configure-stagefeedback-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-configure-stagefeedback-target-libgcc: configure-stagefeedback-target-libgcc
-configure-stagefeedback-target-libgcc:
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       echo "Checking multilib configuration for libgcc..."; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
-           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
-       $(NORMAL_TARGET_EXPORTS) \
-        \
-       CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-       CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(TARGET_SUBDIR)/libgcc ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
-       cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       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) \
-         $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif target-libgcc-bootstrap
-
-
-
-
-
-.PHONY: all-target-libgcc maybe-all-target-libgcc
-maybe-all-target-libgcc:
-@if gcc-bootstrap
-all-target-libgcc: stage_current
-@endif gcc-bootstrap
-@if target-libgcc
-TARGET-target-libgcc=all
-maybe-all-target-libgcc: all-target-libgcc
-all-target-libgcc: configure-target-libgcc
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libgcc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libgcc))
-@endif target-libgcc
-
-
-
-.PHONY: all-stage1-target-libgcc maybe-all-stage1-target-libgcc
-.PHONY: clean-stage1-target-libgcc maybe-clean-stage1-target-libgcc
-maybe-all-stage1-target-libgcc:
-maybe-clean-stage1-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-all-stage1-target-libgcc: all-stage1-target-libgcc
-all-stage1: all-stage1-target-libgcc
-TARGET-stage1-target-libgcc = $(TARGET-target-libgcc)
-all-stage1-target-libgcc: configure-stage1-target-libgcc
-       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE1_TFLAGS)"; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
-               $(TARGET-stage1-target-libgcc)
 
-maybe-clean-stage1-target-libgcc: clean-stage1-target-libgcc
-clean-stage1: clean-stage1-target-libgcc
-clean-stage1-target-libgcc:
-       @if [ $(current_stage) = stage1 ]; then \
-         [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
-       else \
-         [ -f $(TARGET_SUBDIR)/stage1-libgcc/Makefile ] || exit 0; \
-         $(MAKE) stage1-start; \
-       fi; \
-       cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                clean
-@endif target-libgcc-bootstrap
+@endif target-libssp
 
+.PHONY: maybe-mostlyclean-target-libssp mostlyclean-target-libssp
+maybe-mostlyclean-target-libssp:
+@if target-libssp
+maybe-mostlyclean-target-libssp: mostlyclean-target-libssp
 
-.PHONY: all-stage2-target-libgcc maybe-all-stage2-target-libgcc
-.PHONY: clean-stage2-target-libgcc maybe-clean-stage2-target-libgcc
-maybe-all-stage2-target-libgcc:
-maybe-clean-stage2-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-all-stage2-target-libgcc: all-stage2-target-libgcc
-all-stage2: all-stage2-target-libgcc
-TARGET-stage2-target-libgcc = $(TARGET-target-libgcc)
-all-stage2-target-libgcc: configure-stage2-target-libgcc
-       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-       @r=`${PWD_COMMAND}`; export r; \
+mostlyclean-target-libssp: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE2_TFLAGS)"; \
        $(NORMAL_TARGET_EXPORTS) \
-         \
-       cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGE2_TFLAGS)" \
-               $(TARGET-stage2-target-libgcc)
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libssp" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libssp && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  mostlyclean) \
+         || exit 1
 
-maybe-clean-stage2-target-libgcc: clean-stage2-target-libgcc
-clean-stage2: clean-stage2-target-libgcc
-clean-stage2-target-libgcc:
-       @if [ $(current_stage) = stage2 ]; then \
-         [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
-       else \
-         [ -f $(TARGET_SUBDIR)/stage2-libgcc/Makefile ] || exit 0; \
-         $(MAKE) stage2-start; \
-       fi; \
-       cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
-@endif target-libgcc-bootstrap
+@endif target-libssp
 
+.PHONY: maybe-clean-target-libssp clean-target-libssp
+maybe-clean-target-libssp:
+@if target-libssp
+maybe-clean-target-libssp: clean-target-libssp
 
-.PHONY: all-stage3-target-libgcc maybe-all-stage3-target-libgcc
-.PHONY: clean-stage3-target-libgcc maybe-clean-stage3-target-libgcc
-maybe-all-stage3-target-libgcc:
-maybe-clean-stage3-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-all-stage3-target-libgcc: all-stage3-target-libgcc
-all-stage3: all-stage3-target-libgcc
-TARGET-stage3-target-libgcc = $(TARGET-target-libgcc)
-all-stage3-target-libgcc: configure-stage3-target-libgcc
-       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-       @r=`${PWD_COMMAND}`; export r; \
+clean-target-libssp: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGE3_TFLAGS)"; \
        $(NORMAL_TARGET_EXPORTS) \
-         \
-       cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGE3_TFLAGS)" \
-               $(TARGET-stage3-target-libgcc)
+       echo "Doing clean in $(TARGET_SUBDIR)/libssp" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libssp && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  clean) \
+         || exit 1
 
-maybe-clean-stage3-target-libgcc: clean-stage3-target-libgcc
-clean-stage3: clean-stage3-target-libgcc
-clean-stage3-target-libgcc:
-       @if [ $(current_stage) = stage3 ]; then \
-         [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
-       else \
-         [ -f $(TARGET_SUBDIR)/stage3-libgcc/Makefile ] || exit 0; \
-         $(MAKE) stage3-start; \
-       fi; \
-       cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
-@endif target-libgcc-bootstrap
+@endif target-libssp
 
+.PHONY: maybe-distclean-target-libssp distclean-target-libssp
+maybe-distclean-target-libssp:
+@if target-libssp
+maybe-distclean-target-libssp: distclean-target-libssp
 
-.PHONY: all-stage4-target-libgcc maybe-all-stage4-target-libgcc
-.PHONY: clean-stage4-target-libgcc maybe-clean-stage4-target-libgcc
-maybe-all-stage4-target-libgcc:
-maybe-clean-stage4-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-all-stage4-target-libgcc: all-stage4-target-libgcc
-all-stage4: all-stage4-target-libgcc
-TARGET-stage4-target-libgcc = $(TARGET-target-libgcc)
-all-stage4-target-libgcc: configure-stage4-target-libgcc
-       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-       @r=`${PWD_COMMAND}`; export r; \
+distclean-target-libssp: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       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="$(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)
+       echo "Doing distclean in $(TARGET_SUBDIR)/libssp" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libssp && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  distclean) \
+         || exit 1
 
-maybe-clean-stage4-target-libgcc: clean-stage4-target-libgcc
-clean-stage4: clean-stage4-target-libgcc
-clean-stage4-target-libgcc:
-       @if [ $(current_stage) = stage4 ]; then \
-         [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
-       else \
-         [ -f $(TARGET_SUBDIR)/stage4-libgcc/Makefile ] || exit 0; \
-         $(MAKE) stage4-start; \
-       fi; \
-       cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
-@endif target-libgcc-bootstrap
+@endif target-libssp
 
+.PHONY: maybe-maintainer-clean-target-libssp maintainer-clean-target-libssp
+maybe-maintainer-clean-target-libssp:
+@if target-libssp
+maybe-maintainer-clean-target-libssp: maintainer-clean-target-libssp
 
-.PHONY: all-stageprofile-target-libgcc maybe-all-stageprofile-target-libgcc
-.PHONY: clean-stageprofile-target-libgcc maybe-clean-stageprofile-target-libgcc
-maybe-all-stageprofile-target-libgcc:
-maybe-clean-stageprofile-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-all-stageprofile-target-libgcc: all-stageprofile-target-libgcc
-all-stageprofile: all-stageprofile-target-libgcc
-TARGET-stageprofile-target-libgcc = $(TARGET-target-libgcc)
-all-stageprofile-target-libgcc: configure-stageprofile-target-libgcc
-       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-       @r=`${PWD_COMMAND}`; export r; \
+maintainer-clean-target-libssp: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEprofile_TFLAGS)"; \
        $(NORMAL_TARGET_EXPORTS) \
-         \
-       cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
-               $(TARGET-stageprofile-target-libgcc)
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libssp" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libssp && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  maintainer-clean) \
+         || exit 1
 
-maybe-clean-stageprofile-target-libgcc: clean-stageprofile-target-libgcc
-clean-stageprofile: clean-stageprofile-target-libgcc
-clean-stageprofile-target-libgcc:
-       @if [ $(current_stage) = stageprofile ]; then \
-         [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
-       else \
-         [ -f $(TARGET_SUBDIR)/stageprofile-libgcc/Makefile ] || exit 0; \
-         $(MAKE) stageprofile-start; \
-       fi; \
-       cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
-@endif target-libgcc-bootstrap
+@endif target-libssp
 
 
-.PHONY: all-stagefeedback-target-libgcc maybe-all-stagefeedback-target-libgcc
-.PHONY: clean-stagefeedback-target-libgcc maybe-clean-stagefeedback-target-libgcc
-maybe-all-stagefeedback-target-libgcc:
-maybe-clean-stagefeedback-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-all-stagefeedback-target-libgcc: all-stagefeedback-target-libgcc
-all-stagefeedback: all-stagefeedback-target-libgcc
-TARGET-stagefeedback-target-libgcc = $(TARGET-target-libgcc)
-all-stagefeedback-target-libgcc: configure-stagefeedback-target-libgcc
-       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+
+
+
+.PHONY: configure-target-newlib maybe-configure-target-newlib
+maybe-configure-target-newlib:
+@if gcc-bootstrap
+configure-target-newlib: stage_current
+@endif gcc-bootstrap
+@if target-newlib
+maybe-configure-target-newlib: configure-target-newlib
+configure-target-newlib: 
+       @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-       $(NORMAL_TARGET_EXPORTS) \
-         \
-       cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(BASE_FLAGS_TO_PASS) \
-               CFLAGS="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-               $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
-               $(TARGET-stagefeedback-target-libgcc)
-
-maybe-clean-stagefeedback-target-libgcc: clean-stagefeedback-target-libgcc
-clean-stagefeedback: clean-stagefeedback-target-libgcc
-clean-stagefeedback-target-libgcc:
-       @if [ $(current_stage) = stagefeedback ]; then \
-         [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
+       echo "Checking multilib configuration for newlib..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/newlib/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/newlib/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/newlib/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/newlib/Makefile; \
+           mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \
+         fi; \
        else \
-         [ -f $(TARGET_SUBDIR)/stagefeedback-libgcc/Makefile ] || exit 0; \
-         $(MAKE) stagefeedback-start; \
+         mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \
        fi; \
-       cd $(TARGET_SUBDIR)/libgcc && \
-       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
-                 \
-                clean
-@endif target-libgcc-bootstrap
+       test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       echo Configuring in $(TARGET_SUBDIR)/newlib; \
+       cd "$(TARGET_SUBDIR)/newlib" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(TARGET_SUBDIR)/newlib/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/newlib"; \
+       libsrcdir="$$s/newlib"; \
+       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-newlib
 
 
 
 
 
+.PHONY: all-target-newlib maybe-all-target-newlib
+maybe-all-target-newlib:
+@if gcc-bootstrap
+all-target-newlib: stage_current
+@endif gcc-bootstrap
+@if target-newlib
+TARGET-target-newlib=all
+maybe-all-target-newlib: all-target-newlib
+all-target-newlib: configure-target-newlib
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       (cd $(TARGET_SUBDIR)/newlib && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+               $(TARGET-target-newlib))
+@endif target-newlib
 
-.PHONY: check-target-libgcc maybe-check-target-libgcc
-maybe-check-target-libgcc:
-@if target-libgcc
-maybe-check-target-libgcc: check-target-libgcc
 
-# Dummy target for uncheckable module.
-check-target-libgcc:
 
-@endif target-libgcc
 
-.PHONY: install-target-libgcc maybe-install-target-libgcc
-maybe-install-target-libgcc:
-@if target-libgcc
-maybe-install-target-libgcc: install-target-libgcc
 
-install-target-libgcc: installdirs
+.PHONY: check-target-newlib maybe-check-target-newlib
+maybe-check-target-newlib:
+@if target-newlib
+maybe-check-target-newlib: check-target-newlib
+
+check-target-newlib:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/newlib && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-newlib
+
+.PHONY: install-target-newlib maybe-install-target-newlib
+maybe-install-target-newlib:
+@if target-newlib
+maybe-install-target-newlib: install-target-newlib
+
+install-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)
 
-@endif target-libgcc
+@endif target-newlib
 
-.PHONY: install-strip-target-libgcc maybe-install-strip-target-libgcc
-maybe-install-strip-target-libgcc:
-@if target-libgcc
-maybe-install-strip-target-libgcc: install-strip-target-libgcc
+.PHONY: install-strip-target-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-libgcc: installdirs
+install-strip-target-newlib: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/newlib && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif target-libgcc
+@endif target-newlib
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-target-libgcc info-target-libgcc
-maybe-info-target-libgcc:
-@if target-libgcc
-maybe-info-target-libgcc: info-target-libgcc
+.PHONY: maybe-info-target-newlib info-target-newlib
+maybe-info-target-newlib:
+@if target-newlib
+maybe-info-target-newlib: info-target-newlib
 
-info-target-libgcc: \
-    configure-target-libgcc 
+info-target-newlib: \
+    configure-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/newlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/newlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49119,25 +31989,25 @@ info-target-libgcc: \
                   info) \
          || exit 1
 
-@endif target-libgcc
+@endif target-newlib
 
-.PHONY: maybe-dvi-target-libgcc dvi-target-libgcc
-maybe-dvi-target-libgcc:
-@if target-libgcc
-maybe-dvi-target-libgcc: dvi-target-libgcc
+.PHONY: maybe-dvi-target-newlib dvi-target-newlib
+maybe-dvi-target-newlib:
+@if target-newlib
+maybe-dvi-target-newlib: dvi-target-newlib
 
-dvi-target-libgcc: \
-    configure-target-libgcc 
+dvi-target-newlib: \
+    configure-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/newlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/newlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49145,25 +32015,25 @@ dvi-target-libgcc: \
                   dvi) \
          || exit 1
 
-@endif target-libgcc
+@endif target-newlib
 
-.PHONY: maybe-pdf-target-libgcc pdf-target-libgcc
-maybe-pdf-target-libgcc:
-@if target-libgcc
-maybe-pdf-target-libgcc: pdf-target-libgcc
+.PHONY: maybe-pdf-target-newlib pdf-target-newlib
+maybe-pdf-target-newlib:
+@if target-newlib
+maybe-pdf-target-newlib: pdf-target-newlib
 
-pdf-target-libgcc: \
-    configure-target-libgcc 
+pdf-target-newlib: \
+    configure-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/newlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/newlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49171,25 +32041,25 @@ pdf-target-libgcc: \
                   pdf) \
          || exit 1
 
-@endif target-libgcc
+@endif target-newlib
 
-.PHONY: maybe-html-target-libgcc html-target-libgcc
-maybe-html-target-libgcc:
-@if target-libgcc
-maybe-html-target-libgcc: html-target-libgcc
+.PHONY: maybe-html-target-newlib html-target-newlib
+maybe-html-target-newlib:
+@if target-newlib
+maybe-html-target-newlib: html-target-newlib
 
-html-target-libgcc: \
-    configure-target-libgcc 
+html-target-newlib: \
+    configure-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/newlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/newlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49197,25 +32067,25 @@ html-target-libgcc: \
                   html) \
          || exit 1
 
-@endif target-libgcc
+@endif target-newlib
 
-.PHONY: maybe-TAGS-target-libgcc TAGS-target-libgcc
-maybe-TAGS-target-libgcc:
-@if target-libgcc
-maybe-TAGS-target-libgcc: TAGS-target-libgcc
+.PHONY: maybe-TAGS-target-newlib TAGS-target-newlib
+maybe-TAGS-target-newlib:
+@if target-newlib
+maybe-TAGS-target-newlib: TAGS-target-newlib
 
-TAGS-target-libgcc: \
-    configure-target-libgcc 
+TAGS-target-newlib: \
+    configure-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/newlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/newlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49223,26 +32093,26 @@ TAGS-target-libgcc: \
                   TAGS) \
          || exit 1
 
-@endif target-libgcc
+@endif target-newlib
 
-.PHONY: maybe-install-info-target-libgcc install-info-target-libgcc
-maybe-install-info-target-libgcc:
-@if target-libgcc
-maybe-install-info-target-libgcc: install-info-target-libgcc
+.PHONY: maybe-install-info-target-newlib install-info-target-newlib
+maybe-install-info-target-newlib:
+@if target-newlib
+maybe-install-info-target-newlib: install-info-target-newlib
 
-install-info-target-libgcc: \
-    configure-target-libgcc \
-    info-target-libgcc 
+install-info-target-newlib: \
+    configure-target-newlib \
+    info-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/newlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/newlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49250,26 +32120,26 @@ install-info-target-libgcc: \
                   install-info) \
          || exit 1
 
-@endif target-libgcc
+@endif target-newlib
 
-.PHONY: maybe-install-pdf-target-libgcc install-pdf-target-libgcc
-maybe-install-pdf-target-libgcc:
-@if target-libgcc
-maybe-install-pdf-target-libgcc: install-pdf-target-libgcc
+.PHONY: maybe-install-pdf-target-newlib install-pdf-target-newlib
+maybe-install-pdf-target-newlib:
+@if target-newlib
+maybe-install-pdf-target-newlib: install-pdf-target-newlib
 
-install-pdf-target-libgcc: \
-    configure-target-libgcc \
-    pdf-target-libgcc 
+install-pdf-target-newlib: \
+    configure-target-newlib \
+    pdf-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/newlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/newlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49277,26 +32147,26 @@ install-pdf-target-libgcc: \
                   install-pdf) \
          || exit 1
 
-@endif target-libgcc
+@endif target-newlib
 
-.PHONY: maybe-install-html-target-libgcc install-html-target-libgcc
-maybe-install-html-target-libgcc:
-@if target-libgcc
-maybe-install-html-target-libgcc: install-html-target-libgcc
+.PHONY: maybe-install-html-target-newlib install-html-target-newlib
+maybe-install-html-target-newlib:
+@if target-newlib
+maybe-install-html-target-newlib: install-html-target-newlib
 
-install-html-target-libgcc: \
-    configure-target-libgcc \
-    html-target-libgcc 
+install-html-target-newlib: \
+    configure-target-newlib \
+    html-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/newlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/newlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49304,25 +32174,25 @@ install-html-target-libgcc: \
                   install-html) \
          || exit 1
 
-@endif target-libgcc
+@endif target-newlib
 
-.PHONY: maybe-installcheck-target-libgcc installcheck-target-libgcc
-maybe-installcheck-target-libgcc:
-@if target-libgcc
-maybe-installcheck-target-libgcc: installcheck-target-libgcc
+.PHONY: maybe-installcheck-target-newlib installcheck-target-newlib
+maybe-installcheck-target-newlib:
+@if target-newlib
+maybe-installcheck-target-newlib: installcheck-target-newlib
 
-installcheck-target-libgcc: \
-    configure-target-libgcc 
+installcheck-target-newlib: \
+    configure-target-newlib 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/newlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/newlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49330,24 +32200,24 @@ installcheck-target-libgcc: \
                   installcheck) \
          || exit 1
 
-@endif target-libgcc
+@endif target-newlib
 
-.PHONY: maybe-mostlyclean-target-libgcc mostlyclean-target-libgcc
-maybe-mostlyclean-target-libgcc:
-@if target-libgcc
-maybe-mostlyclean-target-libgcc: mostlyclean-target-libgcc
+.PHONY: maybe-mostlyclean-target-newlib mostlyclean-target-newlib
+maybe-mostlyclean-target-newlib:
+@if target-newlib
+maybe-mostlyclean-target-newlib: mostlyclean-target-newlib
 
-mostlyclean-target-libgcc: 
+mostlyclean-target-newlib: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/newlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/newlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49355,24 +32225,24 @@ mostlyclean-target-libgcc:
                   mostlyclean) \
          || exit 1
 
-@endif target-libgcc
+@endif target-newlib
 
-.PHONY: maybe-clean-target-libgcc clean-target-libgcc
-maybe-clean-target-libgcc:
-@if target-libgcc
-maybe-clean-target-libgcc: clean-target-libgcc
+.PHONY: maybe-clean-target-newlib clean-target-newlib
+maybe-clean-target-newlib:
+@if target-newlib
+maybe-clean-target-newlib: clean-target-newlib
 
-clean-target-libgcc: 
+clean-target-newlib: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/newlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/newlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49380,24 +32250,24 @@ clean-target-libgcc:
                   clean) \
          || exit 1
 
-@endif target-libgcc
+@endif target-newlib
 
-.PHONY: maybe-distclean-target-libgcc distclean-target-libgcc
-maybe-distclean-target-libgcc:
-@if target-libgcc
-maybe-distclean-target-libgcc: distclean-target-libgcc
+.PHONY: maybe-distclean-target-newlib distclean-target-newlib
+maybe-distclean-target-newlib:
+@if target-newlib
+maybe-distclean-target-newlib: distclean-target-newlib
 
-distclean-target-libgcc: 
+distclean-target-newlib: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/newlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/newlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49405,24 +32275,24 @@ distclean-target-libgcc:
                   distclean) \
          || exit 1
 
-@endif target-libgcc
+@endif target-newlib
 
-.PHONY: maybe-maintainer-clean-target-libgcc maintainer-clean-target-libgcc
-maybe-maintainer-clean-target-libgcc:
-@if target-libgcc
-maybe-maintainer-clean-target-libgcc: maintainer-clean-target-libgcc
+.PHONY: maybe-maintainer-clean-target-newlib maintainer-clean-target-newlib
+maybe-maintainer-clean-target-newlib:
+@if target-newlib
+maybe-maintainer-clean-target-newlib: maintainer-clean-target-newlib
 
-maintainer-clean-target-libgcc: 
+maintainer-clean-target-newlib: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgcc/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)/libgcc" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/newlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgcc && \
+       (cd $(TARGET_SUBDIR)/newlib && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -49430,602 +32300,666 @@ maintainer-clean-target-libgcc:
                   maintainer-clean) \
          || exit 1
 
-@endif target-libgcc
+@endif target-newlib
 
 
 
 
 
-.PHONY: configure-target-libquadmath maybe-configure-target-libquadmath
-maybe-configure-target-libquadmath:
+.PHONY: configure-target-libgcc maybe-configure-target-libgcc
+maybe-configure-target-libgcc:
 @if gcc-bootstrap
-configure-target-libquadmath: stage_current
+configure-target-libgcc: stage_current
 @endif gcc-bootstrap
-@if target-libquadmath
-maybe-configure-target-libquadmath: configure-target-libquadmath
-configure-target-libquadmath: 
-       @: $(MAKE); $(unstage)
+@if target-libgcc
+maybe-configure-target-libgcc: configure-target-libgcc
+configure-target-libgcc: 
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for 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; \
+       echo "Checking multilib configuration for libgcc..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libquadmath/Makefile; \
-           mv $(TARGET_SUBDIR)/libquadmath/multilib.tmp $(TARGET_SUBDIR)/libquadmath/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
+           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libquadmath/multilib.tmp $(TARGET_SUBDIR)/libquadmath/multilib.out; \
+         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libquadmath/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libquadmath ; \
+       test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
        $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libquadmath; \
-       cd "$(TARGET_SUBDIR)/libquadmath" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/libgcc; \
+       cd "$(TARGET_SUBDIR)/libgcc" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libquadmath/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libquadmath"; \
-       libsrcdir="$$s/libquadmath"; \
+       srcdiroption="--srcdir=$${topdir}/libgcc"; \
+       libsrcdir="$$s/libgcc"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif target-libquadmath
-
-
-
-
-
-.PHONY: all-target-libquadmath maybe-all-target-libquadmath
-maybe-all-target-libquadmath:
-@if gcc-bootstrap
-all-target-libquadmath: stage_current
-@endif gcc-bootstrap
-@if target-libquadmath
-TARGET-target-libquadmath=all
-maybe-all-target-libquadmath: all-target-libquadmath
-all-target-libquadmath: configure-target-libquadmath
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libquadmath))
-@endif target-libquadmath
-
-
-
+@endif target-libgcc
 
 
-.PHONY: check-target-libquadmath maybe-check-target-libquadmath
-maybe-check-target-libquadmath:
-@if target-libquadmath
-maybe-check-target-libquadmath: check-target-libquadmath
 
-check-target-libquadmath:
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage1-target-libgcc maybe-configure-stage1-target-libgcc
+maybe-configure-stage1-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-configure-stage1-target-libgcc: configure-stage1-target-libgcc
+configure-stage1-target-libgcc:
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       echo "Checking multilib configuration for libgcc..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
+           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-libquadmath
-
-.PHONY: install-target-libquadmath maybe-install-target-libquadmath
-maybe-install-target-libquadmath:
-@if target-libquadmath
-maybe-install-target-libquadmath: install-target-libquadmath
+       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 \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         $(STAGE1_CONFIGURE_FLAGS)
+@endif target-libgcc-bootstrap
 
-install-target-libquadmath: installdirs
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage2-target-libgcc maybe-configure-stage2-target-libgcc
+maybe-configure-stage2-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-configure-stage2-target-libgcc: configure-stage2-target-libgcc
+configure-stage2-target-libgcc:
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
+       echo "Checking multilib configuration for libgcc..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
+           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@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
+        \
+       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 \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE2_CONFIGURE_FLAGS)
+@endif target-libgcc-bootstrap
 
-install-strip-target-libquadmath: installdirs
-       @: $(MAKE); $(unstage)
+.PHONY: configure-stage3-target-libgcc maybe-configure-stage3-target-libgcc
+maybe-configure-stage3-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-configure-stage3-target-libgcc: configure-stage3-target-libgcc
+configure-stage3-target-libgcc:
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
+       echo "Checking multilib configuration for libgcc..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
+           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
-
-@endif target-libquadmath
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-target-libquadmath info-target-libquadmath
-maybe-info-target-libquadmath:
-@if target-libquadmath
-maybe-info-target-libquadmath: info-target-libquadmath
-
-info-target-libquadmath: \
-    configure-target-libquadmath 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libquadmath" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
-         $(MAKE) $(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-libquadmath
-
-.PHONY: maybe-dvi-target-libquadmath dvi-target-libquadmath
-maybe-dvi-target-libquadmath:
-@if target-libquadmath
-maybe-dvi-target-libquadmath: dvi-target-libquadmath
-
-dvi-target-libquadmath: \
-    configure-target-libquadmath 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libquadmath" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
-         $(MAKE) $(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-libquadmath
-
-.PHONY: maybe-pdf-target-libquadmath pdf-target-libquadmath
-maybe-pdf-target-libquadmath:
-@if target-libquadmath
-maybe-pdf-target-libquadmath: pdf-target-libquadmath
-
-pdf-target-libquadmath: \
-    configure-target-libquadmath 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libquadmath" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
-         $(MAKE) $(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-libquadmath
-
-.PHONY: maybe-html-target-libquadmath html-target-libquadmath
-maybe-html-target-libquadmath:
-@if target-libquadmath
-maybe-html-target-libquadmath: html-target-libquadmath
-
-html-target-libquadmath: \
-    configure-target-libquadmath 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libquadmath" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
-         $(MAKE) $(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-libquadmath
-
-.PHONY: maybe-TAGS-target-libquadmath TAGS-target-libquadmath
-maybe-TAGS-target-libquadmath:
-@if target-libquadmath
-maybe-TAGS-target-libquadmath: TAGS-target-libquadmath
+        \
+       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 \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGE3_CONFIGURE_FLAGS)
+@endif target-libgcc-bootstrap
 
-TAGS-target-libquadmath: \
-    configure-target-libquadmath 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: configure-stage4-target-libgcc maybe-configure-stage4-target-libgcc
+maybe-configure-stage4-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-configure-stage4-target-libgcc: configure-stage4-target-libgcc
+configure-stage4-target-libgcc:
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
+       echo "Checking multilib configuration for libgcc..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
+           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
        $(NORMAL_TARGET_EXPORTS) \
-       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)/libquadmath && \
-         $(MAKE) $(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-libquadmath
-
-.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-libquadmath: \
-    configure-target-libquadmath \
-    info-target-libquadmath 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/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)/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) \
+         $(STAGE4_CONFIGURE_FLAGS)
+@endif target-libgcc-bootstrap
+
+.PHONY: configure-stageprofile-target-libgcc maybe-configure-stageprofile-target-libgcc
+maybe-configure-stageprofile-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-configure-stageprofile-target-libgcc: configure-stageprofile-target-libgcc
+configure-stageprofile-target-libgcc:
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       echo "Checking multilib configuration for libgcc..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
+           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
        $(NORMAL_TARGET_EXPORTS) \
-       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)/libquadmath && \
-         $(MAKE) $(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-libquadmath
-
-.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
+        \
+       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 \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEprofile_CONFIGURE_FLAGS)
+@endif target-libgcc-bootstrap
 
-install-pdf-target-libquadmath: \
-    configure-target-libquadmath \
-    pdf-target-libquadmath 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: configure-stagefeedback-target-libgcc maybe-configure-stagefeedback-target-libgcc
+maybe-configure-stagefeedback-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-configure-stagefeedback-target-libgcc: configure-stagefeedback-target-libgcc
+configure-stagefeedback-target-libgcc:
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
+       @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       echo "Checking multilib configuration for libgcc..."; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
+         else \
+           rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
+           mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+         fi; \
+       else \
+         mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
+       fi; \
+       test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
        $(NORMAL_TARGET_EXPORTS) \
-       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)/libquadmath && \
-         $(MAKE) $(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-libquadmath
+        \
+       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 \
+         $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+         --target=${target_alias} $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
+         $(STAGEfeedback_CONFIGURE_FLAGS)
+@endif target-libgcc-bootstrap
 
-.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-libquadmath: \
-    configure-target-libquadmath \
-    html-target-libquadmath 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-html in $(TARGET_SUBDIR)/libquadmath" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libquadmath && \
-         $(MAKE) $(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-libquadmath
 
-.PHONY: maybe-installcheck-target-libquadmath installcheck-target-libquadmath
-maybe-installcheck-target-libquadmath:
-@if target-libquadmath
-maybe-installcheck-target-libquadmath: installcheck-target-libquadmath
 
-installcheck-target-libquadmath: \
-    configure-target-libquadmath 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-target-libgcc maybe-all-target-libgcc
+maybe-all-target-libgcc:
+@if gcc-bootstrap
+all-target-libgcc: stage_current
+@endif gcc-bootstrap
+@if target-libgcc
+TARGET-target-libgcc=all
+maybe-all-target-libgcc: all-target-libgcc
+all-target-libgcc: configure-target-libgcc
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       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)/libquadmath && \
-         $(MAKE) $(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)/libgcc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
+               $(TARGET-target-libgcc))
+@endif target-libgcc
 
-@endif target-libquadmath
 
-.PHONY: maybe-mostlyclean-target-libquadmath mostlyclean-target-libquadmath
-maybe-mostlyclean-target-libquadmath:
-@if target-libquadmath
-maybe-mostlyclean-target-libquadmath: mostlyclean-target-libquadmath
 
-mostlyclean-target-libquadmath: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stage1-target-libgcc maybe-all-stage1-target-libgcc
+.PHONY: clean-stage1-target-libgcc maybe-clean-stage1-target-libgcc
+maybe-all-stage1-target-libgcc:
+maybe-clean-stage1-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-all-stage1-target-libgcc: all-stage1-target-libgcc
+all-stage1: all-stage1-target-libgcc
+TARGET-stage1-target-libgcc = $(TARGET-target-libgcc)
+all-stage1-target-libgcc: configure-stage1-target-libgcc
+       @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       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)/libquadmath && \
-         $(MAKE) $(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
+       TFLAGS="$(STAGE1_TFLAGS)"; \
+       $(NORMAL_TARGET_EXPORTS)  \
+       cd $(TARGET_SUBDIR)/libgcc && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS)   \
+               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(TARGET-stage1-target-libgcc)
 
-@endif target-libquadmath
+maybe-clean-stage1-target-libgcc: clean-stage1-target-libgcc
+clean-stage1: clean-stage1-target-libgcc
+clean-stage1-target-libgcc:
+       @if [ $(current_stage) = stage1 ]; then \
+         [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage1-libgcc/Makefile ] || exit 0; \
+         $(MAKE) stage1-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libgcc && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
+                clean
+@endif target-libgcc-bootstrap
 
-.PHONY: maybe-clean-target-libquadmath clean-target-libquadmath
-maybe-clean-target-libquadmath:
-@if target-libquadmath
-maybe-clean-target-libquadmath: clean-target-libquadmath
 
-clean-target-libquadmath: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stage2-target-libgcc maybe-all-stage2-target-libgcc
+.PHONY: clean-stage2-target-libgcc maybe-clean-stage2-target-libgcc
+maybe-all-stage2-target-libgcc:
+maybe-clean-stage2-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-all-stage2-target-libgcc: all-stage2-target-libgcc
+all-stage2: all-stage2-target-libgcc
+TARGET-stage2-target-libgcc = $(TARGET-target-libgcc)
+all-stage2-target-libgcc: configure-stage2-target-libgcc
+       @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE2_TFLAGS)"; \
        $(NORMAL_TARGET_EXPORTS) \
-       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)/libquadmath && \
-         $(MAKE) $(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
+         \
+       cd $(TARGET_SUBDIR)/libgcc && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS)   \
+               TFLAGS="$(STAGE2_TFLAGS)" \
+               $(TARGET-stage2-target-libgcc)
 
-@endif target-libquadmath
+maybe-clean-stage2-target-libgcc: clean-stage2-target-libgcc
+clean-stage2: clean-stage2-target-libgcc
+clean-stage2-target-libgcc:
+       @if [ $(current_stage) = stage2 ]; then \
+         [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage2-libgcc/Makefile ] || exit 0; \
+         $(MAKE) stage2-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libgcc && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
+                 \
+                clean
+@endif target-libgcc-bootstrap
 
-.PHONY: maybe-distclean-target-libquadmath distclean-target-libquadmath
-maybe-distclean-target-libquadmath:
-@if target-libquadmath
-maybe-distclean-target-libquadmath: distclean-target-libquadmath
 
-distclean-target-libquadmath: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stage3-target-libgcc maybe-all-stage3-target-libgcc
+.PHONY: clean-stage3-target-libgcc maybe-clean-stage3-target-libgcc
+maybe-all-stage3-target-libgcc:
+maybe-clean-stage3-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-all-stage3-target-libgcc: all-stage3-target-libgcc
+all-stage3: all-stage3-target-libgcc
+TARGET-stage3-target-libgcc = $(TARGET-target-libgcc)
+all-stage3-target-libgcc: configure-stage3-target-libgcc
+       @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE3_TFLAGS)"; \
        $(NORMAL_TARGET_EXPORTS) \
-       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)/libquadmath && \
-         $(MAKE) $(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
+         \
+       cd $(TARGET_SUBDIR)/libgcc && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS)   \
+               TFLAGS="$(STAGE3_TFLAGS)" \
+               $(TARGET-stage3-target-libgcc)
 
-@endif target-libquadmath
+maybe-clean-stage3-target-libgcc: clean-stage3-target-libgcc
+clean-stage3: clean-stage3-target-libgcc
+clean-stage3-target-libgcc:
+       @if [ $(current_stage) = stage3 ]; then \
+         [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage3-libgcc/Makefile ] || exit 0; \
+         $(MAKE) stage3-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libgcc && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
+                 \
+                clean
+@endif target-libgcc-bootstrap
 
-.PHONY: 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-libquadmath: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
+.PHONY: all-stage4-target-libgcc maybe-all-stage4-target-libgcc
+.PHONY: clean-stage4-target-libgcc maybe-clean-stage4-target-libgcc
+maybe-all-stage4-target-libgcc:
+maybe-clean-stage4-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-all-stage4-target-libgcc: all-stage4-target-libgcc
+all-stage4: all-stage4-target-libgcc
+TARGET-stage4-target-libgcc = $(TARGET-target-libgcc)
+all-stage4-target-libgcc: configure-stage4-target-libgcc
+       @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       TFLAGS="$(STAGE4_TFLAGS)"; \
        $(NORMAL_TARGET_EXPORTS) \
-       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)/libquadmath && \
-         $(MAKE) $(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-libquadmath
-
-
+         \
+       cd $(TARGET_SUBDIR)/libgcc && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS)   \
+               TFLAGS="$(STAGE4_TFLAGS)" \
+               $(TARGET-stage4-target-libgcc)
 
+maybe-clean-stage4-target-libgcc: clean-stage4-target-libgcc
+clean-stage4: clean-stage4-target-libgcc
+clean-stage4-target-libgcc:
+       @if [ $(current_stage) = stage4 ]; then \
+         [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stage4-libgcc/Makefile ] || exit 0; \
+         $(MAKE) stage4-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libgcc && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
+                 \
+                clean
+@endif target-libgcc-bootstrap
 
 
-.PHONY: configure-target-libgfortran maybe-configure-target-libgfortran
-maybe-configure-target-libgfortran:
-@if gcc-bootstrap
-configure-target-libgfortran: stage_current
-@endif gcc-bootstrap
-@if target-libgfortran
-maybe-configure-target-libgfortran: configure-target-libgfortran
-configure-target-libgfortran: 
-       @: $(MAKE); $(unstage)
+.PHONY: all-stageprofile-target-libgcc maybe-all-stageprofile-target-libgcc
+.PHONY: clean-stageprofile-target-libgcc maybe-clean-stageprofile-target-libgcc
+maybe-all-stageprofile-target-libgcc:
+maybe-clean-stageprofile-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-all-stageprofile-target-libgcc: all-stageprofile-target-libgcc
+all-stageprofile: all-stageprofile-target-libgcc
+TARGET-stageprofile-target-libgcc = $(TARGET-target-libgcc)
+all-stageprofile-target-libgcc: configure-stageprofile-target-libgcc
+       @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       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)/libgfortran/Makefile; \
-           mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \
-         fi; \
+       TFLAGS="$(STAGEprofile_TFLAGS)"; \
+       $(NORMAL_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libgcc && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS)   \
+               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               $(TARGET-stageprofile-target-libgcc)
+
+maybe-clean-stageprofile-target-libgcc: clean-stageprofile-target-libgcc
+clean-stageprofile: clean-stageprofile-target-libgcc
+clean-stageprofile-target-libgcc:
+       @if [ $(current_stage) = stageprofile ]; then \
+         [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
        else \
-         mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \
+         [ -f $(TARGET_SUBDIR)/stageprofile-libgcc/Makefile ] || exit 0; \
+         $(MAKE) stageprofile-start; \
        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; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgfortran/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/libgfortran"; \
-       libsrcdir="$$s/libgfortran"; \
-       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-libgfortran
-
-
-
+       cd $(TARGET_SUBDIR)/libgcc && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
+                 \
+                clean
+@endif target-libgcc-bootstrap
 
 
-.PHONY: all-target-libgfortran maybe-all-target-libgfortran
-maybe-all-target-libgfortran:
-@if gcc-bootstrap
-all-target-libgfortran: 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
-       @: $(MAKE); $(unstage)
+.PHONY: all-stagefeedback-target-libgcc maybe-all-stagefeedback-target-libgcc
+.PHONY: clean-stagefeedback-target-libgcc maybe-clean-stagefeedback-target-libgcc
+maybe-all-stagefeedback-target-libgcc:
+maybe-clean-stagefeedback-target-libgcc:
+@if target-libgcc-bootstrap
+maybe-all-stagefeedback-target-libgcc: all-stagefeedback-target-libgcc
+all-stagefeedback: all-stagefeedback-target-libgcc
+TARGET-stagefeedback-target-libgcc = $(TARGET-target-libgcc)
+all-stagefeedback-target-libgcc: configure-stagefeedback-target-libgcc
+       @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libgfortran))
-@endif target-libgfortran
+       TFLAGS="$(STAGEfeedback_TFLAGS)"; \
+       $(NORMAL_TARGET_EXPORTS) \
+         \
+       cd $(TARGET_SUBDIR)/libgcc && \
+       $(MAKE) $(BASE_FLAGS_TO_PASS) \
+               CFLAGS="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
+               CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+               CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+               LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
+               $(EXTRA_TARGET_FLAGS)   \
+               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               $(TARGET-stagefeedback-target-libgcc)
+
+maybe-clean-stagefeedback-target-libgcc: clean-stagefeedback-target-libgcc
+clean-stagefeedback: clean-stagefeedback-target-libgcc
+clean-stagefeedback-target-libgcc:
+       @if [ $(current_stage) = stagefeedback ]; then \
+         [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
+       else \
+         [ -f $(TARGET_SUBDIR)/stagefeedback-libgcc/Makefile ] || exit 0; \
+         $(MAKE) stagefeedback-start; \
+       fi; \
+       cd $(TARGET_SUBDIR)/libgcc && \
+       $(MAKE) $(EXTRA_TARGET_FLAGS)  \
+                 \
+                clean
+@endif target-libgcc-bootstrap
 
 
 
 
 
-.PHONY: check-target-libgfortran maybe-check-target-libgfortran
-maybe-check-target-libgfortran:
-@if target-libgfortran
-maybe-check-target-libgfortran: check-target-libgfortran
 
-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)
+.PHONY: check-target-libgcc maybe-check-target-libgcc
+maybe-check-target-libgcc:
+@if target-libgcc
+maybe-check-target-libgcc: check-target-libgcc
 
-@endif target-libgfortran
+# Dummy target for uncheckable module.
+check-target-libgcc:
 
-.PHONY: install-target-libgfortran maybe-install-target-libgfortran
-maybe-install-target-libgfortran:
-@if target-libgfortran
-maybe-install-target-libgfortran: install-target-libgfortran
+@endif target-libgcc
 
-install-target-libgfortran: installdirs
+.PHONY: install-target-libgcc maybe-install-target-libgcc
+maybe-install-target-libgcc:
+@if target-libgcc
+maybe-install-target-libgcc: install-target-libgcc
+
+install-target-libgcc: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-libgfortran
+@endif target-libgcc
 
-.PHONY: install-strip-target-libgfortran maybe-install-strip-target-libgfortran
-maybe-install-strip-target-libgfortran:
-@if target-libgfortran
-maybe-install-strip-target-libgfortran: install-strip-target-libgfortran
+.PHONY: install-strip-target-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-libgfortran: installdirs
+install-strip-target-libgcc: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif target-libgfortran
+@endif target-libgcc
 
 # 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-libgcc info-target-libgcc
+maybe-info-target-libgcc:
+@if target-libgcc
+maybe-info-target-libgcc: info-target-libgcc
 
-info-target-libgfortran: \
-    configure-target-libgfortran 
+info-target-libgcc: \
+    configure-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libgcc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50033,25 +32967,25 @@ info-target-libgfortran: \
                   info) \
          || exit 1
 
-@endif target-libgfortran
+@endif target-libgcc
 
-.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-libgcc dvi-target-libgcc
+maybe-dvi-target-libgcc:
+@if target-libgcc
+maybe-dvi-target-libgcc: dvi-target-libgcc
 
-dvi-target-libgfortran: \
-    configure-target-libgfortran 
+dvi-target-libgcc: \
+    configure-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libgcc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50059,25 +32993,25 @@ dvi-target-libgfortran: \
                   dvi) \
          || exit 1
 
-@endif target-libgfortran
+@endif target-libgcc
 
-.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-libgcc pdf-target-libgcc
+maybe-pdf-target-libgcc:
+@if target-libgcc
+maybe-pdf-target-libgcc: pdf-target-libgcc
 
-pdf-target-libgfortran: \
-    configure-target-libgfortran 
+pdf-target-libgcc: \
+    configure-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libgcc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50085,25 +33019,25 @@ pdf-target-libgfortran: \
                   pdf) \
          || exit 1
 
-@endif target-libgfortran
+@endif target-libgcc
 
-.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-libgcc html-target-libgcc
+maybe-html-target-libgcc:
+@if target-libgcc
+maybe-html-target-libgcc: html-target-libgcc
 
-html-target-libgfortran: \
-    configure-target-libgfortran 
+html-target-libgcc: \
+    configure-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libgcc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50111,25 +33045,25 @@ html-target-libgfortran: \
                   html) \
          || exit 1
 
-@endif target-libgfortran
+@endif target-libgcc
 
-.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-libgcc TAGS-target-libgcc
+maybe-TAGS-target-libgcc:
+@if target-libgcc
+maybe-TAGS-target-libgcc: TAGS-target-libgcc
 
-TAGS-target-libgfortran: \
-    configure-target-libgfortran 
+TAGS-target-libgcc: \
+    configure-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libgcc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50137,26 +33071,26 @@ TAGS-target-libgfortran: \
                   TAGS) \
          || exit 1
 
-@endif target-libgfortran
+@endif target-libgcc
 
-.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-libgcc install-info-target-libgcc
+maybe-install-info-target-libgcc:
+@if target-libgcc
+maybe-install-info-target-libgcc: install-info-target-libgcc
 
-install-info-target-libgfortran: \
-    configure-target-libgfortran \
-    info-target-libgfortran 
+install-info-target-libgcc: \
+    configure-target-libgcc \
+    info-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libgcc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50164,26 +33098,26 @@ install-info-target-libgfortran: \
                   install-info) \
          || exit 1
 
-@endif target-libgfortran
+@endif target-libgcc
 
-.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-libgcc install-pdf-target-libgcc
+maybe-install-pdf-target-libgcc:
+@if target-libgcc
+maybe-install-pdf-target-libgcc: install-pdf-target-libgcc
 
-install-pdf-target-libgfortran: \
-    configure-target-libgfortran \
-    pdf-target-libgfortran 
+install-pdf-target-libgcc: \
+    configure-target-libgcc \
+    pdf-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libgcc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50191,26 +33125,26 @@ install-pdf-target-libgfortran: \
                   install-pdf) \
          || exit 1
 
-@endif target-libgfortran
+@endif target-libgcc
 
-.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-libgcc install-html-target-libgcc
+maybe-install-html-target-libgcc:
+@if target-libgcc
+maybe-install-html-target-libgcc: install-html-target-libgcc
 
-install-html-target-libgfortran: \
-    configure-target-libgfortran \
-    html-target-libgfortran 
+install-html-target-libgcc: \
+    configure-target-libgcc \
+    html-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libgcc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50218,25 +33152,25 @@ install-html-target-libgfortran: \
                   install-html) \
          || exit 1
 
-@endif target-libgfortran
+@endif target-libgcc
 
-.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-libgcc installcheck-target-libgcc
+maybe-installcheck-target-libgcc:
+@if target-libgcc
+maybe-installcheck-target-libgcc: installcheck-target-libgcc
 
-installcheck-target-libgfortran: \
-    configure-target-libgfortran 
+installcheck-target-libgcc: \
+    configure-target-libgcc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libgcc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50244,24 +33178,24 @@ installcheck-target-libgfortran: \
                   installcheck) \
          || exit 1
 
-@endif target-libgfortran
+@endif target-libgcc
 
-.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-libgcc mostlyclean-target-libgcc
+maybe-mostlyclean-target-libgcc:
+@if target-libgcc
+maybe-mostlyclean-target-libgcc: mostlyclean-target-libgcc
 
-mostlyclean-target-libgfortran: 
+mostlyclean-target-libgcc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgcc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50269,24 +33203,24 @@ mostlyclean-target-libgfortran:
                   mostlyclean) \
          || exit 1
 
-@endif target-libgfortran
+@endif target-libgcc
 
-.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-libgcc clean-target-libgcc
+maybe-clean-target-libgcc:
+@if target-libgcc
+maybe-clean-target-libgcc: clean-target-libgcc
 
-clean-target-libgfortran: 
+clean-target-libgcc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libgcc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50294,24 +33228,24 @@ clean-target-libgfortran:
                   clean) \
          || exit 1
 
-@endif target-libgfortran
+@endif target-libgcc
 
-.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-libgcc distclean-target-libgcc
+maybe-distclean-target-libgcc:
+@if target-libgcc
+maybe-distclean-target-libgcc: distclean-target-libgcc
 
-distclean-target-libgfortran: 
+distclean-target-libgcc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libgcc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50319,24 +33253,24 @@ distclean-target-libgfortran:
                   distclean) \
          || exit 1
 
-@endif target-libgfortran
+@endif target-libgcc
 
-.PHONY: maybe-maintainer-clean-target-libgfortran maintainer-clean-target-libgfortran
-maybe-maintainer-clean-target-libgfortran:
-@if target-libgfortran
-maybe-maintainer-clean-target-libgfortran: maintainer-clean-target-libgfortran
+.PHONY: maybe-maintainer-clean-target-libgcc maintainer-clean-target-libgcc
+maybe-maintainer-clean-target-libgcc:
+@if target-libgcc
+maybe-maintainer-clean-target-libgcc: maintainer-clean-target-libgcc
 
-maintainer-clean-target-libgfortran: 
+maintainer-clean-target-libgcc: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgfortran/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)/libgfortran" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgcc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgfortran && \
+       (cd $(TARGET_SUBDIR)/libgcc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50344,145 +33278,145 @@ maintainer-clean-target-libgfortran:
                   maintainer-clean) \
          || exit 1
 
-@endif target-libgfortran
+@endif target-libgcc
 
 
 
 
 
-.PHONY: configure-target-libobjc maybe-configure-target-libobjc
-maybe-configure-target-libobjc:
+.PHONY: configure-target-libquadmath maybe-configure-target-libquadmath
+maybe-configure-target-libquadmath:
 @if gcc-bootstrap
-configure-target-libobjc: stage_current
+configure-target-libquadmath: stage_current
 @endif gcc-bootstrap
-@if target-libobjc
-maybe-configure-target-libobjc: configure-target-libobjc
-configure-target-libobjc: 
+@if target-libquadmath
+maybe-configure-target-libquadmath: configure-target-libquadmath
+configure-target-libquadmath: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for libobjc..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libobjc/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libobjc/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libobjc/multilib.tmp; \
+       echo "Checking multilib configuration for libquadmath..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libquadmath ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libquadmath/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libquadmath/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libquadmath/multilib.tmp $(TARGET_SUBDIR)/libquadmath/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libquadmath/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libobjc/Makefile; \
-           mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libquadmath/Makefile; \
+           mv $(TARGET_SUBDIR)/libquadmath/multilib.tmp $(TARGET_SUBDIR)/libquadmath/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \
+         mv $(TARGET_SUBDIR)/libquadmath/multilib.tmp $(TARGET_SUBDIR)/libquadmath/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
+       test ! -f $(TARGET_SUBDIR)/libquadmath/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libquadmath ; \
        $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libobjc; \
-       cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/libquadmath; \
+       cd "$(TARGET_SUBDIR)/libquadmath" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libobjc/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libquadmath/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libobjc"; \
-       libsrcdir="$$s/libobjc"; \
+       srcdiroption="--srcdir=$${topdir}/libquadmath"; \
+       libsrcdir="$$s/libquadmath"; \
        rm -f no-such-file || : ; \
        CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
          $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
          --target=${target_alias} $${srcdiroption}  \
          || exit 1
-@endif target-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 && \
+       (cd $(TARGET_SUBDIR)/libquadmath && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libobjc))
-@endif target-libobjc
+               $(TARGET-target-libquadmath))
+@endif target-libquadmath
 
 
 
 
 
-.PHONY: check-target-libobjc maybe-check-target-libobjc
-maybe-check-target-libobjc:
-@if target-libobjc
-maybe-check-target-libobjc: check-target-libobjc
+.PHONY: check-target-libquadmath maybe-check-target-libquadmath
+maybe-check-target-libquadmath:
+@if target-libquadmath
+maybe-check-target-libquadmath: check-target-libquadmath
 
-check-target-libobjc:
+check-target-libquadmath:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libobjc && \
+       (cd $(TARGET_SUBDIR)/libquadmath && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
-@endif target-libobjc
+@endif target-libquadmath
 
-.PHONY: install-target-libobjc maybe-install-target-libobjc
-maybe-install-target-libobjc:
-@if target-libobjc
-maybe-install-target-libobjc: install-target-libobjc
+.PHONY: install-target-libquadmath maybe-install-target-libquadmath
+maybe-install-target-libquadmath:
+@if target-libquadmath
+maybe-install-target-libquadmath: install-target-libquadmath
 
-install-target-libobjc: installdirs
+install-target-libquadmath: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libobjc && \
+       (cd $(TARGET_SUBDIR)/libquadmath && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-libobjc
+@endif target-libquadmath
 
-.PHONY: install-strip-target-libobjc maybe-install-strip-target-libobjc
-maybe-install-strip-target-libobjc:
-@if target-libobjc
-maybe-install-strip-target-libobjc: install-strip-target-libobjc
+.PHONY: install-strip-target-libquadmath maybe-install-strip-target-libquadmath
+maybe-install-strip-target-libquadmath:
+@if target-libquadmath
+maybe-install-strip-target-libquadmath: install-strip-target-libquadmath
 
-install-strip-target-libobjc: installdirs
+install-strip-target-libquadmath: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libobjc && \
+       (cd $(TARGET_SUBDIR)/libquadmath && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif target-libobjc
+@endif target-libquadmath
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-target-libobjc info-target-libobjc
-maybe-info-target-libobjc:
-@if target-libobjc
-maybe-info-target-libobjc: info-target-libobjc
+.PHONY: maybe-info-target-libquadmath info-target-libquadmath
+maybe-info-target-libquadmath:
+@if target-libquadmath
+maybe-info-target-libquadmath: info-target-libquadmath
 
-info-target-libobjc: \
-    configure-target-libobjc 
+info-target-libquadmath: \
+    configure-target-libquadmath 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libobjc" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libquadmath" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libobjc && \
+       (cd $(TARGET_SUBDIR)/libquadmath && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50490,25 +33424,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}" \
@@ -50516,25 +33450,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}" \
@@ -50542,25 +33476,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}" \
@@ -50568,25 +33502,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}" \
@@ -50594,26 +33528,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}" \
@@ -50621,26 +33555,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}" \
@@ -50648,26 +33582,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}" \
@@ -50675,25 +33609,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}" \
@@ -50701,24 +33635,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}" \
@@ -50726,24 +33660,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}" \
@@ -50751,24 +33685,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}" \
@@ -50776,24 +33710,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}" \
@@ -50801,145 +33735,145 @@ maintainer-clean-target-libobjc:
                   maintainer-clean) \
          || exit 1
 
-@endif target-libobjc
+@endif target-libquadmath
 
 
 
 
 
-.PHONY: configure-target-libgo maybe-configure-target-libgo
-maybe-configure-target-libgo:
+.PHONY: configure-target-libgfortran maybe-configure-target-libgfortran
+maybe-configure-target-libgfortran:
 @if gcc-bootstrap
-configure-target-libgo: stage_current
+configure-target-libgfortran: stage_current
 @endif gcc-bootstrap
-@if target-libgo
-maybe-configure-target-libgo: configure-target-libgo
-configure-target-libgo: 
+@if target-libgfortran
+maybe-configure-target-libgfortran: configure-target-libgfortran
+configure-target-libgfortran: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for libgo..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgo ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgo/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libgo/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libgo/multilib.tmp $(TARGET_SUBDIR)/libgo/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libgo/multilib.tmp; \
+       echo "Checking multilib configuration for libgfortran..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgfortran/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libgfortran/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libgfortran/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libgo/Makefile; \
-           mv $(TARGET_SUBDIR)/libgo/multilib.tmp $(TARGET_SUBDIR)/libgo/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libgfortran/Makefile; \
+           mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libgo/multilib.tmp $(TARGET_SUBDIR)/libgo/multilib.out; \
+         mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libgo/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgo ; \
+       test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
        $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libgo; \
-       cd "$(TARGET_SUBDIR)/libgo" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/libgfortran; \
+       cd "$(TARGET_SUBDIR)/libgfortran" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgo/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libgfortran/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgo"; \
-       libsrcdir="$$s/libgo"; \
+       srcdiroption="--srcdir=$${topdir}/libgfortran"; \
+       libsrcdir="$$s/libgfortran"; \
        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-libgo
+@endif target-libgfortran
 
 
 
 
 
-.PHONY: all-target-libgo maybe-all-target-libgo
-maybe-all-target-libgo:
+.PHONY: all-target-libgfortran maybe-all-target-libgfortran
+maybe-all-target-libgfortran:
 @if gcc-bootstrap
-all-target-libgo: stage_current
+all-target-libgfortran: stage_current
 @endif gcc-bootstrap
-@if target-libgo
-TARGET-target-libgo=all
-maybe-all-target-libgo: all-target-libgo
-all-target-libgo: configure-target-libgo
+@if target-libgfortran
+TARGET-target-libgfortran=all
+maybe-all-target-libgfortran: all-target-libgfortran
+all-target-libgfortran: configure-target-libgfortran
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libgo))
-@endif target-libgo
+               $(TARGET-target-libgfortran))
+@endif target-libgfortran
 
 
 
 
 
-.PHONY: check-target-libgo maybe-check-target-libgo
-maybe-check-target-libgo:
-@if target-libgo
-maybe-check-target-libgo: check-target-libgo
+.PHONY: check-target-libgfortran maybe-check-target-libgfortran
+maybe-check-target-libgfortran:
+@if target-libgfortran
+maybe-check-target-libgfortran: check-target-libgfortran
 
-check-target-libgo:
+check-target-libgfortran:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
-@endif target-libgo
+@endif target-libgfortran
 
-.PHONY: install-target-libgo maybe-install-target-libgo
-maybe-install-target-libgo:
-@if target-libgo
-maybe-install-target-libgo: install-target-libgo
+.PHONY: install-target-libgfortran maybe-install-target-libgfortran
+maybe-install-target-libgfortran:
+@if target-libgfortran
+maybe-install-target-libgfortran: install-target-libgfortran
 
-install-target-libgo: installdirs
+install-target-libgfortran: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-libgo
+@endif target-libgfortran
 
-.PHONY: install-strip-target-libgo maybe-install-strip-target-libgo
-maybe-install-strip-target-libgo:
-@if target-libgo
-maybe-install-strip-target-libgo: install-strip-target-libgo
+.PHONY: install-strip-target-libgfortran maybe-install-strip-target-libgfortran
+maybe-install-strip-target-libgfortran:
+@if target-libgfortran
+maybe-install-strip-target-libgfortran: install-strip-target-libgfortran
 
-install-strip-target-libgo: installdirs
+install-strip-target-libgfortran: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif target-libgo
+@endif target-libgfortran
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-target-libgo info-target-libgo
-maybe-info-target-libgo:
-@if target-libgo
-maybe-info-target-libgo: info-target-libgo
+.PHONY: maybe-info-target-libgfortran info-target-libgfortran
+maybe-info-target-libgfortran:
+@if target-libgfortran
+maybe-info-target-libgfortran: info-target-libgfortran
 
-info-target-libgo: \
-    configure-target-libgo 
+info-target-libgfortran: \
+    configure-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libgfortran" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50947,25 +33881,25 @@ info-target-libgo: \
                   info) \
          || exit 1
 
-@endif target-libgo
+@endif target-libgfortran
 
-.PHONY: maybe-dvi-target-libgo dvi-target-libgo
-maybe-dvi-target-libgo:
-@if target-libgo
-maybe-dvi-target-libgo: dvi-target-libgo
+.PHONY: maybe-dvi-target-libgfortran dvi-target-libgfortran
+maybe-dvi-target-libgfortran:
+@if target-libgfortran
+maybe-dvi-target-libgfortran: dvi-target-libgfortran
 
-dvi-target-libgo: \
-    configure-target-libgo 
+dvi-target-libgfortran: \
+    configure-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libgfortran" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50973,25 +33907,25 @@ dvi-target-libgo: \
                   dvi) \
          || exit 1
 
-@endif target-libgo
+@endif target-libgfortran
 
-.PHONY: maybe-pdf-target-libgo pdf-target-libgo
-maybe-pdf-target-libgo:
-@if target-libgo
-maybe-pdf-target-libgo: pdf-target-libgo
+.PHONY: maybe-pdf-target-libgfortran pdf-target-libgfortran
+maybe-pdf-target-libgfortran:
+@if target-libgfortran
+maybe-pdf-target-libgfortran: pdf-target-libgfortran
 
-pdf-target-libgo: \
-    configure-target-libgo 
+pdf-target-libgfortran: \
+    configure-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libgfortran" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -50999,25 +33933,25 @@ pdf-target-libgo: \
                   pdf) \
          || exit 1
 
-@endif target-libgo
+@endif target-libgfortran
 
-.PHONY: maybe-html-target-libgo html-target-libgo
-maybe-html-target-libgo:
-@if target-libgo
-maybe-html-target-libgo: html-target-libgo
+.PHONY: maybe-html-target-libgfortran html-target-libgfortran
+maybe-html-target-libgfortran:
+@if target-libgfortran
+maybe-html-target-libgfortran: html-target-libgfortran
 
-html-target-libgo: \
-    configure-target-libgo 
+html-target-libgfortran: \
+    configure-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libgfortran" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51025,25 +33959,25 @@ html-target-libgo: \
                   html) \
          || exit 1
 
-@endif target-libgo
+@endif target-libgfortran
 
-.PHONY: maybe-TAGS-target-libgo TAGS-target-libgo
-maybe-TAGS-target-libgo:
-@if target-libgo
-maybe-TAGS-target-libgo: TAGS-target-libgo
+.PHONY: maybe-TAGS-target-libgfortran TAGS-target-libgfortran
+maybe-TAGS-target-libgfortran:
+@if target-libgfortran
+maybe-TAGS-target-libgfortran: TAGS-target-libgfortran
 
-TAGS-target-libgo: \
-    configure-target-libgo 
+TAGS-target-libgfortran: \
+    configure-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libgfortran" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51051,26 +33985,26 @@ TAGS-target-libgo: \
                   TAGS) \
          || exit 1
 
-@endif target-libgo
+@endif target-libgfortran
 
-.PHONY: maybe-install-info-target-libgo install-info-target-libgo
-maybe-install-info-target-libgo:
-@if target-libgo
-maybe-install-info-target-libgo: install-info-target-libgo
+.PHONY: maybe-install-info-target-libgfortran install-info-target-libgfortran
+maybe-install-info-target-libgfortran:
+@if target-libgfortran
+maybe-install-info-target-libgfortran: install-info-target-libgfortran
 
-install-info-target-libgo: \
-    configure-target-libgo \
-    info-target-libgo 
+install-info-target-libgfortran: \
+    configure-target-libgfortran \
+    info-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libgfortran" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51078,26 +34012,26 @@ install-info-target-libgo: \
                   install-info) \
          || exit 1
 
-@endif target-libgo
+@endif target-libgfortran
 
-.PHONY: maybe-install-pdf-target-libgo install-pdf-target-libgo
-maybe-install-pdf-target-libgo:
-@if target-libgo
-maybe-install-pdf-target-libgo: install-pdf-target-libgo
+.PHONY: maybe-install-pdf-target-libgfortran install-pdf-target-libgfortran
+maybe-install-pdf-target-libgfortran:
+@if target-libgfortran
+maybe-install-pdf-target-libgfortran: install-pdf-target-libgfortran
 
-install-pdf-target-libgo: \
-    configure-target-libgo \
-    pdf-target-libgo 
+install-pdf-target-libgfortran: \
+    configure-target-libgfortran \
+    pdf-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-pdf in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libgfortran" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51105,26 +34039,26 @@ install-pdf-target-libgo: \
                   install-pdf) \
          || exit 1
 
-@endif target-libgo
+@endif target-libgfortran
 
-.PHONY: maybe-install-html-target-libgo install-html-target-libgo
-maybe-install-html-target-libgo:
-@if target-libgo
-maybe-install-html-target-libgo: install-html-target-libgo
+.PHONY: maybe-install-html-target-libgfortran install-html-target-libgfortran
+maybe-install-html-target-libgfortran:
+@if target-libgfortran
+maybe-install-html-target-libgfortran: install-html-target-libgfortran
 
-install-html-target-libgo: \
-    configure-target-libgo \
-    html-target-libgo 
+install-html-target-libgfortran: \
+    configure-target-libgfortran \
+    html-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-html in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libgfortran" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51132,25 +34066,25 @@ install-html-target-libgo: \
                   install-html) \
          || exit 1
 
-@endif target-libgo
+@endif target-libgfortran
 
-.PHONY: maybe-installcheck-target-libgo installcheck-target-libgo
-maybe-installcheck-target-libgo:
-@if target-libgo
-maybe-installcheck-target-libgo: installcheck-target-libgo
+.PHONY: maybe-installcheck-target-libgfortran installcheck-target-libgfortran
+maybe-installcheck-target-libgfortran:
+@if target-libgfortran
+maybe-installcheck-target-libgfortran: installcheck-target-libgfortran
 
-installcheck-target-libgo: \
-    configure-target-libgo 
+installcheck-target-libgfortran: \
+    configure-target-libgfortran 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libgfortran" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51158,24 +34092,24 @@ installcheck-target-libgo: \
                   installcheck) \
          || exit 1
 
-@endif target-libgo
+@endif target-libgfortran
 
-.PHONY: maybe-mostlyclean-target-libgo mostlyclean-target-libgo
-maybe-mostlyclean-target-libgo:
-@if target-libgo
-maybe-mostlyclean-target-libgo: mostlyclean-target-libgo
+.PHONY: maybe-mostlyclean-target-libgfortran mostlyclean-target-libgfortran
+maybe-mostlyclean-target-libgfortran:
+@if target-libgfortran
+maybe-mostlyclean-target-libgfortran: mostlyclean-target-libgfortran
 
-mostlyclean-target-libgo: 
+mostlyclean-target-libgfortran: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgfortran" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51183,24 +34117,24 @@ mostlyclean-target-libgo:
                   mostlyclean) \
          || exit 1
 
-@endif target-libgo
+@endif target-libgfortran
 
-.PHONY: maybe-clean-target-libgo clean-target-libgo
-maybe-clean-target-libgo:
-@if target-libgo
-maybe-clean-target-libgo: clean-target-libgo
+.PHONY: maybe-clean-target-libgfortran clean-target-libgfortran
+maybe-clean-target-libgfortran:
+@if target-libgfortran
+maybe-clean-target-libgfortran: clean-target-libgfortran
 
-clean-target-libgo: 
+clean-target-libgfortran: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libgfortran" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51208,24 +34142,24 @@ clean-target-libgo:
                   clean) \
          || exit 1
 
-@endif target-libgo
+@endif target-libgfortran
 
-.PHONY: maybe-distclean-target-libgo distclean-target-libgo
-maybe-distclean-target-libgo:
-@if target-libgo
-maybe-distclean-target-libgo: distclean-target-libgo
+.PHONY: maybe-distclean-target-libgfortran distclean-target-libgfortran
+maybe-distclean-target-libgfortran:
+@if target-libgfortran
+maybe-distclean-target-libgfortran: distclean-target-libgfortran
 
-distclean-target-libgo: 
+distclean-target-libgfortran: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libgfortran" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51233,24 +34167,24 @@ distclean-target-libgo:
                   distclean) \
          || exit 1
 
-@endif target-libgo
+@endif target-libgfortran
 
-.PHONY: maybe-maintainer-clean-target-libgo maintainer-clean-target-libgo
-maybe-maintainer-clean-target-libgo:
-@if target-libgo
-maybe-maintainer-clean-target-libgo: maintainer-clean-target-libgo
+.PHONY: maybe-maintainer-clean-target-libgfortran maintainer-clean-target-libgfortran
+maybe-maintainer-clean-target-libgfortran:
+@if target-libgfortran
+maybe-maintainer-clean-target-libgfortran: maintainer-clean-target-libgfortran
 
-maintainer-clean-target-libgo: 
+maintainer-clean-target-libgfortran: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgo" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgfortran" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgo && \
+       (cd $(TARGET_SUBDIR)/libgfortran && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51258,140 +34192,145 @@ maintainer-clean-target-libgo:
                   maintainer-clean) \
          || exit 1
 
-@endif target-libgo
+@endif target-libgfortran
 
 
 
 
 
-.PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
-maybe-configure-target-libtermcap:
+.PHONY: configure-target-libobjc maybe-configure-target-libobjc
+maybe-configure-target-libobjc:
 @if gcc-bootstrap
-configure-target-libtermcap: stage_current
+configure-target-libobjc: stage_current
 @endif gcc-bootstrap
-@if target-libtermcap
-maybe-configure-target-libtermcap: configure-target-libtermcap
-configure-target-libtermcap: 
+@if target-libobjc
+maybe-configure-target-libobjc: configure-target-libobjc
+configure-target-libobjc: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for libtermcap..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libtermcap/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libtermcap/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libtermcap/multilib.tmp; \
+       echo "Checking multilib configuration for libobjc..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libobjc/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libobjc/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libobjc/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libtermcap/Makefile; \
-           mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libobjc/Makefile; \
+           mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
+         mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
+       test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
        $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libtermcap; \
-       cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/libobjc; \
+       cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libtermcap/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libobjc/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libtermcap"; \
-       libsrcdir="$$s/libtermcap"; \
+       srcdiroption="--srcdir=$${topdir}/libobjc"; \
+       libsrcdir="$$s/libobjc"; \
        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-libtermcap
+@endif target-libobjc
 
 
 
 
 
-.PHONY: all-target-libtermcap maybe-all-target-libtermcap
-maybe-all-target-libtermcap:
+.PHONY: all-target-libobjc maybe-all-target-libobjc
+maybe-all-target-libobjc:
 @if gcc-bootstrap
-all-target-libtermcap: stage_current
+all-target-libobjc: stage_current
 @endif gcc-bootstrap
-@if target-libtermcap
-TARGET-target-libtermcap=all
-maybe-all-target-libtermcap: all-target-libtermcap
-all-target-libtermcap: configure-target-libtermcap
+@if target-libobjc
+TARGET-target-libobjc=all
+maybe-all-target-libobjc: all-target-libobjc
+all-target-libobjc: configure-target-libobjc
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libtermcap))
-@endif target-libtermcap
+               $(TARGET-target-libobjc))
+@endif target-libobjc
 
 
 
 
 
-.PHONY: check-target-libtermcap maybe-check-target-libtermcap
-maybe-check-target-libtermcap:
-@if target-libtermcap
-maybe-check-target-libtermcap: check-target-libtermcap
+.PHONY: check-target-libobjc maybe-check-target-libobjc
+maybe-check-target-libobjc:
+@if target-libobjc
+maybe-check-target-libobjc: check-target-libobjc
 
-# Dummy target for uncheckable module.
-check-target-libtermcap:
+check-target-libobjc:
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       (cd $(TARGET_SUBDIR)/libobjc && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
-@endif target-libtermcap
+@endif target-libobjc
 
-.PHONY: install-target-libtermcap maybe-install-target-libtermcap
-maybe-install-target-libtermcap:
-@if target-libtermcap
-maybe-install-target-libtermcap: install-target-libtermcap
+.PHONY: install-target-libobjc maybe-install-target-libobjc
+maybe-install-target-libobjc:
+@if target-libobjc
+maybe-install-target-libobjc: install-target-libobjc
 
-install-target-libtermcap: installdirs
+install-target-libobjc: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-libtermcap
+@endif target-libobjc
 
-.PHONY: install-strip-target-libtermcap maybe-install-strip-target-libtermcap
-maybe-install-strip-target-libtermcap:
-@if target-libtermcap
-maybe-install-strip-target-libtermcap: install-strip-target-libtermcap
+.PHONY: install-strip-target-libobjc maybe-install-strip-target-libobjc
+maybe-install-strip-target-libobjc:
+@if target-libobjc
+maybe-install-strip-target-libobjc: install-strip-target-libobjc
 
-install-strip-target-libtermcap: installdirs
+install-strip-target-libobjc: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif target-libtermcap
+@endif target-libobjc
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-target-libtermcap info-target-libtermcap
-maybe-info-target-libtermcap:
-@if target-libtermcap
-maybe-info-target-libtermcap: info-target-libtermcap
+.PHONY: maybe-info-target-libobjc info-target-libobjc
+maybe-info-target-libobjc:
+@if target-libobjc
+maybe-info-target-libobjc: info-target-libobjc
 
-info-target-libtermcap: \
-    configure-target-libtermcap 
+info-target-libobjc: \
+    configure-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libtermcap" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libobjc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51399,25 +34338,25 @@ info-target-libtermcap: \
                   info) \
          || exit 1
 
-@endif target-libtermcap
+@endif target-libobjc
 
-.PHONY: maybe-dvi-target-libtermcap dvi-target-libtermcap
-maybe-dvi-target-libtermcap:
-@if target-libtermcap
-maybe-dvi-target-libtermcap: dvi-target-libtermcap
+.PHONY: maybe-dvi-target-libobjc dvi-target-libobjc
+maybe-dvi-target-libobjc:
+@if target-libobjc
+maybe-dvi-target-libobjc: dvi-target-libobjc
 
-dvi-target-libtermcap: \
-    configure-target-libtermcap 
+dvi-target-libobjc: \
+    configure-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libtermcap" ; \
+       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)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51425,25 +34364,25 @@ dvi-target-libtermcap: \
                   dvi) \
          || exit 1
 
-@endif target-libtermcap
+@endif target-libobjc
 
-.PHONY: maybe-pdf-target-libtermcap pdf-target-libtermcap
-maybe-pdf-target-libtermcap:
-@if target-libtermcap
-maybe-pdf-target-libtermcap: pdf-target-libtermcap
+.PHONY: maybe-pdf-target-libobjc pdf-target-libobjc
+maybe-pdf-target-libobjc:
+@if target-libobjc
+maybe-pdf-target-libobjc: pdf-target-libobjc
 
-pdf-target-libtermcap: \
-    configure-target-libtermcap 
+pdf-target-libobjc: \
+    configure-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libtermcap" ; \
+       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)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51451,25 +34390,25 @@ pdf-target-libtermcap: \
                   pdf) \
          || exit 1
 
-@endif target-libtermcap
+@endif target-libobjc
 
-.PHONY: maybe-html-target-libtermcap html-target-libtermcap
-maybe-html-target-libtermcap:
-@if target-libtermcap
-maybe-html-target-libtermcap: html-target-libtermcap
+.PHONY: maybe-html-target-libobjc html-target-libobjc
+maybe-html-target-libobjc:
+@if target-libobjc
+maybe-html-target-libobjc: html-target-libobjc
 
-html-target-libtermcap: \
-    configure-target-libtermcap 
+html-target-libobjc: \
+    configure-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libtermcap" ; \
+       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)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51477,25 +34416,25 @@ html-target-libtermcap: \
                   html) \
          || exit 1
 
-@endif target-libtermcap
+@endif target-libobjc
 
-.PHONY: maybe-TAGS-target-libtermcap TAGS-target-libtermcap
-maybe-TAGS-target-libtermcap:
-@if target-libtermcap
-maybe-TAGS-target-libtermcap: TAGS-target-libtermcap
+.PHONY: maybe-TAGS-target-libobjc TAGS-target-libobjc
+maybe-TAGS-target-libobjc:
+@if target-libobjc
+maybe-TAGS-target-libobjc: TAGS-target-libobjc
 
-TAGS-target-libtermcap: \
-    configure-target-libtermcap 
+TAGS-target-libobjc: \
+    configure-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libtermcap" ; \
+       echo "Doing 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)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51503,26 +34442,26 @@ TAGS-target-libtermcap: \
                   TAGS) \
          || exit 1
 
-@endif target-libtermcap
+@endif target-libobjc
 
-.PHONY: maybe-install-info-target-libtermcap install-info-target-libtermcap
-maybe-install-info-target-libtermcap:
-@if target-libtermcap
-maybe-install-info-target-libtermcap: install-info-target-libtermcap
+.PHONY: maybe-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-libtermcap: \
-    configure-target-libtermcap \
-    info-target-libtermcap 
+install-info-target-libobjc: \
+    configure-target-libobjc \
+    info-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/libtermcap" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libobjc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51530,26 +34469,26 @@ install-info-target-libtermcap: \
                   install-info) \
          || exit 1
 
-@endif target-libtermcap
+@endif target-libobjc
 
-.PHONY: maybe-install-pdf-target-libtermcap install-pdf-target-libtermcap
-maybe-install-pdf-target-libtermcap:
-@if target-libtermcap
-maybe-install-pdf-target-libtermcap: install-pdf-target-libtermcap
+.PHONY: maybe-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-libtermcap: \
-    configure-target-libtermcap \
-    pdf-target-libtermcap 
+install-pdf-target-libobjc: \
+    configure-target-libobjc \
+    pdf-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-pdf in $(TARGET_SUBDIR)/libtermcap" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libobjc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51557,26 +34496,26 @@ install-pdf-target-libtermcap: \
                   install-pdf) \
          || exit 1
 
-@endif target-libtermcap
+@endif target-libobjc
 
-.PHONY: maybe-install-html-target-libtermcap install-html-target-libtermcap
-maybe-install-html-target-libtermcap:
-@if target-libtermcap
-maybe-install-html-target-libtermcap: install-html-target-libtermcap
+.PHONY: maybe-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-libtermcap: \
-    configure-target-libtermcap \
-    html-target-libtermcap 
+install-html-target-libobjc: \
+    configure-target-libobjc \
+    html-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-html in $(TARGET_SUBDIR)/libtermcap" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libobjc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51584,25 +34523,25 @@ install-html-target-libtermcap: \
                   install-html) \
          || exit 1
 
-@endif target-libtermcap
+@endif target-libobjc
 
-.PHONY: maybe-installcheck-target-libtermcap installcheck-target-libtermcap
-maybe-installcheck-target-libtermcap:
-@if target-libtermcap
-maybe-installcheck-target-libtermcap: installcheck-target-libtermcap
+.PHONY: maybe-installcheck-target-libobjc installcheck-target-libobjc
+maybe-installcheck-target-libobjc:
+@if target-libobjc
+maybe-installcheck-target-libobjc: installcheck-target-libobjc
 
-installcheck-target-libtermcap: \
-    configure-target-libtermcap 
+installcheck-target-libobjc: \
+    configure-target-libobjc 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libtermcap" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libobjc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libtermcap && \
+       (cd $(TARGET_SUBDIR)/libobjc && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51610,185 +34549,245 @@ installcheck-target-libtermcap: \
                   installcheck) \
          || exit 1
 
-@endif target-libtermcap
+@endif target-libobjc
 
-.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-libobjc mostlyclean-target-libobjc
+maybe-mostlyclean-target-libobjc:
+@if target-libobjc
+maybe-mostlyclean-target-libobjc: mostlyclean-target-libobjc
 
-# libtermcap doesn't support mostlyclean.
-mostlyclean-target-libtermcap:
+mostlyclean-target-libobjc: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing 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)/libobjc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  mostlyclean) \
+         || exit 1
 
-@endif target-libtermcap
+@endif target-libobjc
 
-.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-libobjc clean-target-libobjc
+maybe-clean-target-libobjc:
+@if target-libobjc
+maybe-clean-target-libobjc: clean-target-libobjc
 
-# libtermcap doesn't support clean.
-clean-target-libtermcap:
+clean-target-libobjc: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing 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)/libobjc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  clean) \
+         || exit 1
 
-@endif target-libtermcap
+@endif target-libobjc
 
-.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-libobjc distclean-target-libobjc
+maybe-distclean-target-libobjc:
+@if target-libobjc
+maybe-distclean-target-libobjc: distclean-target-libobjc
 
-# libtermcap doesn't support distclean.
-distclean-target-libtermcap:
+distclean-target-libobjc: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing 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)/libobjc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  distclean) \
+         || exit 1
 
-@endif target-libtermcap
+@endif target-libobjc
 
-.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-libobjc maintainer-clean-target-libobjc
+maybe-maintainer-clean-target-libobjc:
+@if target-libobjc
+maybe-maintainer-clean-target-libobjc: maintainer-clean-target-libobjc
 
-# libtermcap doesn't support maintainer-clean.
-maintainer-clean-target-libtermcap:
+maintainer-clean-target-libobjc: 
+       @: $(MAKE); $(unstage)
+       @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(NORMAL_TARGET_EXPORTS) \
+       echo "Doing 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)/libobjc && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+                  maintainer-clean) \
+         || exit 1
 
-@endif target-libtermcap
+@endif target-libobjc
 
 
 
 
 
-.PHONY: configure-target-winsup maybe-configure-target-winsup
-maybe-configure-target-winsup:
+.PHONY: configure-target-libgo maybe-configure-target-libgo
+maybe-configure-target-libgo:
 @if gcc-bootstrap
-configure-target-winsup: stage_current
+configure-target-libgo: stage_current
 @endif gcc-bootstrap
-@if target-winsup
-maybe-configure-target-winsup: configure-target-winsup
-configure-target-winsup: 
+@if target-libgo
+maybe-configure-target-libgo: configure-target-libgo
+configure-target-libgo: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for winsup..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/winsup/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/winsup/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/winsup/multilib.tmp; \
+       echo "Checking multilib configuration for libgo..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgo ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgo/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libgo/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libgo/multilib.tmp $(TARGET_SUBDIR)/libgo/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libgo/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/winsup/Makefile; \
-           mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libgo/Makefile; \
+           mv $(TARGET_SUBDIR)/libgo/multilib.tmp $(TARGET_SUBDIR)/libgo/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
+         mv $(TARGET_SUBDIR)/libgo/multilib.tmp $(TARGET_SUBDIR)/libgo/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
+       test ! -f $(TARGET_SUBDIR)/libgo/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgo ; \
        $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/winsup; \
-       cd "$(TARGET_SUBDIR)/winsup" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/libgo; \
+       cd "$(TARGET_SUBDIR)/libgo" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/winsup/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libgo/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/winsup"; \
-       libsrcdir="$$s/winsup"; \
+       esac; \
+       srcdiroption="--srcdir=$${topdir}/libgo"; \
+       libsrcdir="$$s/libgo"; \
        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-winsup
+@endif target-libgo
 
 
 
 
 
-.PHONY: all-target-winsup maybe-all-target-winsup
-maybe-all-target-winsup:
+.PHONY: all-target-libgo maybe-all-target-libgo
+maybe-all-target-libgo:
 @if gcc-bootstrap
-all-target-winsup: stage_current
+all-target-libgo: stage_current
 @endif gcc-bootstrap
-@if target-winsup
-TARGET-target-winsup=all
-maybe-all-target-winsup: all-target-winsup
-all-target-winsup: configure-target-winsup
+@if target-libgo
+TARGET-target-libgo=all
+maybe-all-target-libgo: all-target-libgo
+all-target-libgo: configure-target-libgo
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-winsup))
-@endif target-winsup
+               $(TARGET-target-libgo))
+@endif target-libgo
 
 
 
 
 
-.PHONY: check-target-winsup maybe-check-target-winsup
-maybe-check-target-winsup:
-@if target-winsup
-maybe-check-target-winsup: check-target-winsup
+.PHONY: check-target-libgo maybe-check-target-libgo
+maybe-check-target-libgo:
+@if target-libgo
+maybe-check-target-libgo: check-target-libgo
 
-check-target-winsup:
+check-target-libgo:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
-@endif target-winsup
+@endif target-libgo
 
-.PHONY: install-target-winsup maybe-install-target-winsup
-maybe-install-target-winsup:
-@if target-winsup
-maybe-install-target-winsup: install-target-winsup
+.PHONY: install-target-libgo maybe-install-target-libgo
+maybe-install-target-libgo:
+@if target-libgo
+maybe-install-target-libgo: install-target-libgo
 
-install-target-winsup: installdirs
+install-target-libgo: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-winsup
+@endif target-libgo
 
-.PHONY: install-strip-target-winsup maybe-install-strip-target-winsup
-maybe-install-strip-target-winsup:
-@if target-winsup
-maybe-install-strip-target-winsup: install-strip-target-winsup
+.PHONY: install-strip-target-libgo maybe-install-strip-target-libgo
+maybe-install-strip-target-libgo:
+@if target-libgo
+maybe-install-strip-target-libgo: install-strip-target-libgo
 
-install-strip-target-winsup: installdirs
+install-strip-target-libgo: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif target-winsup
+@endif target-libgo
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-target-winsup info-target-winsup
-maybe-info-target-winsup:
-@if target-winsup
-maybe-info-target-winsup: info-target-winsup
+.PHONY: maybe-info-target-libgo info-target-libgo
+maybe-info-target-libgo:
+@if target-libgo
+maybe-info-target-libgo: info-target-libgo
 
-info-target-winsup: \
-    configure-target-winsup 
+info-target-libgo: \
+    configure-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libgo" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51796,25 +34795,25 @@ info-target-winsup: \
                   info) \
          || exit 1
 
-@endif target-winsup
+@endif target-libgo
 
-.PHONY: maybe-dvi-target-winsup dvi-target-winsup
-maybe-dvi-target-winsup:
-@if target-winsup
-maybe-dvi-target-winsup: dvi-target-winsup
+.PHONY: maybe-dvi-target-libgo dvi-target-libgo
+maybe-dvi-target-libgo:
+@if target-libgo
+maybe-dvi-target-libgo: dvi-target-libgo
 
-dvi-target-winsup: \
-    configure-target-winsup 
+dvi-target-libgo: \
+    configure-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libgo" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51822,25 +34821,25 @@ dvi-target-winsup: \
                   dvi) \
          || exit 1
 
-@endif target-winsup
+@endif target-libgo
 
-.PHONY: maybe-pdf-target-winsup pdf-target-winsup
-maybe-pdf-target-winsup:
-@if target-winsup
-maybe-pdf-target-winsup: pdf-target-winsup
+.PHONY: maybe-pdf-target-libgo pdf-target-libgo
+maybe-pdf-target-libgo:
+@if target-libgo
+maybe-pdf-target-libgo: pdf-target-libgo
 
-pdf-target-winsup: \
-    configure-target-winsup 
+pdf-target-libgo: \
+    configure-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libgo" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51848,25 +34847,25 @@ pdf-target-winsup: \
                   pdf) \
          || exit 1
 
-@endif target-winsup
+@endif target-libgo
 
-.PHONY: maybe-html-target-winsup html-target-winsup
-maybe-html-target-winsup:
-@if target-winsup
-maybe-html-target-winsup: html-target-winsup
+.PHONY: maybe-html-target-libgo html-target-libgo
+maybe-html-target-libgo:
+@if target-libgo
+maybe-html-target-libgo: html-target-libgo
 
-html-target-winsup: \
-    configure-target-winsup 
+html-target-libgo: \
+    configure-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libgo" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51874,25 +34873,25 @@ html-target-winsup: \
                   html) \
          || exit 1
 
-@endif target-winsup
+@endif target-libgo
 
-.PHONY: maybe-TAGS-target-winsup TAGS-target-winsup
-maybe-TAGS-target-winsup:
-@if target-winsup
-maybe-TAGS-target-winsup: TAGS-target-winsup
+.PHONY: maybe-TAGS-target-libgo TAGS-target-libgo
+maybe-TAGS-target-libgo:
+@if target-libgo
+maybe-TAGS-target-libgo: TAGS-target-libgo
 
-TAGS-target-winsup: \
-    configure-target-winsup 
+TAGS-target-libgo: \
+    configure-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libgo" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51900,26 +34899,26 @@ TAGS-target-winsup: \
                   TAGS) \
          || exit 1
 
-@endif target-winsup
+@endif target-libgo
 
-.PHONY: maybe-install-info-target-winsup install-info-target-winsup
-maybe-install-info-target-winsup:
-@if target-winsup
-maybe-install-info-target-winsup: install-info-target-winsup
+.PHONY: maybe-install-info-target-libgo install-info-target-libgo
+maybe-install-info-target-libgo:
+@if target-libgo
+maybe-install-info-target-libgo: install-info-target-libgo
 
-install-info-target-winsup: \
-    configure-target-winsup \
-    info-target-winsup 
+install-info-target-libgo: \
+    configure-target-libgo \
+    info-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libgo" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51927,26 +34926,26 @@ install-info-target-winsup: \
                   install-info) \
          || exit 1
 
-@endif target-winsup
+@endif target-libgo
 
-.PHONY: maybe-install-pdf-target-winsup install-pdf-target-winsup
-maybe-install-pdf-target-winsup:
-@if target-winsup
-maybe-install-pdf-target-winsup: install-pdf-target-winsup
+.PHONY: maybe-install-pdf-target-libgo install-pdf-target-libgo
+maybe-install-pdf-target-libgo:
+@if target-libgo
+maybe-install-pdf-target-libgo: install-pdf-target-libgo
 
-install-pdf-target-winsup: \
-    configure-target-winsup \
-    pdf-target-winsup 
+install-pdf-target-libgo: \
+    configure-target-libgo \
+    pdf-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-pdf in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libgo" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51954,26 +34953,26 @@ install-pdf-target-winsup: \
                   install-pdf) \
          || exit 1
 
-@endif target-winsup
+@endif target-libgo
 
-.PHONY: maybe-install-html-target-winsup install-html-target-winsup
-maybe-install-html-target-winsup:
-@if target-winsup
-maybe-install-html-target-winsup: install-html-target-winsup
+.PHONY: maybe-install-html-target-libgo install-html-target-libgo
+maybe-install-html-target-libgo:
+@if target-libgo
+maybe-install-html-target-libgo: install-html-target-libgo
 
-install-html-target-winsup: \
-    configure-target-winsup \
-    html-target-winsup 
+install-html-target-libgo: \
+    configure-target-libgo \
+    html-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-html in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libgo" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -51981,25 +34980,25 @@ install-html-target-winsup: \
                   install-html) \
          || exit 1
 
-@endif target-winsup
+@endif target-libgo
 
-.PHONY: maybe-installcheck-target-winsup installcheck-target-winsup
-maybe-installcheck-target-winsup:
-@if target-winsup
-maybe-installcheck-target-winsup: installcheck-target-winsup
+.PHONY: maybe-installcheck-target-libgo installcheck-target-libgo
+maybe-installcheck-target-libgo:
+@if target-libgo
+maybe-installcheck-target-libgo: installcheck-target-libgo
 
-installcheck-target-winsup: \
-    configure-target-winsup 
+installcheck-target-libgo: \
+    configure-target-libgo 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libgo" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -52007,24 +35006,24 @@ installcheck-target-winsup: \
                   installcheck) \
          || exit 1
 
-@endif target-winsup
+@endif target-libgo
 
-.PHONY: maybe-mostlyclean-target-winsup mostlyclean-target-winsup
-maybe-mostlyclean-target-winsup:
-@if target-winsup
-maybe-mostlyclean-target-winsup: mostlyclean-target-winsup
+.PHONY: maybe-mostlyclean-target-libgo mostlyclean-target-libgo
+maybe-mostlyclean-target-libgo:
+@if target-libgo
+maybe-mostlyclean-target-libgo: mostlyclean-target-libgo
 
-mostlyclean-target-winsup: 
+mostlyclean-target-libgo: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgo" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -52032,24 +35031,24 @@ mostlyclean-target-winsup:
                   mostlyclean) \
          || exit 1
 
-@endif target-winsup
+@endif target-libgo
 
-.PHONY: maybe-clean-target-winsup clean-target-winsup
-maybe-clean-target-winsup:
-@if target-winsup
-maybe-clean-target-winsup: clean-target-winsup
+.PHONY: maybe-clean-target-libgo clean-target-libgo
+maybe-clean-target-libgo:
+@if target-libgo
+maybe-clean-target-libgo: clean-target-libgo
 
-clean-target-winsup: 
+clean-target-libgo: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing clean in $(TARGET_SUBDIR)/libgo" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -52057,24 +35056,24 @@ clean-target-winsup:
                   clean) \
          || exit 1
 
-@endif target-winsup
+@endif target-libgo
 
-.PHONY: maybe-distclean-target-winsup distclean-target-winsup
-maybe-distclean-target-winsup:
-@if target-winsup
-maybe-distclean-target-winsup: distclean-target-winsup
+.PHONY: maybe-distclean-target-libgo distclean-target-libgo
+maybe-distclean-target-libgo:
+@if target-libgo
+maybe-distclean-target-libgo: distclean-target-libgo
 
-distclean-target-winsup: 
+distclean-target-libgo: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libgo" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -52082,24 +35081,24 @@ distclean-target-winsup:
                   distclean) \
          || exit 1
 
-@endif target-winsup
+@endif target-libgo
 
-.PHONY: maybe-maintainer-clean-target-winsup maintainer-clean-target-winsup
-maybe-maintainer-clean-target-winsup:
-@if target-winsup
-maybe-maintainer-clean-target-winsup: maintainer-clean-target-winsup
+.PHONY: maybe-maintainer-clean-target-libgo maintainer-clean-target-libgo
+maybe-maintainer-clean-target-libgo:
+@if target-libgo
+maybe-maintainer-clean-target-libgo: maintainer-clean-target-libgo
 
-maintainer-clean-target-winsup: 
+maintainer-clean-target-libgo: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/winsup" ; \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgo" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/winsup && \
+       (cd $(TARGET_SUBDIR)/libgo && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -52107,597 +35106,537 @@ maintainer-clean-target-winsup:
                   maintainer-clean) \
          || exit 1
 
-@endif target-winsup
+@endif target-libgo
 
 
 
 
 
-.PHONY: configure-target-libgloss maybe-configure-target-libgloss
-maybe-configure-target-libgloss:
+.PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
+maybe-configure-target-libtermcap:
 @if gcc-bootstrap
-configure-target-libgloss: stage_current
+configure-target-libtermcap: stage_current
 @endif gcc-bootstrap
-@if target-libgloss
-maybe-configure-target-libgloss: configure-target-libgloss
-configure-target-libgloss: 
+@if target-libtermcap
+maybe-configure-target-libtermcap: configure-target-libtermcap
+configure-target-libtermcap: 
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for libgloss..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgloss/multilib.tmp 2> /dev/null ; \
-       if test -r $(TARGET_SUBDIR)/libgloss/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libgloss/multilib.tmp; \
+       echo "Checking multilib configuration for libtermcap..."; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
+       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libtermcap/multilib.tmp 2> /dev/null ; \
+       if test -r $(TARGET_SUBDIR)/libtermcap/multilib.out; then \
+         if cmp -s $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; then \
+           rm -f $(TARGET_SUBDIR)/libtermcap/multilib.tmp; \
          else \
-           rm -f $(TARGET_SUBDIR)/libgloss/Makefile; \
-           mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libtermcap/Makefile; \
+           mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
+         mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
+       test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
        $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libgloss; \
-       cd "$(TARGET_SUBDIR)/libgloss" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/libtermcap; \
+       cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libgloss/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libtermcap/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libgloss"; \
-       libsrcdir="$$s/libgloss"; \
+       srcdiroption="--srcdir=$${topdir}/libtermcap"; \
+       libsrcdir="$$s/libtermcap"; \
        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-libgloss
+@endif target-libtermcap
 
 
 
 
 
-.PHONY: all-target-libgloss maybe-all-target-libgloss
-maybe-all-target-libgloss:
+.PHONY: all-target-libtermcap maybe-all-target-libtermcap
+maybe-all-target-libtermcap:
 @if gcc-bootstrap
-all-target-libgloss: stage_current
+all-target-libtermcap: stage_current
 @endif gcc-bootstrap
-@if target-libgloss
-TARGET-target-libgloss=all
-maybe-all-target-libgloss: all-target-libgloss
-all-target-libgloss: configure-target-libgloss
+@if target-libtermcap
+TARGET-target-libtermcap=all
+maybe-all-target-libtermcap: all-target-libtermcap
+all-target-libtermcap: configure-target-libtermcap
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libgloss))
-@endif target-libgloss
+               $(TARGET-target-libtermcap))
+@endif target-libtermcap
 
 
 
 
 
-.PHONY: check-target-libgloss maybe-check-target-libgloss
-maybe-check-target-libgloss:
-@if target-libgloss
-maybe-check-target-libgloss: check-target-libgloss
+.PHONY: check-target-libtermcap maybe-check-target-libtermcap
+maybe-check-target-libtermcap:
+@if target-libtermcap
+maybe-check-target-libtermcap: check-target-libtermcap
 
 # Dummy target for uncheckable module.
-check-target-libgloss:
+check-target-libtermcap:
 
-@endif target-libgloss
+@endif target-libtermcap
 
-.PHONY: install-target-libgloss maybe-install-target-libgloss
-maybe-install-target-libgloss:
-@if target-libgloss
-maybe-install-target-libgloss: install-target-libgloss
+.PHONY: install-target-libtermcap maybe-install-target-libtermcap
+maybe-install-target-libtermcap:
+@if target-libtermcap
+maybe-install-target-libtermcap: install-target-libtermcap
 
-install-target-libgloss: installdirs
+install-target-libtermcap: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-libgloss
-
-.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-libgloss
-
-# 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
-
-info-target-libgloss: \
-    configure-target-libgloss 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing 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)/libgloss && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  info) \
-         || exit 1
-
-@endif target-libgloss
-
-.PHONY: maybe-dvi-target-libgloss dvi-target-libgloss
-maybe-dvi-target-libgloss:
-@if target-libgloss
-maybe-dvi-target-libgloss: dvi-target-libgloss
-
-dvi-target-libgloss: \
-    configure-target-libgloss 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing 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)/libgloss && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  dvi) \
-         || exit 1
-
-@endif target-libgloss
-
-.PHONY: maybe-pdf-target-libgloss pdf-target-libgloss
-maybe-pdf-target-libgloss:
-@if target-libgloss
-maybe-pdf-target-libgloss: pdf-target-libgloss
-
-pdf-target-libgloss: \
-    configure-target-libgloss 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing 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)/libgloss && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  pdf) \
-         || exit 1
-
-@endif target-libgloss
+@endif target-libtermcap
 
-.PHONY: maybe-html-target-libgloss html-target-libgloss
-maybe-html-target-libgloss:
-@if target-libgloss
-maybe-html-target-libgloss: html-target-libgloss
+.PHONY: 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
 
-html-target-libgloss: \
-    configure-target-libgloss 
+install-strip-target-libtermcap: installdirs
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
-       r=`${PWD_COMMAND}`; export r; \
+       @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libgloss" ; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-                 "RANLIB=$${RANLIB}" \
-                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  html) \
-         || exit 1
+       (cd $(TARGET_SUBDIR)/libtermcap && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif target-libgloss
+@endif target-libtermcap
 
-.PHONY: maybe-TAGS-target-libgloss TAGS-target-libgloss
-maybe-TAGS-target-libgloss:
-@if target-libgloss
-maybe-TAGS-target-libgloss: TAGS-target-libgloss
+# Other targets (info, dvi, pdf, etc.)
 
-TAGS-target-libgloss: \
-    configure-target-libgloss 
+.PHONY: maybe-info-target-libtermcap info-target-libtermcap
+maybe-info-target-libtermcap:
+@if target-libtermcap
+maybe-info-target-libtermcap: info-target-libtermcap
+
+info-target-libtermcap: \
+    configure-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libgloss" ; \
+       echo "Doing info in $(TARGET_SUBDIR)/libtermcap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  TAGS) \
+                  info) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libtermcap
 
-.PHONY: maybe-install-info-target-libgloss install-info-target-libgloss
-maybe-install-info-target-libgloss:
-@if target-libgloss
-maybe-install-info-target-libgloss: install-info-target-libgloss
+.PHONY: maybe-dvi-target-libtermcap dvi-target-libtermcap
+maybe-dvi-target-libtermcap:
+@if target-libtermcap
+maybe-dvi-target-libtermcap: dvi-target-libtermcap
 
-install-info-target-libgloss: \
-    configure-target-libgloss \
-    info-target-libgloss 
+dvi-target-libtermcap: \
+    configure-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/libgloss" ; \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libtermcap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  install-info) \
+                  dvi) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libtermcap
 
-.PHONY: maybe-install-pdf-target-libgloss install-pdf-target-libgloss
-maybe-install-pdf-target-libgloss:
-@if target-libgloss
-maybe-install-pdf-target-libgloss: install-pdf-target-libgloss
+.PHONY: maybe-pdf-target-libtermcap pdf-target-libtermcap
+maybe-pdf-target-libtermcap:
+@if target-libtermcap
+maybe-pdf-target-libtermcap: pdf-target-libtermcap
 
-install-pdf-target-libgloss: \
-    configure-target-libgloss \
-    pdf-target-libgloss 
+pdf-target-libtermcap: \
+    configure-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-pdf in $(TARGET_SUBDIR)/libgloss" ; \
+       echo "Doing pdf in $(TARGET_SUBDIR)/libtermcap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  install-pdf) \
+                  pdf) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libtermcap
 
-.PHONY: maybe-install-html-target-libgloss install-html-target-libgloss
-maybe-install-html-target-libgloss:
-@if target-libgloss
-maybe-install-html-target-libgloss: install-html-target-libgloss
+.PHONY: maybe-html-target-libtermcap html-target-libtermcap
+maybe-html-target-libtermcap:
+@if target-libtermcap
+maybe-html-target-libtermcap: html-target-libtermcap
 
-install-html-target-libgloss: \
-    configure-target-libgloss \
-    html-target-libgloss 
+html-target-libtermcap: \
+    configure-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing install-html in $(TARGET_SUBDIR)/libgloss" ; \
+       echo "Doing html in $(TARGET_SUBDIR)/libtermcap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  install-html) \
+                  html) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libtermcap
 
-.PHONY: maybe-installcheck-target-libgloss installcheck-target-libgloss
-maybe-installcheck-target-libgloss:
-@if target-libgloss
-maybe-installcheck-target-libgloss: installcheck-target-libgloss
+.PHONY: maybe-TAGS-target-libtermcap TAGS-target-libtermcap
+maybe-TAGS-target-libtermcap:
+@if target-libtermcap
+maybe-TAGS-target-libtermcap: TAGS-target-libtermcap
 
-installcheck-target-libgloss: \
-    configure-target-libgloss 
+TAGS-target-libtermcap: \
+    configure-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libgloss" ; \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libtermcap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  installcheck) \
+                  TAGS) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libtermcap
 
-.PHONY: maybe-mostlyclean-target-libgloss mostlyclean-target-libgloss
-maybe-mostlyclean-target-libgloss:
-@if target-libgloss
-maybe-mostlyclean-target-libgloss: mostlyclean-target-libgloss
+.PHONY: maybe-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
 
-mostlyclean-target-libgloss: 
+install-info-target-libtermcap: \
+    configure-target-libtermcap \
+    info-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgloss" ; \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libtermcap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  mostlyclean) \
+                  install-info) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libtermcap
 
-.PHONY: maybe-clean-target-libgloss clean-target-libgloss
-maybe-clean-target-libgloss:
-@if target-libgloss
-maybe-clean-target-libgloss: clean-target-libgloss
+.PHONY: maybe-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
 
-clean-target-libgloss: 
+install-pdf-target-libtermcap: \
+    configure-target-libtermcap \
+    pdf-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libgloss" ; \
+       echo "Doing install-pdf in $(TARGET_SUBDIR)/libtermcap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  clean) \
+                  install-pdf) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libtermcap
 
-.PHONY: maybe-distclean-target-libgloss distclean-target-libgloss
-maybe-distclean-target-libgloss:
-@if target-libgloss
-maybe-distclean-target-libgloss: distclean-target-libgloss
+.PHONY: maybe-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
 
-distclean-target-libgloss: 
+install-html-target-libtermcap: \
+    configure-target-libtermcap \
+    html-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libgloss" ; \
+       echo "Doing install-html in $(TARGET_SUBDIR)/libtermcap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  distclean) \
+                  install-html) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libtermcap
 
-.PHONY: maybe-maintainer-clean-target-libgloss maintainer-clean-target-libgloss
-maybe-maintainer-clean-target-libgloss:
-@if target-libgloss
-maybe-maintainer-clean-target-libgloss: maintainer-clean-target-libgloss
+.PHONY: maybe-installcheck-target-libtermcap installcheck-target-libtermcap
+maybe-installcheck-target-libtermcap:
+@if target-libtermcap
+maybe-installcheck-target-libtermcap: installcheck-target-libtermcap
 
-maintainer-clean-target-libgloss: 
+installcheck-target-libtermcap: \
+    configure-target-libtermcap 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgloss" ; \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libtermcap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
        done; \
-       (cd $(TARGET_SUBDIR)/libgloss && \
+       (cd $(TARGET_SUBDIR)/libtermcap && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
                  "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-                  maintainer-clean) \
+                  installcheck) \
          || exit 1
 
-@endif target-libgloss
+@endif target-libtermcap
+
+.PHONY: maybe-mostlyclean-target-libtermcap mostlyclean-target-libtermcap
+maybe-mostlyclean-target-libtermcap:
+@if target-libtermcap
+maybe-mostlyclean-target-libtermcap: mostlyclean-target-libtermcap
+
+# libtermcap doesn't support mostlyclean.
+mostlyclean-target-libtermcap:
+
+@endif target-libtermcap
 
+.PHONY: maybe-clean-target-libtermcap clean-target-libtermcap
+maybe-clean-target-libtermcap:
+@if target-libtermcap
+maybe-clean-target-libtermcap: clean-target-libtermcap
 
+# libtermcap doesn't support clean.
+clean-target-libtermcap:
 
+@endif target-libtermcap
 
+.PHONY: maybe-distclean-target-libtermcap distclean-target-libtermcap
+maybe-distclean-target-libtermcap:
+@if target-libtermcap
+maybe-distclean-target-libtermcap: distclean-target-libtermcap
 
-.PHONY: configure-target-libiberty maybe-configure-target-libiberty
-maybe-configure-target-libiberty:
+# libtermcap doesn't support distclean.
+distclean-target-libtermcap:
+
+@endif target-libtermcap
+
+.PHONY: maybe-maintainer-clean-target-libtermcap maintainer-clean-target-libtermcap
+maybe-maintainer-clean-target-libtermcap:
+@if target-libtermcap
+maybe-maintainer-clean-target-libtermcap: maintainer-clean-target-libtermcap
+
+# libtermcap doesn't support maintainer-clean.
+maintainer-clean-target-libtermcap:
+
+@endif target-libtermcap
+
+
+
+
+
+.PHONY: configure-target-winsup maybe-configure-target-winsup
+maybe-configure-target-winsup:
 @if gcc-bootstrap
-configure-target-libiberty: stage_current
+configure-target-winsup: stage_current
 @endif gcc-bootstrap
-@if target-libiberty
-maybe-configure-target-libiberty: configure-target-libiberty
-configure-target-libiberty: 
+@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 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 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)/libiberty/Makefile; \
-           mv $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/winsup/Makefile; \
+           mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; \
+         mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \
+       test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
        $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libiberty; \
-       cd "$(TARGET_SUBDIR)/libiberty" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/winsup; \
+       cd "$(TARGET_SUBDIR)/winsup" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libiberty/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/winsup/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
+       srcdiroption="--srcdir=$${topdir}/winsup"; \
+       libsrcdir="$$s/winsup"; \
        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-libiberty
+@endif target-winsup
 
 
 
 
 
-.PHONY: all-target-libiberty maybe-all-target-libiberty
-maybe-all-target-libiberty:
+.PHONY: all-target-winsup maybe-all-target-winsup
+maybe-all-target-winsup:
 @if gcc-bootstrap
-all-target-libiberty: stage_current
+all-target-winsup: 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-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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-libiberty))
-@endif target-libiberty
+               $(TARGET-target-winsup))
+@endif target-winsup
 
 
 
 
 
-.PHONY: check-target-libiberty maybe-check-target-libiberty
-maybe-check-target-libiberty:
-@if target-libiberty
-maybe-check-target-libiberty: check-target-libiberty
+.PHONY: check-target-winsup maybe-check-target-winsup
+maybe-check-target-winsup:
+@if target-winsup
+maybe-check-target-winsup: check-target-winsup
 
-check-target-libiberty:
+check-target-winsup:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libiberty && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
-@endif target-libiberty
+@endif target-winsup
 
-.PHONY: install-target-libiberty maybe-install-target-libiberty
-maybe-install-target-libiberty:
-@if target-libiberty
-maybe-install-target-libiberty: install-target-libiberty
+.PHONY: install-target-winsup maybe-install-target-winsup
+maybe-install-target-winsup:
+@if target-winsup
+maybe-install-target-winsup: install-target-winsup
 
-install-target-libiberty: 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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-libiberty
+@endif target-winsup
 
-.PHONY: install-strip-target-libiberty maybe-install-strip-target-libiberty
-maybe-install-strip-target-libiberty:
-@if target-libiberty
-maybe-install-strip-target-libiberty: install-strip-target-libiberty
+.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-libiberty: installdirs
+install-strip-target-winsup: installdirs
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libiberty && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif target-libiberty
+@endif target-winsup
 
 # 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-winsup info-target-winsup
+maybe-info-target-winsup:
+@if target-winsup
+maybe-info-target-winsup: info-target-winsup
 
-info-target-libiberty: \
-    configure-target-libiberty 
+info-target-winsup: \
+    configure-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -52705,25 +35644,25 @@ info-target-libiberty: \
                   info) \
          || exit 1
 
-@endif target-libiberty
+@endif target-winsup
 
-.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-winsup dvi-target-winsup
+maybe-dvi-target-winsup:
+@if target-winsup
+maybe-dvi-target-winsup: dvi-target-winsup
 
-dvi-target-libiberty: \
-    configure-target-libiberty 
+dvi-target-winsup: \
+    configure-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -52731,25 +35670,25 @@ dvi-target-libiberty: \
                   dvi) \
          || exit 1
 
-@endif target-libiberty
+@endif target-winsup
 
-.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-winsup pdf-target-winsup
+maybe-pdf-target-winsup:
+@if target-winsup
+maybe-pdf-target-winsup: pdf-target-winsup
 
-pdf-target-libiberty: \
-    configure-target-libiberty 
+pdf-target-winsup: \
+    configure-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -52757,25 +35696,25 @@ pdf-target-libiberty: \
                   pdf) \
          || exit 1
 
-@endif target-libiberty
+@endif target-winsup
 
-.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-winsup html-target-winsup
+maybe-html-target-winsup:
+@if target-winsup
+maybe-html-target-winsup: html-target-winsup
 
-html-target-libiberty: \
-    configure-target-libiberty 
+html-target-winsup: \
+    configure-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -52783,25 +35722,25 @@ html-target-libiberty: \
                   html) \
          || exit 1
 
-@endif target-libiberty
+@endif target-winsup
 
-.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-winsup TAGS-target-winsup
+maybe-TAGS-target-winsup:
+@if target-winsup
+maybe-TAGS-target-winsup: TAGS-target-winsup
 
-TAGS-target-libiberty: \
-    configure-target-libiberty 
+TAGS-target-winsup: \
+    configure-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -52809,26 +35748,26 @@ TAGS-target-libiberty: \
                   TAGS) \
          || exit 1
 
-@endif target-libiberty
+@endif target-winsup
 
-.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-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-libiberty: \
-    configure-target-libiberty \
-    info-target-libiberty 
+install-info-target-winsup: \
+    configure-target-winsup \
+    info-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -52836,26 +35775,26 @@ install-info-target-libiberty: \
                   install-info) \
          || exit 1
 
-@endif target-libiberty
+@endif target-winsup
 
-.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-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-libiberty: \
-    configure-target-libiberty \
-    pdf-target-libiberty 
+install-pdf-target-winsup: \
+    configure-target-winsup \
+    pdf-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -52863,26 +35802,26 @@ install-pdf-target-libiberty: \
                   install-pdf) \
          || exit 1
 
-@endif target-libiberty
+@endif target-winsup
 
-.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-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-libiberty: \
-    configure-target-libiberty \
-    html-target-libiberty 
+install-html-target-winsup: \
+    configure-target-winsup \
+    html-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -52890,25 +35829,25 @@ install-html-target-libiberty: \
                   install-html) \
          || exit 1
 
-@endif target-libiberty
+@endif target-winsup
 
-.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-winsup installcheck-target-winsup
+maybe-installcheck-target-winsup:
+@if target-winsup
+maybe-installcheck-target-winsup: installcheck-target-winsup
 
-installcheck-target-libiberty: \
-    configure-target-libiberty 
+installcheck-target-winsup: \
+    configure-target-winsup 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -52916,24 +35855,24 @@ installcheck-target-libiberty: \
                   installcheck) \
          || exit 1
 
-@endif target-libiberty
+@endif target-winsup
 
-.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-winsup mostlyclean-target-winsup
+maybe-mostlyclean-target-winsup:
+@if target-winsup
+maybe-mostlyclean-target-winsup: mostlyclean-target-winsup
 
-mostlyclean-target-libiberty: 
+mostlyclean-target-winsup: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -52941,24 +35880,24 @@ mostlyclean-target-libiberty:
                   mostlyclean) \
          || exit 1
 
-@endif target-libiberty
+@endif target-winsup
 
-.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-winsup clean-target-winsup
+maybe-clean-target-winsup:
+@if target-winsup
+maybe-clean-target-winsup: clean-target-winsup
 
-clean-target-libiberty: 
+clean-target-winsup: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -52966,24 +35905,24 @@ clean-target-libiberty:
                   clean) \
          || exit 1
 
-@endif target-libiberty
+@endif target-winsup
 
-.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-winsup distclean-target-winsup
+maybe-distclean-target-winsup:
+@if target-winsup
+maybe-distclean-target-winsup: distclean-target-winsup
 
-distclean-target-libiberty: 
+distclean-target-winsup: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -52991,24 +35930,24 @@ distclean-target-libiberty:
                   distclean) \
          || exit 1
 
-@endif target-libiberty
+@endif target-winsup
 
-.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-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-libiberty: 
+maintainer-clean-target-winsup: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
+       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)/libiberty && \
+       (cd $(TARGET_SUBDIR)/winsup && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53016,145 +35955,140 @@ maintainer-clean-target-libiberty:
                   maintainer-clean) \
          || exit 1
 
-@endif target-libiberty
+@endif target-winsup
 
 
 
 
 
-.PHONY: configure-target-gperf maybe-configure-target-gperf
-maybe-configure-target-gperf:
+.PHONY: configure-target-libgloss maybe-configure-target-libgloss
+maybe-configure-target-libgloss:
 @if gcc-bootstrap
-configure-target-gperf: stage_current
+configure-target-libgloss: stage_current
 @endif gcc-bootstrap
-@if target-gperf
-maybe-configure-target-gperf: configure-target-gperf
-configure-target-gperf: 
+@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 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 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)/gperf/Makefile; \
-           mv $(TARGET_SUBDIR)/gperf/multilib.tmp $(TARGET_SUBDIR)/gperf/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libgloss/Makefile; \
+           mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/gperf/multilib.tmp $(TARGET_SUBDIR)/gperf/multilib.out; \
+         mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/gperf/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \
+       test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
        $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/gperf; \
-       cd "$(TARGET_SUBDIR)/gperf" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/libgloss; \
+       cd "$(TARGET_SUBDIR)/libgloss" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/gperf/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libgloss/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/gperf"; \
-       libsrcdir="$$s/gperf"; \
+       srcdiroption="--srcdir=$${topdir}/libgloss"; \
+       libsrcdir="$$s/libgloss"; \
        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-gperf
+@endif target-libgloss
 
 
 
 
 
-.PHONY: all-target-gperf maybe-all-target-gperf
-maybe-all-target-gperf:
+.PHONY: all-target-libgloss maybe-all-target-libgloss
+maybe-all-target-libgloss:
 @if gcc-bootstrap
-all-target-gperf: stage_current
+all-target-libgloss: 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-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)/gperf && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-gperf))
-@endif target-gperf
+               $(TARGET-target-libgloss))
+@endif target-libgloss
 
 
 
 
 
-.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-libgloss maybe-check-target-libgloss
+maybe-check-target-libgloss:
+@if target-libgloss
+maybe-check-target-libgloss: check-target-libgloss
 
-check-target-gperf:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/gperf && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+# Dummy target for uncheckable module.
+check-target-libgloss:
 
-@endif target-gperf
+@endif target-libgloss
 
-.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-libgloss maybe-install-target-libgloss
+maybe-install-target-libgloss:
+@if target-libgloss
+maybe-install-target-libgloss: install-target-libgloss
 
-install-target-gperf: installdirs
+install-target-libgloss: 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)/libgloss && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-gperf
+@endif target-libgloss
 
-.PHONY: install-strip-target-gperf maybe-install-strip-target-gperf
-maybe-install-strip-target-gperf:
-@if target-gperf
-maybe-install-strip-target-gperf: install-strip-target-gperf
+.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-gperf: installdirs
+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)/gperf && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif target-gperf
+@endif target-libgloss
 
 # 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-libgloss info-target-libgloss
+maybe-info-target-libgloss:
+@if target-libgloss
+maybe-info-target-libgloss: info-target-libgloss
 
-info-target-gperf: \
-    configure-target-gperf 
+info-target-libgloss: \
+    configure-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53162,25 +36096,25 @@ info-target-gperf: \
                   info) \
          || exit 1
 
-@endif target-gperf
+@endif target-libgloss
 
-.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-libgloss dvi-target-libgloss
+maybe-dvi-target-libgloss:
+@if target-libgloss
+maybe-dvi-target-libgloss: dvi-target-libgloss
 
-dvi-target-gperf: \
-    configure-target-gperf 
+dvi-target-libgloss: \
+    configure-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53188,25 +36122,25 @@ dvi-target-gperf: \
                   dvi) \
          || exit 1
 
-@endif target-gperf
+@endif target-libgloss
 
-.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-libgloss pdf-target-libgloss
+maybe-pdf-target-libgloss:
+@if target-libgloss
+maybe-pdf-target-libgloss: pdf-target-libgloss
 
-pdf-target-gperf: \
-    configure-target-gperf 
+pdf-target-libgloss: \
+    configure-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53214,25 +36148,25 @@ pdf-target-gperf: \
                   pdf) \
          || exit 1
 
-@endif target-gperf
+@endif target-libgloss
 
-.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-libgloss html-target-libgloss
+maybe-html-target-libgloss:
+@if target-libgloss
+maybe-html-target-libgloss: html-target-libgloss
 
-html-target-gperf: \
-    configure-target-gperf 
+html-target-libgloss: \
+    configure-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53240,25 +36174,25 @@ html-target-gperf: \
                   html) \
          || exit 1
 
-@endif target-gperf
+@endif target-libgloss
 
-.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-libgloss TAGS-target-libgloss
+maybe-TAGS-target-libgloss:
+@if target-libgloss
+maybe-TAGS-target-libgloss: TAGS-target-libgloss
 
-TAGS-target-gperf: \
-    configure-target-gperf 
+TAGS-target-libgloss: \
+    configure-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53266,26 +36200,26 @@ TAGS-target-gperf: \
                   TAGS) \
          || exit 1
 
-@endif target-gperf
+@endif target-libgloss
 
-.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-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-gperf: \
-    configure-target-gperf \
-    info-target-gperf 
+install-info-target-libgloss: \
+    configure-target-libgloss \
+    info-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53293,26 +36227,26 @@ install-info-target-gperf: \
                   install-info) \
          || exit 1
 
-@endif target-gperf
+@endif target-libgloss
 
-.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-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-gperf: \
-    configure-target-gperf \
-    pdf-target-gperf 
+install-pdf-target-libgloss: \
+    configure-target-libgloss \
+    pdf-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53320,26 +36254,26 @@ install-pdf-target-gperf: \
                   install-pdf) \
          || exit 1
 
-@endif target-gperf
+@endif target-libgloss
 
-.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-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-gperf: \
-    configure-target-gperf \
-    html-target-gperf 
+install-html-target-libgloss: \
+    configure-target-libgloss \
+    html-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53347,25 +36281,25 @@ install-html-target-gperf: \
                   install-html) \
          || exit 1
 
-@endif target-gperf
+@endif target-libgloss
 
-.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-libgloss installcheck-target-libgloss
+maybe-installcheck-target-libgloss:
+@if target-libgloss
+maybe-installcheck-target-libgloss: installcheck-target-libgloss
 
-installcheck-target-gperf: \
-    configure-target-gperf 
+installcheck-target-libgloss: \
+    configure-target-libgloss 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53373,24 +36307,24 @@ installcheck-target-gperf: \
                   installcheck) \
          || exit 1
 
-@endif target-gperf
+@endif target-libgloss
 
-.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-libgloss mostlyclean-target-libgloss
+maybe-mostlyclean-target-libgloss:
+@if target-libgloss
+maybe-mostlyclean-target-libgloss: mostlyclean-target-libgloss
 
-mostlyclean-target-gperf: 
+mostlyclean-target-libgloss: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53398,24 +36332,24 @@ mostlyclean-target-gperf:
                   mostlyclean) \
          || exit 1
 
-@endif target-gperf
+@endif target-libgloss
 
-.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-libgloss clean-target-libgloss
+maybe-clean-target-libgloss:
+@if target-libgloss
+maybe-clean-target-libgloss: clean-target-libgloss
 
-clean-target-gperf: 
+clean-target-libgloss: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53423,24 +36357,24 @@ clean-target-gperf:
                   clean) \
          || exit 1
 
-@endif target-gperf
+@endif target-libgloss
 
-.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-libgloss distclean-target-libgloss
+maybe-distclean-target-libgloss:
+@if target-libgloss
+maybe-distclean-target-libgloss: distclean-target-libgloss
 
-distclean-target-gperf: 
+distclean-target-libgloss: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53448,24 +36382,24 @@ distclean-target-gperf:
                   distclean) \
          || exit 1
 
-@endif target-gperf
+@endif target-libgloss
 
-.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-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-gperf: 
+maintainer-clean-target-libgloss: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/gperf/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)/gperf" ; \
+       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)/gperf && \
+       (cd $(TARGET_SUBDIR)/libgloss && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53473,130 +36407,145 @@ maintainer-clean-target-gperf:
                   maintainer-clean) \
          || exit 1
 
-@endif target-gperf
+@endif target-libgloss
 
 
 
 
 
-.PHONY: configure-target-examples maybe-configure-target-examples
-maybe-configure-target-examples:
+.PHONY: configure-target-libiberty maybe-configure-target-libiberty
+maybe-configure-target-libiberty:
 @if gcc-bootstrap
-configure-target-examples: stage_current
+configure-target-libiberty: stage_current
 @endif gcc-bootstrap
-@if target-examples
-maybe-configure-target-examples: configure-target-examples
-configure-target-examples: 
+@if target-libiberty
+maybe-configure-target-libiberty: configure-target-libiberty
+configure-target-libiberty: 
        @: $(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 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; \
          else \
-           rm -f $(TARGET_SUBDIR)/examples/Makefile; \
-           mv $(TARGET_SUBDIR)/examples/multilib.tmp $(TARGET_SUBDIR)/examples/multilib.out; \
+           rm -f $(TARGET_SUBDIR)/libiberty/Makefile; \
+           mv $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; \
          fi; \
        else \
-         mv $(TARGET_SUBDIR)/examples/multilib.tmp $(TARGET_SUBDIR)/examples/multilib.out; \
+         mv $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; \
        fi; \
-       test ! -f $(TARGET_SUBDIR)/examples/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \
+       test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \
        $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/examples; \
-       cd "$(TARGET_SUBDIR)/examples" || exit 1; \
+       echo Configuring in $(TARGET_SUBDIR)/libiberty; \
+       cd "$(TARGET_SUBDIR)/libiberty" || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/examples/ | \
+         *) topdir=`echo $(TARGET_SUBDIR)/libiberty/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/examples"; \
-       libsrcdir="$$s/examples"; \
+       srcdiroption="--srcdir=$${topdir}/libiberty"; \
+       libsrcdir="$$s/libiberty"; \
        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-examples
+@endif target-libiberty
 
 
 
 
 
-.PHONY: all-target-examples maybe-all-target-examples
-maybe-all-target-examples:
+.PHONY: all-target-libiberty maybe-all-target-libiberty
+maybe-all-target-libiberty:
 @if gcc-bootstrap
-all-target-examples: stage_current
+all-target-libiberty: 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-libiberty
+TARGET-target-libiberty=all
+maybe-all-target-libiberty: all-target-libiberty
+all-target-libiberty: configure-target-libiberty
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/examples && \
+       (cd $(TARGET_SUBDIR)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-               $(TARGET-target-examples))
-@endif target-examples
+               $(TARGET-target-libiberty))
+@endif target-libiberty
 
 
 
 
 
-.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-libiberty maybe-check-target-libiberty
+maybe-check-target-libiberty:
+@if target-libiberty
+maybe-check-target-libiberty: check-target-libiberty
 
-# Dummy target for uncheckable module.
-check-target-examples:
+check-target-libiberty:
+       @: $(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)
 
-@endif target-examples
+@endif target-libiberty
 
-.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-libiberty maybe-install-target-libiberty
+maybe-install-target-libiberty:
+@if target-libiberty
+maybe-install-target-libiberty: install-target-libiberty
 
-# Dummy target for uninstallable.
-install-target-examples:
+install-target-libiberty: 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)
 
-@endif target-examples
+@endif target-libiberty
 
-.PHONY: install-strip-target-examples maybe-install-strip-target-examples
-maybe-install-strip-target-examples:
-@if target-examples
-maybe-install-strip-target-examples: install-strip-target-examples
+.PHONY: install-strip-target-libiberty maybe-install-strip-target-libiberty
+maybe-install-strip-target-libiberty:
+@if target-libiberty
+maybe-install-strip-target-libiberty: install-strip-target-libiberty
 
-# Dummy target for uninstallable.
-install-strip-target-examples:
+install-strip-target-libiberty: 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-strip)
 
-@endif target-examples
+@endif target-libiberty
 
 # 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-libiberty info-target-libiberty
+maybe-info-target-libiberty:
+@if target-libiberty
+maybe-info-target-libiberty: info-target-libiberty
 
-info-target-examples: \
-    configure-target-examples 
+info-target-libiberty: \
+    configure-target-libiberty 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
        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)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53604,25 +36553,25 @@ info-target-examples: \
                   info) \
          || exit 1
 
-@endif target-examples
+@endif target-libiberty
 
-.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-libiberty dvi-target-libiberty
+maybe-dvi-target-libiberty:
+@if target-libiberty
+maybe-dvi-target-libiberty: dvi-target-libiberty
 
-dvi-target-examples: \
-    configure-target-examples 
+dvi-target-libiberty: \
+    configure-target-libiberty 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
        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)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53630,25 +36579,25 @@ dvi-target-examples: \
                   dvi) \
          || exit 1
 
-@endif target-examples
+@endif target-libiberty
 
-.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-libiberty pdf-target-libiberty
+maybe-pdf-target-libiberty:
+@if target-libiberty
+maybe-pdf-target-libiberty: pdf-target-libiberty
 
-pdf-target-examples: \
-    configure-target-examples 
+pdf-target-libiberty: \
+    configure-target-libiberty 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
        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)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53656,25 +36605,25 @@ pdf-target-examples: \
                   pdf) \
          || exit 1
 
-@endif target-examples
+@endif target-libiberty
 
-.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-libiberty html-target-libiberty
+maybe-html-target-libiberty:
+@if target-libiberty
+maybe-html-target-libiberty: html-target-libiberty
 
-html-target-examples: \
-    configure-target-examples 
+html-target-libiberty: \
+    configure-target-libiberty 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
        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)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53682,25 +36631,25 @@ html-target-examples: \
                   html) \
          || exit 1
 
-@endif target-examples
+@endif target-libiberty
 
-.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-libiberty TAGS-target-libiberty
+maybe-TAGS-target-libiberty:
+@if target-libiberty
+maybe-TAGS-target-libiberty: TAGS-target-libiberty
 
-TAGS-target-examples: \
-    configure-target-examples 
+TAGS-target-libiberty: \
+    configure-target-libiberty 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
        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)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53708,26 +36657,26 @@ TAGS-target-examples: \
                   TAGS) \
          || exit 1
 
-@endif target-examples
+@endif target-libiberty
 
-.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-libiberty install-info-target-libiberty
+maybe-install-info-target-libiberty:
+@if target-libiberty
+maybe-install-info-target-libiberty: install-info-target-libiberty
 
-install-info-target-examples: \
-    configure-target-examples \
-    info-target-examples 
+install-info-target-libiberty: \
+    configure-target-libiberty \
+    info-target-libiberty 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
        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)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53735,26 +36684,26 @@ install-info-target-examples: \
                   install-info) \
          || exit 1
 
-@endif target-examples
+@endif target-libiberty
 
-.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-libiberty install-pdf-target-libiberty
+maybe-install-pdf-target-libiberty:
+@if target-libiberty
+maybe-install-pdf-target-libiberty: install-pdf-target-libiberty
 
-install-pdf-target-examples: \
-    configure-target-examples \
-    pdf-target-examples 
+install-pdf-target-libiberty: \
+    configure-target-libiberty \
+    pdf-target-libiberty 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
        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)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53762,26 +36711,26 @@ install-pdf-target-examples: \
                   install-pdf) \
          || exit 1
 
-@endif target-examples
+@endif target-libiberty
 
-.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-libiberty install-html-target-libiberty
+maybe-install-html-target-libiberty:
+@if target-libiberty
+maybe-install-html-target-libiberty: install-html-target-libiberty
 
-install-html-target-examples: \
-    configure-target-examples \
-    html-target-examples 
+install-html-target-libiberty: \
+    configure-target-libiberty \
+    html-target-libiberty 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
        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)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53789,25 +36738,25 @@ install-html-target-examples: \
                   install-html) \
          || exit 1
 
-@endif target-examples
+@endif target-libiberty
 
-.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-libiberty installcheck-target-libiberty
+maybe-installcheck-target-libiberty:
+@if target-libiberty
+maybe-installcheck-target-libiberty: installcheck-target-libiberty
 
-installcheck-target-examples: \
-    configure-target-examples 
+installcheck-target-libiberty: \
+    configure-target-libiberty 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -f $(TARGET_SUBDIR)/libiberty/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)/libiberty" ; \
        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)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53815,24 +36764,24 @@ installcheck-target-examples: \
                   installcheck) \
          || exit 1
 
-@endif target-examples
+@endif target-libiberty
 
-.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-libiberty mostlyclean-target-libiberty
+maybe-mostlyclean-target-libiberty:
+@if target-libiberty
+maybe-mostlyclean-target-libiberty: mostlyclean-target-libiberty
 
-mostlyclean-target-examples: 
+mostlyclean-target-libiberty: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -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)/examples" ; \
+       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)/examples && \
+       (cd $(TARGET_SUBDIR)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53840,24 +36789,24 @@ mostlyclean-target-examples:
                   mostlyclean) \
          || exit 1
 
-@endif target-examples
+@endif target-libiberty
 
-.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-libiberty clean-target-libiberty
+maybe-clean-target-libiberty:
+@if target-libiberty
+maybe-clean-target-libiberty: clean-target-libiberty
 
-clean-target-examples: 
+clean-target-libiberty: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -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)/examples" ; \
+       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)/examples && \
+       (cd $(TARGET_SUBDIR)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53865,24 +36814,24 @@ clean-target-examples:
                   clean) \
          || exit 1
 
-@endif target-examples
+@endif target-libiberty
 
-.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-libiberty distclean-target-libiberty
+maybe-distclean-target-libiberty:
+@if target-libiberty
+maybe-distclean-target-libiberty: distclean-target-libiberty
 
-distclean-target-examples: 
+distclean-target-libiberty: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -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)/examples" ; \
+       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)/examples && \
+       (cd $(TARGET_SUBDIR)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53890,24 +36839,24 @@ distclean-target-examples:
                   distclean) \
          || exit 1
 
-@endif target-examples
+@endif target-libiberty
 
-.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-libiberty maintainer-clean-target-libiberty
+maybe-maintainer-clean-target-libiberty:
+@if target-libiberty
+maybe-maintainer-clean-target-libiberty: maintainer-clean-target-libiberty
 
-maintainer-clean-target-examples: 
+maintainer-clean-target-libiberty: 
        @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+       @[ -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)/examples" ; \
+       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)/examples && \
+       (cd $(TARGET_SUBDIR)/libiberty && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
                  "RANLIB=$${RANLIB}" \
@@ -53915,7 +36864,7 @@ maintainer-clean-target-examples:
                   maintainer-clean) \
          || exit 1
 
-@endif target-examples
+@endif target-libiberty
 
 
 
@@ -55749,463 +38698,6 @@ maintainer-clean-target-boehm-gc:
 
 
 
-.PHONY: configure-target-qthreads maybe-configure-target-qthreads
-maybe-configure-target-qthreads:
-@if gcc-bootstrap
-configure-target-qthreads: stage_current
-@endif gcc-bootstrap
-@if target-qthreads
-maybe-configure-target-qthreads: configure-target-qthreads
-configure-target-qthreads: 
-       @: $(MAKE); $(unstage)
-       @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; \
-         else \
-           rm -f $(TARGET_SUBDIR)/qthreads/Makefile; \
-           mv $(TARGET_SUBDIR)/qthreads/multilib.tmp $(TARGET_SUBDIR)/qthreads/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/qthreads/multilib.tmp $(TARGET_SUBDIR)/qthreads/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; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/qthreads/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       srcdiroption="--srcdir=$${topdir}/qthreads"; \
-       libsrcdir="$$s/qthreads"; \
-       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-qthreads
-
-
-
-
-
-.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)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(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)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(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)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-qthreads
-
-.PHONY: install-strip-target-qthreads maybe-install-strip-target-qthreads
-maybe-install-strip-target-qthreads:
-@if target-qthreads
-maybe-install-strip-target-qthreads: install-strip-target-qthreads
-
-install-strip-target-qthreads: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/qthreads && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
-
-@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; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(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; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(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; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(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
-
-.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; \
-       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
-
-@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; \
-       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
-
-clean-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 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; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(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; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(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
@@ -60174,13 +42666,10 @@ 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-stage1-target-libgomp: maybe-all-stage1-gcc
@@ -60205,13 +42694,10 @@ 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
@@ -60236,10 +42722,8 @@ 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
@@ -60372,14 +42856,6 @@ all-stage3-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-stage3-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
@@ -60572,7 +43048,6 @@ all-gdb: maybe-all-libiconv
 all-gdb: maybe-all-opcodes
 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
@@ -60677,14 +43152,6 @@ all-stage3-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-stage3-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
@@ -60782,14 +43249,6 @@ all-stage3-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-stage3-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
@@ -60848,14 +43307,6 @@ all-stage3-gold: maybe-all-build-bison
 all-stage4-gold: maybe-all-build-bison
 all-stageprofile-gold: maybe-all-build-bison
 all-stagefeedback-gold: maybe-all-build-bison
-all-gold: maybe-all-build-byacc
-
-all-stage1-gold: maybe-all-build-byacc
-all-stage2-gold: maybe-all-build-byacc
-all-stage3-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
 check-gold: maybe-all-binutils
 
 check-stage1-gold: maybe-all-stage1-binutils
@@ -60938,40 +43389,14 @@ 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-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-boehm-gc: maybe-all-target-libstdc++-v3
 configure-target-fastjar: maybe-configure-target-zlib
 all-target-fastjar: maybe-all-target-zlib
@@ -60981,12 +43406,10 @@ configure-target-libgo: maybe-all-target-libstdc++-v3
 all-target-libgo: maybe-all-target-libffi
 configure-target-libjava: maybe-configure-target-zlib
 configure-target-libjava: maybe-configure-target-boehm-gc
-configure-target-libjava: maybe-configure-target-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
@@ -61051,13 +43474,10 @@ 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
@@ -61086,11 +43506,6 @@ 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
@@ -61100,8 +43515,6 @@ 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

diff --git a/configure b/configure
index 7042d248327678a9548cb87c006572bd01e50200..8a146e2bfd010468401dacacdd52ab2fd7a21bed 100755 (executable)
--- a/configure
+++ b/configure
@@ -2646,11 +2646,11 @@ extra_host_args=
 build_libs="build-libiberty"
 
 # these tools are built for the build environment
-build_tools="build-texinfo build-byacc build-flex build-bison build-m4 build-fixincludes"
+build_tools="build-texinfo build-flex build-bison build-m4 build-fixincludes"
 
 # these libraries are used by various programs built for the host environment
 #
-host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libelf libiconv"
+host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libelf libiconv"
 
 # these tools are built for the host environment
 # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
@@ -2658,12 +2658,11 @@ host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib l
 # binutils, gas and ld appear in that order because it makes sense to run
 # "make check" in that particular order.
 # If --enable-gold is used, "gold" may replace "ld".
-host_tools="texinfo byacc flex bison binutils gas ld fixincludes gcc cgen sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
+host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools"
 
 # libgcj represents the runtime libraries only used by gcj.
 libgcj="target-libffi \
        target-zlib \
-       target-qthreads \
        target-libjava"
 
 # these libraries are built for the target environment, and are built after
@@ -2691,7 +2690,7 @@ target_libraries="target-libgcc \
 # note: any program that *uses* libraries that are in the "target_libraries"
 # list belongs in this list.
 #
-target_tools="target-examples target-gperf target-rda"
+target_tools="target-rda"
 
 ################################################################################
 
@@ -7518,7 +7517,6 @@ test -n "$YACC" || YACC="$MISSING bison -y"
 
 case " $build_configdirs " in
   *" bison "*) YACC='$$r/$(BUILD_SUBDIR)/bison/tests/bison -y' ;;
-  *" byacc "*) YACC='$$r/$(BUILD_SUBDIR)/byacc/byacc' ;;
 esac
 
 for ac_prog in bison

diff --git a/configure.ac b/configure.ac
index e6e91254c41e216b7138cc62d35bd43880e17e99..68208dcefbc3c5bcb83e90dd3dafba62ea9ad4de 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -128,11 +128,11 @@ extra_host_args=
 build_libs="build-libiberty"
 
 # these tools are built for the build environment
-build_tools="build-texinfo build-byacc build-flex build-bison build-m4 build-fixincludes"
+build_tools="build-texinfo build-flex build-bison build-m4 build-fixincludes"
 
 # these libraries are used by various programs built for the host environment
 #
-host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libelf libiconv"
+host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libelf libiconv"
 
 # these tools are built for the host environment
 # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
@@ -140,12 +140,11 @@ host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib l
 # binutils, gas and ld appear in that order because it makes sense to run
 # "make check" in that particular order.
 # If --enable-gold is used, "gold" may replace "ld".
-host_tools="texinfo byacc flex bison binutils gas ld fixincludes gcc cgen sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
+host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools"
 
 # libgcj represents the runtime libraries only used by gcj.
 libgcj="target-libffi \
        target-zlib \
-       target-qthreads \
        target-libjava"
 
 # these libraries are built for the target environment, and are built after
@@ -173,7 +172,7 @@ target_libraries="target-libgcc \
 # note: any program that *uses* libraries that are in the "target_libraries"
 # list belongs in this list.
 #
-target_tools="target-examples target-gperf target-rda"
+target_tools="target-rda"
 
 ################################################################################
 
@@ -2956,7 +2955,6 @@ MISSING=`cd $ac_aux_dir && ${PWDCMD-pwd}`/missing
 AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [$MISSING bison -y])
 case " $build_configdirs " in
   *" bison "*) YACC='$$r/$(BUILD_SUBDIR)/bison/tests/bison -y' ;;
-  *" byacc "*) YACC='$$r/$(BUILD_SUBDIR)/byacc/byacc' ;;
 esac
 
 AC_CHECK_PROGS([BISON], [bison], [$MISSING bison])