re PR bootstrap/25670 (build fail with 'make all-gcc')

2006-02-20  Paolo Bonzini  <bonzini@gnu.org>

	PR bootstrap/25670

	* Makefile.tpl ([+compare-target+]): Print explanation messages.

	* Makefile.def (ADAFLAGS, BOOT_ADAFLAGS, LANGUAGES): New flags_to_pass.
	* Makefile.tpl (BASE_FLAGS_TO_PASS): Support optional flags_to_pass.
	(EXTRA_GCC_FLAGS): Remove ADAFLAGS, BOOT_ADAFLAGS, LANGUAGES,
	BUILD_PREFIX, BUILD_PREFIX_1.
	* configure.in: (BUILD_PREFIX, BUILD_PREFIX_1): Don't substitute.

	* Makefile.def (bootstrap stage 1): Pass LIBCFLAGS too.
	* Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Override LIBCFLAGS too.

	* Makefile.tpl (configure-stage[+id+]-[+prefix+][+module+],
	all-stage[+id+]-[+prefix+][+module+], : Use $(current_stage) instead
	of `cat stage_current`.  Always provide the `r' and `s' variables.
	(clean-stage[+id+]-[+prefix+][+module+]): Likewise, and make it into
	a single shell execution.
	(configure-[+prefix+][+module+], all-[+prefix+][+module+]): For
	bootstrapped modules, make the stage1 module if the build was not
	started yet, else build the current stage.
	(all-host, all-target): Omit bootstrapped modules (if bootstrapping).
	(all-build, all-host, all-target, [+make_target+]-host,
	[+make_target+]-target): Do not use \-continued lines.
	(target modules): Depend on stage_last, not all-gcc, if bootstrapping.
	(current_stage, restrap, stage_last): New.

	* Makefile.in: Regenerate.
	* configure: Regenerate.

gcc:
2006-02-20  Paolo Bonzini  <bonzini@gnu.org>

	PR bootstrap/25476

	* Makefile.in (LDFLAGS): Define from autoconf substitution.

	* Makefile.in (BOOTSTRAPPING): New.
	(quickstrap): New definition if BOOTSTRAPPING=yes.

	* Makefile.in (CONFIG_LANGUAGES): Substitute all_selected_languages.
	* configure.ac: Substitute all_selected_languages with the languages
	that were configured.  For all the other variables except
	lang_specs_files, include all the languages in the tree.
	* configure: Regenerate.
	
	* Makefile.in (stmp-fixinc): Copy includes from the prev-gcc directory,
	if there is one.  Run the commands to run fixincludes in the same
	subshell.

	* doc/makefile.texi: Document new makefile targets from toplevel bootstrap.
	* doc/install.texi: Document exact conventions for searching target tools.
	Document --with-build-time-tools.  Document toplevel bootstrap.  Document
	something more about building an Ada cross-compiler.  Don't list GNU Make
	requirements which affect all platforms.

From-SVN: r111295

12 files changed, 2566 insertions, 2154 deletions

diff --git a/ChangeLog b/ChangeLog
index 246b833..7b17b2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2006-02-20  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/25670
+
+	* Makefile.tpl ([+compare-target+]): Print explanation messages.
+
+	* Makefile.def (ADAFLAGS, BOOT_ADAFLAGS, LANGUAGES): New flags_to_pass.
+	* Makefile.tpl (BASE_FLAGS_TO_PASS): Support optional flags_to_pass.
+	(EXTRA_GCC_FLAGS): Remove ADAFLAGS, BOOT_ADAFLAGS, LANGUAGES,
+	BUILD_PREFIX, BUILD_PREFIX_1.
+	* configure.in: (BUILD_PREFIX, BUILD_PREFIX_1): Don't substitute.
+
+	* Makefile.def (bootstrap stage 1): Pass LIBCFLAGS too.
+	* Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Override LIBCFLAGS too.
+
+	* Makefile.tpl (configure-stage[+id+]-[+prefix+][+module+],
+	all-stage[+id+]-[+prefix+][+module+], : Use $(current_stage) instead
+	of `cat stage_current`.  Always provide the `r' and `s' variables.
+	(clean-stage[+id+]-[+prefix+][+module+]): Likewise, and make it into
+	a single shell execution.
+	(configure-[+prefix+][+module+], all-[+prefix+][+module+]): For
+	bootstrapped modules, make the stage1 module if the build was not
+	started yet, else build the current stage.
+	(all-host, all-target): Omit bootstrapped modules (if bootstrapping).
+	(all-build, all-host, all-target, [+make_target+]-host,
+	[+make_target+]-target): Do not use \-continued lines.
+	(target modules): Depend on stage_last, not all-gcc, if bootstrapping.
+	(current_stage, restrap, stage_last): New.
+
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
 2006-02-19  Bud Davis  <jmdavis@link.com>
 
 	* MAINTAINERS (Write After Approval):  Remove myself.
diff --git a/Makefile.def b/Makefile.def
index 49b33f0..3227a44 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -207,7 +207,9 @@ flags_to_pass = { flag= SHELL ; };
 flags_to_pass = { flag= YACC ; };
 
 // Host tools
+flags_to_pass = { flag= ADAFLAGS ; optional=true ; };
 flags_to_pass = { flag= AR_FLAGS ; };
+flags_to_pass = { flag= BOOT_ADAFLAGS ; optional=true ; };
 flags_to_pass = { flag= BOOT_CFLAGS ; };
 flags_to_pass = { flag= BOOT_LDFLAGS ; };
 flags_to_pass = { flag= CFLAGS ; };
@@ -241,6 +243,7 @@ flags_to_pass = { flag= STRIP_FOR_TARGET ; };
 flags_to_pass = { flag= WINDRES_FOR_TARGET ; };
 
 // Miscellaneous
+flags_to_pass = { flag= LANGUAGES ; optional=true ; };
 flags_to_pass = { flag= LEAN ; };
 
 // Inter-module dependencies
@@ -461,7 +464,7 @@ bootstrap_stage = {
 	id=1 ;
 	stage_configure_flags='--disable-intermodule \
 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ;
-	stage_make_flags='CFLAGS="$(STAGE1_CFLAGS)"' ; };
+	stage_make_flags='CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"' ; };
 bootstrap_stage = {
 	id=2 ; prev=1 ;
 	bootstrap_target=bootstrap2 ;
diff --git a/Makefile.in b/Makefile.in
index a5468ab..37d5510 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -441,7 +441,9 @@ BASE_FLAGS_TO_PASS = \
 	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
 	"SHELL=$(SHELL)" \
 	"YACC=$(YACC)" \
+	"`echo 'ADAFLAGS=$(ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"AR_FLAGS=$(AR_FLAGS)" \
+	"`echo 'BOOT_ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"BOOT_CFLAGS=$(BOOT_CFLAGS)" \
 	"BOOT_LDFLAGS=$(BOOT_LDFLAGS)" \
 	"CFLAGS=$(CFLAGS)" \
@@ -471,6 +473,7 @@ BASE_FLAGS_TO_PASS = \
 	"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
 	"STRIP_FOR_TARGET=$(STRIP_FOR_TARGET)" \
 	"WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \
+	"`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"LEAN=$(LEAN)" \
 	"CONFIG_SHELL=$(SHELL)" \
 	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 
@@ -538,16 +541,12 @@ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
 # The BUILD_* variables are a special case, which are used for the gcc
 # cross-building scheme.
 EXTRA_GCC_FLAGS = \
-	'BUILD_PREFIX=$(BUILD_PREFIX)' \
-	'BUILD_PREFIX_1=$(BUILD_PREFIX_1)' \
 	"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
-	"`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-	"`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-	"`echo 'BOOT_ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
+	"`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
 
 GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
 
@@ -664,107 +663,131 @@ all:
 	fi
 
 .PHONY: all-build
-all-build:  \
-    maybe-all-build-libiberty \
-    maybe-all-build-bison \
-    maybe-all-build-byacc \
-    maybe-all-build-flex \
-    maybe-all-build-m4 \
-    maybe-all-build-texinfo \
-    maybe-all-build-fixincludes
+
+all-build: maybe-all-build-libiberty
+all-build: maybe-all-build-bison
+all-build: maybe-all-build-byacc
+all-build: maybe-all-build-flex
+all-build: maybe-all-build-m4
+all-build: maybe-all-build-texinfo
+all-build: maybe-all-build-fixincludes
+
 .PHONY: all-host
-all-host:  \
-    maybe-all-ash \
-    maybe-all-autoconf \
-    maybe-all-automake \
-    maybe-all-bash \
-    maybe-all-bfd \
-    maybe-all-opcodes \
-    maybe-all-binutils \
-    maybe-all-bison \
-    maybe-all-byacc \
-    maybe-all-bzip2 \
-    maybe-all-dejagnu \
-    maybe-all-diff \
-    maybe-all-dosutils \
-    maybe-all-etc \
-    maybe-all-fastjar \
-    maybe-all-fileutils \
-    maybe-all-findutils \
-    maybe-all-find \
-    maybe-all-fixincludes \
-    maybe-all-flex \
-    maybe-all-gas \
-    maybe-all-gcc \
-    maybe-all-gawk \
-    maybe-all-gettext \
-    maybe-all-gnuserv \
-    maybe-all-gprof \
-    maybe-all-gzip \
-    maybe-all-hello \
-    maybe-all-indent \
-    maybe-all-intl \
-    maybe-all-tcl \
-    maybe-all-itcl \
-    maybe-all-ld \
-    maybe-all-libcpp \
-    maybe-all-libdecnumber \
-    maybe-all-libgui \
-    maybe-all-libiberty \
-    maybe-all-libtool \
-    maybe-all-m4 \
-    maybe-all-make \
-    maybe-all-mmalloc \
-    maybe-all-patch \
-    maybe-all-perl \
-    maybe-all-prms \
-    maybe-all-rcs \
-    maybe-all-readline \
-    maybe-all-release \
-    maybe-all-recode \
-    maybe-all-sed \
-    maybe-all-send-pr \
-    maybe-all-shellutils \
-    maybe-all-sid \
-    maybe-all-sim \
-    maybe-all-tar \
-    maybe-all-texinfo \
-    maybe-all-textutils \
-    maybe-all-time \
-    maybe-all-uudecode \
-    maybe-all-wdiff \
-    maybe-all-zip \
-    maybe-all-zlib \
-    maybe-all-gdb \
-    maybe-all-expect \
-    maybe-all-guile \
-    maybe-all-tk \
-    maybe-all-libtermcap \
-    maybe-all-utils \
-    maybe-all-gnattools
+
+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
+@if opcodes-no-bootstrap
+all-host: maybe-all-opcodes
+@endif opcodes-no-bootstrap
+@if binutils-no-bootstrap
+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-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
+all-host: maybe-all-gas
+@endif gas-no-bootstrap
+@if gcc-no-bootstrap
+all-host: maybe-all-gcc
+@endif gcc-no-bootstrap
+all-host: maybe-all-gawk
+all-host: maybe-all-gettext
+all-host: maybe-all-gnuserv
+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
+all-host: maybe-all-tcl
+all-host: maybe-all-itcl
+@if ld-no-bootstrap
+all-host: maybe-all-ld
+@endif ld-no-bootstrap
+@if libcpp-no-bootstrap
+all-host: maybe-all-libcpp
+@endif libcpp-no-bootstrap
+@if libdecnumber-no-bootstrap
+all-host: maybe-all-libdecnumber
+@endif libdecnumber-no-bootstrap
+all-host: maybe-all-libgui
+@if libiberty-no-bootstrap
+all-host: maybe-all-libiberty
+@endif libiberty-no-bootstrap
+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
+all-host: maybe-all-gdb
+all-host: maybe-all-expect
+all-host: maybe-all-guile
+all-host: maybe-all-tk
+all-host: maybe-all-libtermcap
+all-host: maybe-all-utils
+all-host: maybe-all-gnattools
+
 .PHONY: all-target
-all-target:  \
-    maybe-all-target-libstdc++-v3 \
-    maybe-all-target-libmudflap \
-    maybe-all-target-libssp \
-    maybe-all-target-libgcc-math \
-    maybe-all-target-newlib \
-    maybe-all-target-libgfortran \
-    maybe-all-target-libobjc \
-    maybe-all-target-libtermcap \
-    maybe-all-target-winsup \
-    maybe-all-target-libgloss \
-    maybe-all-target-libiberty \
-    maybe-all-target-gperf \
-    maybe-all-target-examples \
-    maybe-all-target-libffi \
-    maybe-all-target-libjava \
-    maybe-all-target-zlib \
-    maybe-all-target-boehm-gc \
-    maybe-all-target-qthreads \
-    maybe-all-target-rda \
-    maybe-all-target-libada \
-    maybe-all-target-libgomp
+
+all-target: maybe-all-target-libstdc++-v3
+all-target: maybe-all-target-libmudflap
+all-target: maybe-all-target-libssp
+all-target: maybe-all-target-libgcc-math
+all-target: maybe-all-target-newlib
+all-target: maybe-all-target-libgfortran
+all-target: maybe-all-target-libobjc
+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
+all-target: maybe-all-target-libgomp
 
 # Do a target for all the subdirectories.  A ``make do-X'' will do a
 # ``make X'' in all subdirectories (because, in general, there is a
@@ -781,99 +804,99 @@ do-info:
 
 
 .PHONY: info-host
-info-host:  \
-    maybe-info-ash \
-    maybe-info-autoconf \
-    maybe-info-automake \
-    maybe-info-bash \
-    maybe-info-bfd \
-    maybe-info-opcodes \
-    maybe-info-binutils \
-    maybe-info-bison \
-    maybe-info-byacc \
-    maybe-info-bzip2 \
-    maybe-info-dejagnu \
-    maybe-info-diff \
-    maybe-info-dosutils \
-    maybe-info-etc \
-    maybe-info-fastjar \
-    maybe-info-fileutils \
-    maybe-info-findutils \
-    maybe-info-find \
-    maybe-info-fixincludes \
-    maybe-info-flex \
-    maybe-info-gas \
-    maybe-info-gcc \
-    maybe-info-gawk \
-    maybe-info-gettext \
-    maybe-info-gnuserv \
-    maybe-info-gprof \
-    maybe-info-gzip \
-    maybe-info-hello \
-    maybe-info-indent \
-    maybe-info-intl \
-    maybe-info-tcl \
-    maybe-info-itcl \
-    maybe-info-ld \
-    maybe-info-libcpp \
-    maybe-info-libdecnumber \
-    maybe-info-libgui \
-    maybe-info-libiberty \
-    maybe-info-libtool \
-    maybe-info-m4 \
-    maybe-info-make \
-    maybe-info-mmalloc \
-    maybe-info-patch \
-    maybe-info-perl \
-    maybe-info-prms \
-    maybe-info-rcs \
-    maybe-info-readline \
-    maybe-info-release \
-    maybe-info-recode \
-    maybe-info-sed \
-    maybe-info-send-pr \
-    maybe-info-shellutils \
-    maybe-info-sid \
-    maybe-info-sim \
-    maybe-info-tar \
-    maybe-info-texinfo \
-    maybe-info-textutils \
-    maybe-info-time \
-    maybe-info-uudecode \
-    maybe-info-wdiff \
-    maybe-info-zip \
-    maybe-info-zlib \
-    maybe-info-gdb \
-    maybe-info-expect \
-    maybe-info-guile \
-    maybe-info-tk \
-    maybe-info-libtermcap \
-    maybe-info-utils \
-    maybe-info-gnattools
+
+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-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-gnuserv
+info-host: maybe-info-gprof
+info-host: maybe-info-gzip
+info-host: maybe-info-hello
+info-host: maybe-info-indent
+info-host: maybe-info-intl
+info-host: maybe-info-tcl
+info-host: maybe-info-itcl
+info-host: maybe-info-ld
+info-host: maybe-info-libcpp
+info-host: maybe-info-libdecnumber
+info-host: maybe-info-libgui
+info-host: maybe-info-libiberty
+info-host: maybe-info-libtool
+info-host: maybe-info-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
+info-host: maybe-info-guile
+info-host: maybe-info-tk
+info-host: maybe-info-libtermcap
+info-host: maybe-info-utils
+info-host: maybe-info-gnattools
 
 .PHONY: info-target
-info-target:  \
-    maybe-info-target-libstdc++-v3 \
-    maybe-info-target-libmudflap \
-    maybe-info-target-libssp \
-    maybe-info-target-libgcc-math \
-    maybe-info-target-newlib \
-    maybe-info-target-libgfortran \
-    maybe-info-target-libobjc \
-    maybe-info-target-libtermcap \
-    maybe-info-target-winsup \
-    maybe-info-target-libgloss \
-    maybe-info-target-libiberty \
-    maybe-info-target-gperf \
-    maybe-info-target-examples \
-    maybe-info-target-libffi \
-    maybe-info-target-libjava \
-    maybe-info-target-zlib \
-    maybe-info-target-boehm-gc \
-    maybe-info-target-qthreads \
-    maybe-info-target-rda \
-    maybe-info-target-libada \
-    maybe-info-target-libgomp
+
+info-target: maybe-info-target-libstdc++-v3
+info-target: maybe-info-target-libmudflap
+info-target: maybe-info-target-libssp
+info-target: maybe-info-target-libgcc-math
+info-target: maybe-info-target-newlib
+info-target: maybe-info-target-libgfortran
+info-target: maybe-info-target-libobjc
+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
 
 .PHONY: do-dvi
 do-dvi:
@@ -885,99 +908,99 @@ do-dvi:
 
 
 .PHONY: dvi-host
-dvi-host:  \
-    maybe-dvi-ash \
-    maybe-dvi-autoconf \
-    maybe-dvi-automake \
-    maybe-dvi-bash \
-    maybe-dvi-bfd \
-    maybe-dvi-opcodes \
-    maybe-dvi-binutils \
-    maybe-dvi-bison \
-    maybe-dvi-byacc \
-    maybe-dvi-bzip2 \
-    maybe-dvi-dejagnu \
-    maybe-dvi-diff \
-    maybe-dvi-dosutils \
-    maybe-dvi-etc \
-    maybe-dvi-fastjar \
-    maybe-dvi-fileutils \
-    maybe-dvi-findutils \
-    maybe-dvi-find \
-    maybe-dvi-fixincludes \
-    maybe-dvi-flex \
-    maybe-dvi-gas \
-    maybe-dvi-gcc \
-    maybe-dvi-gawk \
-    maybe-dvi-gettext \
-    maybe-dvi-gnuserv \
-    maybe-dvi-gprof \
-    maybe-dvi-gzip \
-    maybe-dvi-hello \
-    maybe-dvi-indent \
-    maybe-dvi-intl \
-    maybe-dvi-tcl \
-    maybe-dvi-itcl \
-    maybe-dvi-ld \
-    maybe-dvi-libcpp \
-    maybe-dvi-libdecnumber \
-    maybe-dvi-libgui \
-    maybe-dvi-libiberty \
-    maybe-dvi-libtool \
-    maybe-dvi-m4 \
-    maybe-dvi-make \
-    maybe-dvi-mmalloc \
-    maybe-dvi-patch \
-    maybe-dvi-perl \
-    maybe-dvi-prms \
-    maybe-dvi-rcs \
-    maybe-dvi-readline \
-    maybe-dvi-release \
-    maybe-dvi-recode \
-    maybe-dvi-sed \
-    maybe-dvi-send-pr \
-    maybe-dvi-shellutils \
-    maybe-dvi-sid \
-    maybe-dvi-sim \
-    maybe-dvi-tar \
-    maybe-dvi-texinfo \
-    maybe-dvi-textutils \
-    maybe-dvi-time \
-    maybe-dvi-uudecode \
-    maybe-dvi-wdiff \
-    maybe-dvi-zip \
-    maybe-dvi-zlib \
-    maybe-dvi-gdb \
-    maybe-dvi-expect \
-    maybe-dvi-guile \
-    maybe-dvi-tk \
-    maybe-dvi-libtermcap \
-    maybe-dvi-utils \
-    maybe-dvi-gnattools
+
+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-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-gnuserv
+dvi-host: maybe-dvi-gprof
+dvi-host: maybe-dvi-gzip
+dvi-host: maybe-dvi-hello
+dvi-host: maybe-dvi-indent
+dvi-host: maybe-dvi-intl
+dvi-host: maybe-dvi-tcl
+dvi-host: maybe-dvi-itcl
+dvi-host: maybe-dvi-ld
+dvi-host: maybe-dvi-libcpp
+dvi-host: maybe-dvi-libdecnumber
+dvi-host: maybe-dvi-libgui
+dvi-host: maybe-dvi-libiberty
+dvi-host: maybe-dvi-libtool
+dvi-host: maybe-dvi-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
+dvi-host: maybe-dvi-guile
+dvi-host: maybe-dvi-tk
+dvi-host: maybe-dvi-libtermcap
+dvi-host: maybe-dvi-utils
+dvi-host: maybe-dvi-gnattools
 
 .PHONY: dvi-target
-dvi-target:  \
-    maybe-dvi-target-libstdc++-v3 \
-    maybe-dvi-target-libmudflap \
-    maybe-dvi-target-libssp \
-    maybe-dvi-target-libgcc-math \
-    maybe-dvi-target-newlib \
-    maybe-dvi-target-libgfortran \
-    maybe-dvi-target-libobjc \
-    maybe-dvi-target-libtermcap \
-    maybe-dvi-target-winsup \
-    maybe-dvi-target-libgloss \
-    maybe-dvi-target-libiberty \
-    maybe-dvi-target-gperf \
-    maybe-dvi-target-examples \
-    maybe-dvi-target-libffi \
-    maybe-dvi-target-libjava \
-    maybe-dvi-target-zlib \
-    maybe-dvi-target-boehm-gc \
-    maybe-dvi-target-qthreads \
-    maybe-dvi-target-rda \
-    maybe-dvi-target-libada \
-    maybe-dvi-target-libgomp
+
+dvi-target: maybe-dvi-target-libstdc++-v3
+dvi-target: maybe-dvi-target-libmudflap
+dvi-target: maybe-dvi-target-libssp
+dvi-target: maybe-dvi-target-libgcc-math
+dvi-target: maybe-dvi-target-newlib
+dvi-target: maybe-dvi-target-libgfortran
+dvi-target: maybe-dvi-target-libobjc
+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
 
 .PHONY: do-html
 do-html:
@@ -989,99 +1012,99 @@ do-html:
 
 
 .PHONY: html-host
-html-host:  \
-    maybe-html-ash \
-    maybe-html-autoconf \
-    maybe-html-automake \
-    maybe-html-bash \
-    maybe-html-bfd \
-    maybe-html-opcodes \
-    maybe-html-binutils \
-    maybe-html-bison \
-    maybe-html-byacc \
-    maybe-html-bzip2 \
-    maybe-html-dejagnu \
-    maybe-html-diff \
-    maybe-html-dosutils \
-    maybe-html-etc \
-    maybe-html-fastjar \
-    maybe-html-fileutils \
-    maybe-html-findutils \
-    maybe-html-find \
-    maybe-html-fixincludes \
-    maybe-html-flex \
-    maybe-html-gas \
-    maybe-html-gcc \
-    maybe-html-gawk \
-    maybe-html-gettext \
-    maybe-html-gnuserv \
-    maybe-html-gprof \
-    maybe-html-gzip \
-    maybe-html-hello \
-    maybe-html-indent \
-    maybe-html-intl \
-    maybe-html-tcl \
-    maybe-html-itcl \
-    maybe-html-ld \
-    maybe-html-libcpp \
-    maybe-html-libdecnumber \
-    maybe-html-libgui \
-    maybe-html-libiberty \
-    maybe-html-libtool \
-    maybe-html-m4 \
-    maybe-html-make \
-    maybe-html-mmalloc \
-    maybe-html-patch \
-    maybe-html-perl \
-    maybe-html-prms \
-    maybe-html-rcs \
-    maybe-html-readline \
-    maybe-html-release \
-    maybe-html-recode \
-    maybe-html-sed \
-    maybe-html-send-pr \
-    maybe-html-shellutils \
-    maybe-html-sid \
-    maybe-html-sim \
-    maybe-html-tar \
-    maybe-html-texinfo \
-    maybe-html-textutils \
-    maybe-html-time \
-    maybe-html-uudecode \
-    maybe-html-wdiff \
-    maybe-html-zip \
-    maybe-html-zlib \
-    maybe-html-gdb \
-    maybe-html-expect \
-    maybe-html-guile \
-    maybe-html-tk \
-    maybe-html-libtermcap \
-    maybe-html-utils \
-    maybe-html-gnattools
+
+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-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-gnuserv
+html-host: maybe-html-gprof
+html-host: maybe-html-gzip
+html-host: maybe-html-hello
+html-host: maybe-html-indent
+html-host: maybe-html-intl
+html-host: maybe-html-tcl
+html-host: maybe-html-itcl
+html-host: maybe-html-ld
+html-host: maybe-html-libcpp
+html-host: maybe-html-libdecnumber
+html-host: maybe-html-libgui
+html-host: maybe-html-libiberty
+html-host: maybe-html-libtool
+html-host: maybe-html-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
+html-host: maybe-html-guile
+html-host: maybe-html-tk
+html-host: maybe-html-libtermcap
+html-host: maybe-html-utils
+html-host: maybe-html-gnattools
 
 .PHONY: html-target
-html-target:  \
-    maybe-html-target-libstdc++-v3 \
-    maybe-html-target-libmudflap \
-    maybe-html-target-libssp \
-    maybe-html-target-libgcc-math \
-    maybe-html-target-newlib \
-    maybe-html-target-libgfortran \
-    maybe-html-target-libobjc \
-    maybe-html-target-libtermcap \
-    maybe-html-target-winsup \
-    maybe-html-target-libgloss \
-    maybe-html-target-libiberty \
-    maybe-html-target-gperf \
-    maybe-html-target-examples \
-    maybe-html-target-libffi \
-    maybe-html-target-libjava \
-    maybe-html-target-zlib \
-    maybe-html-target-boehm-gc \
-    maybe-html-target-qthreads \
-    maybe-html-target-rda \
-    maybe-html-target-libada \
-    maybe-html-target-libgomp
+
+html-target: maybe-html-target-libstdc++-v3
+html-target: maybe-html-target-libmudflap
+html-target: maybe-html-target-libssp
+html-target: maybe-html-target-libgcc-math
+html-target: maybe-html-target-newlib
+html-target: maybe-html-target-libgfortran
+html-target: maybe-html-target-libobjc
+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
 
 .PHONY: do-TAGS
 do-TAGS:
@@ -1093,99 +1116,99 @@ do-TAGS:
 
 
 .PHONY: TAGS-host
-TAGS-host:  \
-    maybe-TAGS-ash \
-    maybe-TAGS-autoconf \
-    maybe-TAGS-automake \
-    maybe-TAGS-bash \
-    maybe-TAGS-bfd \
-    maybe-TAGS-opcodes \
-    maybe-TAGS-binutils \
-    maybe-TAGS-bison \
-    maybe-TAGS-byacc \
-    maybe-TAGS-bzip2 \
-    maybe-TAGS-dejagnu \
-    maybe-TAGS-diff \
-    maybe-TAGS-dosutils \
-    maybe-TAGS-etc \
-    maybe-TAGS-fastjar \
-    maybe-TAGS-fileutils \
-    maybe-TAGS-findutils \
-    maybe-TAGS-find \
-    maybe-TAGS-fixincludes \
-    maybe-TAGS-flex \
-    maybe-TAGS-gas \
-    maybe-TAGS-gcc \
-    maybe-TAGS-gawk \
-    maybe-TAGS-gettext \
-    maybe-TAGS-gnuserv \
-    maybe-TAGS-gprof \
-    maybe-TAGS-gzip \
-    maybe-TAGS-hello \
-    maybe-TAGS-indent \
-    maybe-TAGS-intl \
-    maybe-TAGS-tcl \
-    maybe-TAGS-itcl \
-    maybe-TAGS-ld \
-    maybe-TAGS-libcpp \
-    maybe-TAGS-libdecnumber \
-    maybe-TAGS-libgui \
-    maybe-TAGS-libiberty \
-    maybe-TAGS-libtool \
-    maybe-TAGS-m4 \
-    maybe-TAGS-make \
-    maybe-TAGS-mmalloc \
-    maybe-TAGS-patch \
-    maybe-TAGS-perl \
-    maybe-TAGS-prms \
-    maybe-TAGS-rcs \
-    maybe-TAGS-readline \
-    maybe-TAGS-release \
-    maybe-TAGS-recode \
-    maybe-TAGS-sed \
-    maybe-TAGS-send-pr \
-    maybe-TAGS-shellutils \
-    maybe-TAGS-sid \
-    maybe-TAGS-sim \
-    maybe-TAGS-tar \
-    maybe-TAGS-texinfo \
-    maybe-TAGS-textutils \
-    maybe-TAGS-time \
-    maybe-TAGS-uudecode \
-    maybe-TAGS-wdiff \
-    maybe-TAGS-zip \
-    maybe-TAGS-zlib \
-    maybe-TAGS-gdb \
-    maybe-TAGS-expect \
-    maybe-TAGS-guile \
-    maybe-TAGS-tk \
-    maybe-TAGS-libtermcap \
-    maybe-TAGS-utils \
-    maybe-TAGS-gnattools
+
+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-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-gnuserv
+TAGS-host: maybe-TAGS-gprof
+TAGS-host: maybe-TAGS-gzip
+TAGS-host: maybe-TAGS-hello
+TAGS-host: maybe-TAGS-indent
+TAGS-host: maybe-TAGS-intl
+TAGS-host: maybe-TAGS-tcl
+TAGS-host: maybe-TAGS-itcl
+TAGS-host: maybe-TAGS-ld
+TAGS-host: maybe-TAGS-libcpp
+TAGS-host: maybe-TAGS-libdecnumber
+TAGS-host: maybe-TAGS-libgui
+TAGS-host: maybe-TAGS-libiberty
+TAGS-host: maybe-TAGS-libtool
+TAGS-host: maybe-TAGS-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
+TAGS-host: maybe-TAGS-guile
+TAGS-host: maybe-TAGS-tk
+TAGS-host: maybe-TAGS-libtermcap
+TAGS-host: maybe-TAGS-utils
+TAGS-host: maybe-TAGS-gnattools
 
 .PHONY: TAGS-target
-TAGS-target:  \
-    maybe-TAGS-target-libstdc++-v3 \
-    maybe-TAGS-target-libmudflap \
-    maybe-TAGS-target-libssp \
-    maybe-TAGS-target-libgcc-math \
-    maybe-TAGS-target-newlib \
-    maybe-TAGS-target-libgfortran \
-    maybe-TAGS-target-libobjc \
-    maybe-TAGS-target-libtermcap \
-    maybe-TAGS-target-winsup \
-    maybe-TAGS-target-libgloss \
-    maybe-TAGS-target-libiberty \
-    maybe-TAGS-target-gperf \
-    maybe-TAGS-target-examples \
-    maybe-TAGS-target-libffi \
-    maybe-TAGS-target-libjava \
-    maybe-TAGS-target-zlib \
-    maybe-TAGS-target-boehm-gc \
-    maybe-TAGS-target-qthreads \
-    maybe-TAGS-target-rda \
-    maybe-TAGS-target-libada \
-    maybe-TAGS-target-libgomp
+
+TAGS-target: maybe-TAGS-target-libstdc++-v3
+TAGS-target: maybe-TAGS-target-libmudflap
+TAGS-target: maybe-TAGS-target-libssp
+TAGS-target: maybe-TAGS-target-libgcc-math
+TAGS-target: maybe-TAGS-target-newlib
+TAGS-target: maybe-TAGS-target-libgfortran
+TAGS-target: maybe-TAGS-target-libobjc
+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
 
 .PHONY: do-install-info
 do-install-info:
@@ -1197,99 +1220,99 @@ do-install-info:
 
 
 .PHONY: install-info-host
-install-info-host:  \
-    maybe-install-info-ash \
-    maybe-install-info-autoconf \
-    maybe-install-info-automake \
-    maybe-install-info-bash \
-    maybe-install-info-bfd \
-    maybe-install-info-opcodes \
-    maybe-install-info-binutils \
-    maybe-install-info-bison \
-    maybe-install-info-byacc \
-    maybe-install-info-bzip2 \
-    maybe-install-info-dejagnu \
-    maybe-install-info-diff \
-    maybe-install-info-dosutils \
-    maybe-install-info-etc \
-    maybe-install-info-fastjar \
-    maybe-install-info-fileutils \
-    maybe-install-info-findutils \
-    maybe-install-info-find \
-    maybe-install-info-fixincludes \
-    maybe-install-info-flex \
-    maybe-install-info-gas \
-    maybe-install-info-gcc \
-    maybe-install-info-gawk \
-    maybe-install-info-gettext \
-    maybe-install-info-gnuserv \
-    maybe-install-info-gprof \
-    maybe-install-info-gzip \
-    maybe-install-info-hello \
-    maybe-install-info-indent \
-    maybe-install-info-intl \
-    maybe-install-info-tcl \
-    maybe-install-info-itcl \
-    maybe-install-info-ld \
-    maybe-install-info-libcpp \
-    maybe-install-info-libdecnumber \
-    maybe-install-info-libgui \
-    maybe-install-info-libiberty \
-    maybe-install-info-libtool \
-    maybe-install-info-m4 \
-    maybe-install-info-make \
-    maybe-install-info-mmalloc \
-    maybe-install-info-patch \
-    maybe-install-info-perl \
-    maybe-install-info-prms \
-    maybe-install-info-rcs \
-    maybe-install-info-readline \
-    maybe-install-info-release \
-    maybe-install-info-recode \
-    maybe-install-info-sed \
-    maybe-install-info-send-pr \
-    maybe-install-info-shellutils \
-    maybe-install-info-sid \
-    maybe-install-info-sim \
-    maybe-install-info-tar \
-    maybe-install-info-texinfo \
-    maybe-install-info-textutils \
-    maybe-install-info-time \
-    maybe-install-info-uudecode \
-    maybe-install-info-wdiff \
-    maybe-install-info-zip \
-    maybe-install-info-zlib \
-    maybe-install-info-gdb \
-    maybe-install-info-expect \
-    maybe-install-info-guile \
-    maybe-install-info-tk \
-    maybe-install-info-libtermcap \
-    maybe-install-info-utils \
-    maybe-install-info-gnattools
+
+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-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-gnuserv
+install-info-host: maybe-install-info-gprof
+install-info-host: maybe-install-info-gzip
+install-info-host: maybe-install-info-hello
+install-info-host: maybe-install-info-indent
+install-info-host: maybe-install-info-intl
+install-info-host: maybe-install-info-tcl
+install-info-host: maybe-install-info-itcl
+install-info-host: maybe-install-info-ld
+install-info-host: maybe-install-info-libcpp
+install-info-host: maybe-install-info-libdecnumber
+install-info-host: maybe-install-info-libgui
+install-info-host: maybe-install-info-libiberty
+install-info-host: maybe-install-info-libtool
+install-info-host: maybe-install-info-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
+install-info-host: maybe-install-info-guile
+install-info-host: maybe-install-info-tk
+install-info-host: maybe-install-info-libtermcap
+install-info-host: maybe-install-info-utils
+install-info-host: maybe-install-info-gnattools
 
 .PHONY: install-info-target
-install-info-target:  \
-    maybe-install-info-target-libstdc++-v3 \
-    maybe-install-info-target-libmudflap \
-    maybe-install-info-target-libssp \
-    maybe-install-info-target-libgcc-math \
-    maybe-install-info-target-newlib \
-    maybe-install-info-target-libgfortran \
-    maybe-install-info-target-libobjc \
-    maybe-install-info-target-libtermcap \
-    maybe-install-info-target-winsup \
-    maybe-install-info-target-libgloss \
-    maybe-install-info-target-libiberty \
-    maybe-install-info-target-gperf \
-    maybe-install-info-target-examples \
-    maybe-install-info-target-libffi \
-    maybe-install-info-target-libjava \
-    maybe-install-info-target-zlib \
-    maybe-install-info-target-boehm-gc \
-    maybe-install-info-target-qthreads \
-    maybe-install-info-target-rda \
-    maybe-install-info-target-libada \
-    maybe-install-info-target-libgomp
+
+install-info-target: maybe-install-info-target-libstdc++-v3
+install-info-target: maybe-install-info-target-libmudflap
+install-info-target: maybe-install-info-target-libssp
+install-info-target: maybe-install-info-target-libgcc-math
+install-info-target: maybe-install-info-target-newlib
+install-info-target: maybe-install-info-target-libgfortran
+install-info-target: maybe-install-info-target-libobjc
+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
 
 .PHONY: do-installcheck
 do-installcheck:
@@ -1301,99 +1324,99 @@ do-installcheck:
 
 
 .PHONY: installcheck-host
-installcheck-host:  \
-    maybe-installcheck-ash \
-    maybe-installcheck-autoconf \
-    maybe-installcheck-automake \
-    maybe-installcheck-bash \
-    maybe-installcheck-bfd \
-    maybe-installcheck-opcodes \
-    maybe-installcheck-binutils \
-    maybe-installcheck-bison \
-    maybe-installcheck-byacc \
-    maybe-installcheck-bzip2 \
-    maybe-installcheck-dejagnu \
-    maybe-installcheck-diff \
-    maybe-installcheck-dosutils \
-    maybe-installcheck-etc \
-    maybe-installcheck-fastjar \
-    maybe-installcheck-fileutils \
-    maybe-installcheck-findutils \
-    maybe-installcheck-find \
-    maybe-installcheck-fixincludes \
-    maybe-installcheck-flex \
-    maybe-installcheck-gas \
-    maybe-installcheck-gcc \
-    maybe-installcheck-gawk \
-    maybe-installcheck-gettext \
-    maybe-installcheck-gnuserv \
-    maybe-installcheck-gprof \
-    maybe-installcheck-gzip \
-    maybe-installcheck-hello \
-    maybe-installcheck-indent \
-    maybe-installcheck-intl \
-    maybe-installcheck-tcl \
-    maybe-installcheck-itcl \
-    maybe-installcheck-ld \
-    maybe-installcheck-libcpp \
-    maybe-installcheck-libdecnumber \
-    maybe-installcheck-libgui \
-    maybe-installcheck-libiberty \
-    maybe-installcheck-libtool \
-    maybe-installcheck-m4 \
-    maybe-installcheck-make \
-    maybe-installcheck-mmalloc \
-    maybe-installcheck-patch \
-    maybe-installcheck-perl \
-    maybe-installcheck-prms \
-    maybe-installcheck-rcs \
-    maybe-installcheck-readline \
-    maybe-installcheck-release \
-    maybe-installcheck-recode \
-    maybe-installcheck-sed \
-    maybe-installcheck-send-pr \
-    maybe-installcheck-shellutils \
-    maybe-installcheck-sid \
-    maybe-installcheck-sim \
-    maybe-installcheck-tar \
-    maybe-installcheck-texinfo \
-    maybe-installcheck-textutils \
-    maybe-installcheck-time \
-    maybe-installcheck-uudecode \
-    maybe-installcheck-wdiff \
-    maybe-installcheck-zip \
-    maybe-installcheck-zlib \
-    maybe-installcheck-gdb \
-    maybe-installcheck-expect \
-    maybe-installcheck-guile \
-    maybe-installcheck-tk \
-    maybe-installcheck-libtermcap \
-    maybe-installcheck-utils \
-    maybe-installcheck-gnattools
+
+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-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-gnuserv
+installcheck-host: maybe-installcheck-gprof
+installcheck-host: maybe-installcheck-gzip
+installcheck-host: maybe-installcheck-hello
+installcheck-host: maybe-installcheck-indent
+installcheck-host: maybe-installcheck-intl
+installcheck-host: maybe-installcheck-tcl
+installcheck-host: maybe-installcheck-itcl
+installcheck-host: maybe-installcheck-ld
+installcheck-host: maybe-installcheck-libcpp
+installcheck-host: maybe-installcheck-libdecnumber
+installcheck-host: maybe-installcheck-libgui
+installcheck-host: maybe-installcheck-libiberty
+installcheck-host: maybe-installcheck-libtool
+installcheck-host: maybe-installcheck-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
+installcheck-host: maybe-installcheck-guile
+installcheck-host: maybe-installcheck-tk
+installcheck-host: maybe-installcheck-libtermcap
+installcheck-host: maybe-installcheck-utils
+installcheck-host: maybe-installcheck-gnattools
 
 .PHONY: installcheck-target
-installcheck-target:  \
-    maybe-installcheck-target-libstdc++-v3 \
-    maybe-installcheck-target-libmudflap \
-    maybe-installcheck-target-libssp \
-    maybe-installcheck-target-libgcc-math \
-    maybe-installcheck-target-newlib \
-    maybe-installcheck-target-libgfortran \
-    maybe-installcheck-target-libobjc \
-    maybe-installcheck-target-libtermcap \
-    maybe-installcheck-target-winsup \
-    maybe-installcheck-target-libgloss \
-    maybe-installcheck-target-libiberty \
-    maybe-installcheck-target-gperf \
-    maybe-installcheck-target-examples \
-    maybe-installcheck-target-libffi \
-    maybe-installcheck-target-libjava \
-    maybe-installcheck-target-zlib \
-    maybe-installcheck-target-boehm-gc \
-    maybe-installcheck-target-qthreads \
-    maybe-installcheck-target-rda \
-    maybe-installcheck-target-libada \
-    maybe-installcheck-target-libgomp
+
+installcheck-target: maybe-installcheck-target-libstdc++-v3
+installcheck-target: maybe-installcheck-target-libmudflap
+installcheck-target: maybe-installcheck-target-libssp
+installcheck-target: maybe-installcheck-target-libgcc-math
+installcheck-target: maybe-installcheck-target-newlib
+installcheck-target: maybe-installcheck-target-libgfortran
+installcheck-target: maybe-installcheck-target-libobjc
+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
 
 .PHONY: do-mostlyclean
 do-mostlyclean:
@@ -1405,99 +1428,99 @@ do-mostlyclean:
 
 
 .PHONY: mostlyclean-host
-mostlyclean-host:  \
-    maybe-mostlyclean-ash \
-    maybe-mostlyclean-autoconf \
-    maybe-mostlyclean-automake \
-    maybe-mostlyclean-bash \
-    maybe-mostlyclean-bfd \
-    maybe-mostlyclean-opcodes \
-    maybe-mostlyclean-binutils \
-    maybe-mostlyclean-bison \
-    maybe-mostlyclean-byacc \
-    maybe-mostlyclean-bzip2 \
-    maybe-mostlyclean-dejagnu \
-    maybe-mostlyclean-diff \
-    maybe-mostlyclean-dosutils \
-    maybe-mostlyclean-etc \
-    maybe-mostlyclean-fastjar \
-    maybe-mostlyclean-fileutils \
-    maybe-mostlyclean-findutils \
-    maybe-mostlyclean-find \
-    maybe-mostlyclean-fixincludes \
-    maybe-mostlyclean-flex \
-    maybe-mostlyclean-gas \
-    maybe-mostlyclean-gcc \
-    maybe-mostlyclean-gawk \
-    maybe-mostlyclean-gettext \
-    maybe-mostlyclean-gnuserv \
-    maybe-mostlyclean-gprof \
-    maybe-mostlyclean-gzip \
-    maybe-mostlyclean-hello \
-    maybe-mostlyclean-indent \
-    maybe-mostlyclean-intl \
-    maybe-mostlyclean-tcl \
-    maybe-mostlyclean-itcl \
-    maybe-mostlyclean-ld \
-    maybe-mostlyclean-libcpp \
-    maybe-mostlyclean-libdecnumber \
-    maybe-mostlyclean-libgui \
-    maybe-mostlyclean-libiberty \
-    maybe-mostlyclean-libtool \
-    maybe-mostlyclean-m4 \
-    maybe-mostlyclean-make \
-    maybe-mostlyclean-mmalloc \
-    maybe-mostlyclean-patch \
-    maybe-mostlyclean-perl \
-    maybe-mostlyclean-prms \
-    maybe-mostlyclean-rcs \
-    maybe-mostlyclean-readline \
-    maybe-mostlyclean-release \
-    maybe-mostlyclean-recode \
-    maybe-mostlyclean-sed \
-    maybe-mostlyclean-send-pr \
-    maybe-mostlyclean-shellutils \
-    maybe-mostlyclean-sid \
-    maybe-mostlyclean-sim \
-    maybe-mostlyclean-tar \
-    maybe-mostlyclean-texinfo \
-    maybe-mostlyclean-textutils \
-    maybe-mostlyclean-time \
-    maybe-mostlyclean-uudecode \
-    maybe-mostlyclean-wdiff \
-    maybe-mostlyclean-zip \
-    maybe-mostlyclean-zlib \
-    maybe-mostlyclean-gdb \
-    maybe-mostlyclean-expect \
-    maybe-mostlyclean-guile \
-    maybe-mostlyclean-tk \
-    maybe-mostlyclean-libtermcap \
-    maybe-mostlyclean-utils \
-    maybe-mostlyclean-gnattools
+
+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-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-gnuserv
+mostlyclean-host: maybe-mostlyclean-gprof
+mostlyclean-host: maybe-mostlyclean-gzip
+mostlyclean-host: maybe-mostlyclean-hello
+mostlyclean-host: maybe-mostlyclean-indent
+mostlyclean-host: maybe-mostlyclean-intl
+mostlyclean-host: maybe-mostlyclean-tcl
+mostlyclean-host: maybe-mostlyclean-itcl
+mostlyclean-host: maybe-mostlyclean-ld
+mostlyclean-host: maybe-mostlyclean-libcpp
+mostlyclean-host: maybe-mostlyclean-libdecnumber
+mostlyclean-host: maybe-mostlyclean-libgui
+mostlyclean-host: maybe-mostlyclean-libiberty
+mostlyclean-host: maybe-mostlyclean-libtool
+mostlyclean-host: maybe-mostlyclean-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
+mostlyclean-host: maybe-mostlyclean-guile
+mostlyclean-host: maybe-mostlyclean-tk
+mostlyclean-host: maybe-mostlyclean-libtermcap
+mostlyclean-host: maybe-mostlyclean-utils
+mostlyclean-host: maybe-mostlyclean-gnattools
 
 .PHONY: mostlyclean-target
-mostlyclean-target:  \
-    maybe-mostlyclean-target-libstdc++-v3 \
-    maybe-mostlyclean-target-libmudflap \
-    maybe-mostlyclean-target-libssp \
-    maybe-mostlyclean-target-libgcc-math \
-    maybe-mostlyclean-target-newlib \
-    maybe-mostlyclean-target-libgfortran \
-    maybe-mostlyclean-target-libobjc \
-    maybe-mostlyclean-target-libtermcap \
-    maybe-mostlyclean-target-winsup \
-    maybe-mostlyclean-target-libgloss \
-    maybe-mostlyclean-target-libiberty \
-    maybe-mostlyclean-target-gperf \
-    maybe-mostlyclean-target-examples \
-    maybe-mostlyclean-target-libffi \
-    maybe-mostlyclean-target-libjava \
-    maybe-mostlyclean-target-zlib \
-    maybe-mostlyclean-target-boehm-gc \
-    maybe-mostlyclean-target-qthreads \
-    maybe-mostlyclean-target-rda \
-    maybe-mostlyclean-target-libada \
-    maybe-mostlyclean-target-libgomp
+
+mostlyclean-target: maybe-mostlyclean-target-libstdc++-v3
+mostlyclean-target: maybe-mostlyclean-target-libmudflap
+mostlyclean-target: maybe-mostlyclean-target-libssp
+mostlyclean-target: maybe-mostlyclean-target-libgcc-math
+mostlyclean-target: maybe-mostlyclean-target-newlib
+mostlyclean-target: maybe-mostlyclean-target-libgfortran
+mostlyclean-target: maybe-mostlyclean-target-libobjc
+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
 
 .PHONY: do-clean
 do-clean:
@@ -1509,99 +1532,99 @@ do-clean:
 
 
 .PHONY: clean-host
-clean-host:  \
-    maybe-clean-ash \
-    maybe-clean-autoconf \
-    maybe-clean-automake \
-    maybe-clean-bash \
-    maybe-clean-bfd \
-    maybe-clean-opcodes \
-    maybe-clean-binutils \
-    maybe-clean-bison \
-    maybe-clean-byacc \
-    maybe-clean-bzip2 \
-    maybe-clean-dejagnu \
-    maybe-clean-diff \
-    maybe-clean-dosutils \
-    maybe-clean-etc \
-    maybe-clean-fastjar \
-    maybe-clean-fileutils \
-    maybe-clean-findutils \
-    maybe-clean-find \
-    maybe-clean-fixincludes \
-    maybe-clean-flex \
-    maybe-clean-gas \
-    maybe-clean-gcc \
-    maybe-clean-gawk \
-    maybe-clean-gettext \
-    maybe-clean-gnuserv \
-    maybe-clean-gprof \
-    maybe-clean-gzip \
-    maybe-clean-hello \
-    maybe-clean-indent \
-    maybe-clean-intl \
-    maybe-clean-tcl \
-    maybe-clean-itcl \
-    maybe-clean-ld \
-    maybe-clean-libcpp \
-    maybe-clean-libdecnumber \
-    maybe-clean-libgui \
-    maybe-clean-libiberty \
-    maybe-clean-libtool \
-    maybe-clean-m4 \
-    maybe-clean-make \
-    maybe-clean-mmalloc \
-    maybe-clean-patch \
-    maybe-clean-perl \
-    maybe-clean-prms \
-    maybe-clean-rcs \
-    maybe-clean-readline \
-    maybe-clean-release \
-    maybe-clean-recode \
-    maybe-clean-sed \
-    maybe-clean-send-pr \
-    maybe-clean-shellutils \
-    maybe-clean-sid \
-    maybe-clean-sim \
-    maybe-clean-tar \
-    maybe-clean-texinfo \
-    maybe-clean-textutils \
-    maybe-clean-time \
-    maybe-clean-uudecode \
-    maybe-clean-wdiff \
-    maybe-clean-zip \
-    maybe-clean-zlib \
-    maybe-clean-gdb \
-    maybe-clean-expect \
-    maybe-clean-guile \
-    maybe-clean-tk \
-    maybe-clean-libtermcap \
-    maybe-clean-utils \
-    maybe-clean-gnattools
+
+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-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-gnuserv
+clean-host: maybe-clean-gprof
+clean-host: maybe-clean-gzip
+clean-host: maybe-clean-hello
+clean-host: maybe-clean-indent
+clean-host: maybe-clean-intl
+clean-host: maybe-clean-tcl
+clean-host: maybe-clean-itcl
+clean-host: maybe-clean-ld
+clean-host: maybe-clean-libcpp
+clean-host: maybe-clean-libdecnumber
+clean-host: maybe-clean-libgui
+clean-host: maybe-clean-libiberty
+clean-host: maybe-clean-libtool
+clean-host: maybe-clean-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
+clean-host: maybe-clean-guile
+clean-host: maybe-clean-tk
+clean-host: maybe-clean-libtermcap
+clean-host: maybe-clean-utils
+clean-host: maybe-clean-gnattools
 
 .PHONY: clean-target
-clean-target:  \
-    maybe-clean-target-libstdc++-v3 \
-    maybe-clean-target-libmudflap \
-    maybe-clean-target-libssp \
-    maybe-clean-target-libgcc-math \
-    maybe-clean-target-newlib \
-    maybe-clean-target-libgfortran \
-    maybe-clean-target-libobjc \
-    maybe-clean-target-libtermcap \
-    maybe-clean-target-winsup \
-    maybe-clean-target-libgloss \
-    maybe-clean-target-libiberty \
-    maybe-clean-target-gperf \
-    maybe-clean-target-examples \
-    maybe-clean-target-libffi \
-    maybe-clean-target-libjava \
-    maybe-clean-target-zlib \
-    maybe-clean-target-boehm-gc \
-    maybe-clean-target-qthreads \
-    maybe-clean-target-rda \
-    maybe-clean-target-libada \
-    maybe-clean-target-libgomp
+
+clean-target: maybe-clean-target-libstdc++-v3
+clean-target: maybe-clean-target-libmudflap
+clean-target: maybe-clean-target-libssp
+clean-target: maybe-clean-target-libgcc-math
+clean-target: maybe-clean-target-newlib
+clean-target: maybe-clean-target-libgfortran
+clean-target: maybe-clean-target-libobjc
+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
 
 .PHONY: do-distclean
 do-distclean:
@@ -1613,99 +1636,99 @@ do-distclean:
 
 
 .PHONY: distclean-host
-distclean-host:  \
-    maybe-distclean-ash \
-    maybe-distclean-autoconf \
-    maybe-distclean-automake \
-    maybe-distclean-bash \
-    maybe-distclean-bfd \
-    maybe-distclean-opcodes \
-    maybe-distclean-binutils \
-    maybe-distclean-bison \
-    maybe-distclean-byacc \
-    maybe-distclean-bzip2 \
-    maybe-distclean-dejagnu \
-    maybe-distclean-diff \
-    maybe-distclean-dosutils \
-    maybe-distclean-etc \
-    maybe-distclean-fastjar \
-    maybe-distclean-fileutils \
-    maybe-distclean-findutils \
-    maybe-distclean-find \
-    maybe-distclean-fixincludes \
-    maybe-distclean-flex \
-    maybe-distclean-gas \
-    maybe-distclean-gcc \
-    maybe-distclean-gawk \
-    maybe-distclean-gettext \
-    maybe-distclean-gnuserv \
-    maybe-distclean-gprof \
-    maybe-distclean-gzip \
-    maybe-distclean-hello \
-    maybe-distclean-indent \
-    maybe-distclean-intl \
-    maybe-distclean-tcl \
-    maybe-distclean-itcl \
-    maybe-distclean-ld \
-    maybe-distclean-libcpp \
-    maybe-distclean-libdecnumber \
-    maybe-distclean-libgui \
-    maybe-distclean-libiberty \
-    maybe-distclean-libtool \
-    maybe-distclean-m4 \
-    maybe-distclean-make \
-    maybe-distclean-mmalloc \
-    maybe-distclean-patch \
-    maybe-distclean-perl \
-    maybe-distclean-prms \
-    maybe-distclean-rcs \
-    maybe-distclean-readline \
-    maybe-distclean-release \
-    maybe-distclean-recode \
-    maybe-distclean-sed \
-    maybe-distclean-send-pr \
-    maybe-distclean-shellutils \
-    maybe-distclean-sid \
-    maybe-distclean-sim \
-    maybe-distclean-tar \
-    maybe-distclean-texinfo \
-    maybe-distclean-textutils \
-    maybe-distclean-time \
-    maybe-distclean-uudecode \
-    maybe-distclean-wdiff \
-    maybe-distclean-zip \
-    maybe-distclean-zlib \
-    maybe-distclean-gdb \
-    maybe-distclean-expect \
-    maybe-distclean-guile \
-    maybe-distclean-tk \
-    maybe-distclean-libtermcap \
-    maybe-distclean-utils \
-    maybe-distclean-gnattools
+
+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-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-gnuserv
+distclean-host: maybe-distclean-gprof
+distclean-host: maybe-distclean-gzip
+distclean-host: maybe-distclean-hello
+distclean-host: maybe-distclean-indent
+distclean-host: maybe-distclean-intl
+distclean-host: maybe-distclean-tcl
+distclean-host: maybe-distclean-itcl
+distclean-host: maybe-distclean-ld
+distclean-host: maybe-distclean-libcpp
+distclean-host: maybe-distclean-libdecnumber
+distclean-host: maybe-distclean-libgui
+distclean-host: maybe-distclean-libiberty
+distclean-host: maybe-distclean-libtool
+distclean-host: maybe-distclean-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
+distclean-host: maybe-distclean-guile
+distclean-host: maybe-distclean-tk
+distclean-host: maybe-distclean-libtermcap
+distclean-host: maybe-distclean-utils
+distclean-host: maybe-distclean-gnattools
 
 .PHONY: distclean-target
-distclean-target:  \
-    maybe-distclean-target-libstdc++-v3 \
-    maybe-distclean-target-libmudflap \
-    maybe-distclean-target-libssp \
-    maybe-distclean-target-libgcc-math \
-    maybe-distclean-target-newlib \
-    maybe-distclean-target-libgfortran \
-    maybe-distclean-target-libobjc \
-    maybe-distclean-target-libtermcap \
-    maybe-distclean-target-winsup \
-    maybe-distclean-target-libgloss \
-    maybe-distclean-target-libiberty \
-    maybe-distclean-target-gperf \
-    maybe-distclean-target-examples \
-    maybe-distclean-target-libffi \
-    maybe-distclean-target-libjava \
-    maybe-distclean-target-zlib \
-    maybe-distclean-target-boehm-gc \
-    maybe-distclean-target-qthreads \
-    maybe-distclean-target-rda \
-    maybe-distclean-target-libada \
-    maybe-distclean-target-libgomp
+
+distclean-target: maybe-distclean-target-libstdc++-v3
+distclean-target: maybe-distclean-target-libmudflap
+distclean-target: maybe-distclean-target-libssp
+distclean-target: maybe-distclean-target-libgcc-math
+distclean-target: maybe-distclean-target-newlib
+distclean-target: maybe-distclean-target-libgfortran
+distclean-target: maybe-distclean-target-libobjc
+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
 
 .PHONY: do-maintainer-clean
 do-maintainer-clean:
@@ -1717,99 +1740,99 @@ do-maintainer-clean:
 
 
 .PHONY: maintainer-clean-host
-maintainer-clean-host:  \
-    maybe-maintainer-clean-ash \
-    maybe-maintainer-clean-autoconf \
-    maybe-maintainer-clean-automake \
-    maybe-maintainer-clean-bash \
-    maybe-maintainer-clean-bfd \
-    maybe-maintainer-clean-opcodes \
-    maybe-maintainer-clean-binutils \
-    maybe-maintainer-clean-bison \
-    maybe-maintainer-clean-byacc \
-    maybe-maintainer-clean-bzip2 \
-    maybe-maintainer-clean-dejagnu \
-    maybe-maintainer-clean-diff \
-    maybe-maintainer-clean-dosutils \
-    maybe-maintainer-clean-etc \
-    maybe-maintainer-clean-fastjar \
-    maybe-maintainer-clean-fileutils \
-    maybe-maintainer-clean-findutils \
-    maybe-maintainer-clean-find \
-    maybe-maintainer-clean-fixincludes \
-    maybe-maintainer-clean-flex \
-    maybe-maintainer-clean-gas \
-    maybe-maintainer-clean-gcc \
-    maybe-maintainer-clean-gawk \
-    maybe-maintainer-clean-gettext \
-    maybe-maintainer-clean-gnuserv \
-    maybe-maintainer-clean-gprof \
-    maybe-maintainer-clean-gzip \
-    maybe-maintainer-clean-hello \
-    maybe-maintainer-clean-indent \
-    maybe-maintainer-clean-intl \
-    maybe-maintainer-clean-tcl \
-    maybe-maintainer-clean-itcl \
-    maybe-maintainer-clean-ld \
-    maybe-maintainer-clean-libcpp \
-    maybe-maintainer-clean-libdecnumber \
-    maybe-maintainer-clean-libgui \
-    maybe-maintainer-clean-libiberty \
-    maybe-maintainer-clean-libtool \
-    maybe-maintainer-clean-m4 \
-    maybe-maintainer-clean-make \
-    maybe-maintainer-clean-mmalloc \
-    maybe-maintainer-clean-patch \
-    maybe-maintainer-clean-perl \
-    maybe-maintainer-clean-prms \
-    maybe-maintainer-clean-rcs \
-    maybe-maintainer-clean-readline \
-    maybe-maintainer-clean-release \
-    maybe-maintainer-clean-recode \
-    maybe-maintainer-clean-sed \
-    maybe-maintainer-clean-send-pr \
-    maybe-maintainer-clean-shellutils \
-    maybe-maintainer-clean-sid \
-    maybe-maintainer-clean-sim \
-    maybe-maintainer-clean-tar \
-    maybe-maintainer-clean-texinfo \
-    maybe-maintainer-clean-textutils \
-    maybe-maintainer-clean-time \
-    maybe-maintainer-clean-uudecode \
-    maybe-maintainer-clean-wdiff \
-    maybe-maintainer-clean-zip \
-    maybe-maintainer-clean-zlib \
-    maybe-maintainer-clean-gdb \
-    maybe-maintainer-clean-expect \
-    maybe-maintainer-clean-guile \
-    maybe-maintainer-clean-tk \
-    maybe-maintainer-clean-libtermcap \
-    maybe-maintainer-clean-utils \
-    maybe-maintainer-clean-gnattools
+
+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-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-gnuserv
+maintainer-clean-host: maybe-maintainer-clean-gprof
+maintainer-clean-host: maybe-maintainer-clean-gzip
+maintainer-clean-host: maybe-maintainer-clean-hello
+maintainer-clean-host: maybe-maintainer-clean-indent
+maintainer-clean-host: maybe-maintainer-clean-intl
+maintainer-clean-host: maybe-maintainer-clean-tcl
+maintainer-clean-host: maybe-maintainer-clean-itcl
+maintainer-clean-host: maybe-maintainer-clean-ld
+maintainer-clean-host: maybe-maintainer-clean-libcpp
+maintainer-clean-host: maybe-maintainer-clean-libdecnumber
+maintainer-clean-host: maybe-maintainer-clean-libgui
+maintainer-clean-host: maybe-maintainer-clean-libiberty
+maintainer-clean-host: maybe-maintainer-clean-libtool
+maintainer-clean-host: maybe-maintainer-clean-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
+maintainer-clean-host: maybe-maintainer-clean-guile
+maintainer-clean-host: maybe-maintainer-clean-tk
+maintainer-clean-host: maybe-maintainer-clean-libtermcap
+maintainer-clean-host: maybe-maintainer-clean-utils
+maintainer-clean-host: maybe-maintainer-clean-gnattools
 
 .PHONY: maintainer-clean-target
-maintainer-clean-target:  \
-    maybe-maintainer-clean-target-libstdc++-v3 \
-    maybe-maintainer-clean-target-libmudflap \
-    maybe-maintainer-clean-target-libssp \
-    maybe-maintainer-clean-target-libgcc-math \
-    maybe-maintainer-clean-target-newlib \
-    maybe-maintainer-clean-target-libgfortran \
-    maybe-maintainer-clean-target-libobjc \
-    maybe-maintainer-clean-target-libtermcap \
-    maybe-maintainer-clean-target-winsup \
-    maybe-maintainer-clean-target-libgloss \
-    maybe-maintainer-clean-target-libiberty \
-    maybe-maintainer-clean-target-gperf \
-    maybe-maintainer-clean-target-examples \
-    maybe-maintainer-clean-target-libffi \
-    maybe-maintainer-clean-target-libjava \
-    maybe-maintainer-clean-target-zlib \
-    maybe-maintainer-clean-target-boehm-gc \
-    maybe-maintainer-clean-target-qthreads \
-    maybe-maintainer-clean-target-rda \
-    maybe-maintainer-clean-target-libada \
-    maybe-maintainer-clean-target-libgomp
+
+maintainer-clean-target: maybe-maintainer-clean-target-libstdc++-v3
+maintainer-clean-target: maybe-maintainer-clean-target-libmudflap
+maintainer-clean-target: maybe-maintainer-clean-target-libssp
+maintainer-clean-target: maybe-maintainer-clean-target-libgcc-math
+maintainer-clean-target: maybe-maintainer-clean-target-newlib
+maintainer-clean-target: maybe-maintainer-clean-target-libgfortran
+maintainer-clean-target: maybe-maintainer-clean-target-libobjc
+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
 
 
 # Here are the targets which correspond to the do-X targets.
@@ -2237,12 +2260,12 @@ TAGS: do-TAGS
 maybe-configure-build-libiberty:
 @if build-libiberty
 maybe-configure-build-libiberty: configure-build-libiberty
-configure-build-libiberty:
+configure-build-libiberty: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libiberty ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libiberty ; \
 	$(BUILD_EXPORTS) \
 	echo Configuring in $(BUILD_SUBDIR)/libiberty; \
 	cd "$(BUILD_SUBDIR)/libiberty" || exit 1; \
@@ -2285,12 +2308,12 @@ all-build-libiberty: configure-build-libiberty
 maybe-configure-build-bison:
 @if build-bison
 maybe-configure-build-bison: configure-build-bison
-configure-build-bison:
+configure-build-bison: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(BUILD_SUBDIR)/bison/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(BUILD_SUBDIR)/bison/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison ; \
 	$(BUILD_EXPORTS) \
 	echo Configuring in $(BUILD_SUBDIR)/bison; \
 	cd "$(BUILD_SUBDIR)/bison" || exit 1; \
@@ -2333,12 +2356,12 @@ all-build-bison: configure-build-bison
 maybe-configure-build-byacc:
 @if build-byacc
 maybe-configure-build-byacc: configure-build-byacc
-configure-build-byacc:
+configure-build-byacc: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(BUILD_SUBDIR)/byacc/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/byacc ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -2381,12 +2404,12 @@ all-build-byacc: configure-build-byacc
 maybe-configure-build-flex:
 @if build-flex
 maybe-configure-build-flex: configure-build-flex
-configure-build-flex:
+configure-build-flex: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(BUILD_SUBDIR)/flex/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(BUILD_SUBDIR)/flex/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex ; \
 	$(BUILD_EXPORTS) \
 	echo Configuring in $(BUILD_SUBDIR)/flex; \
 	cd "$(BUILD_SUBDIR)/flex" || exit 1; \
@@ -2429,12 +2452,12 @@ all-build-flex: configure-build-flex
 maybe-configure-build-m4:
 @if build-m4
 maybe-configure-build-m4: configure-build-m4
-configure-build-m4:
+configure-build-m4: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(BUILD_SUBDIR)/m4/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4 ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(BUILD_SUBDIR)/m4/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4 ; \
 	$(BUILD_EXPORTS) \
 	echo Configuring in $(BUILD_SUBDIR)/m4; \
 	cd "$(BUILD_SUBDIR)/m4" || exit 1; \
@@ -2477,12 +2500,12 @@ all-build-m4: configure-build-m4
 maybe-configure-build-texinfo:
 @if build-texinfo
 maybe-configure-build-texinfo: configure-build-texinfo
-configure-build-texinfo:
+configure-build-texinfo: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo ; \
 	$(BUILD_EXPORTS) \
 	echo Configuring in $(BUILD_SUBDIR)/texinfo; \
 	cd "$(BUILD_SUBDIR)/texinfo" || exit 1; \
@@ -2525,12 +2548,12 @@ all-build-texinfo: configure-build-texinfo
 maybe-configure-build-fixincludes:
 @if build-fixincludes
 maybe-configure-build-fixincludes: configure-build-fixincludes
-configure-build-fixincludes:
+configure-build-fixincludes: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes ; \
 	$(BUILD_EXPORTS) \
 	echo Configuring in $(BUILD_SUBDIR)/fixincludes; \
 	cd "$(BUILD_SUBDIR)/fixincludes" || exit 1; \
@@ -2578,12 +2601,12 @@ all-build-fixincludes: configure-build-fixincludes
 maybe-configure-ash:
 @if ash
 maybe-configure-ash: configure-ash
-configure-ash:
+configure-ash: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/ash/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ash ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/ash/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ash ; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/ash; \
 	cd "$(HOST_SUBDIR)/ash" || exit 1; \
@@ -2915,12 +2938,12 @@ maintainer-clean-ash:
 maybe-configure-autoconf:
 @if autoconf
 maybe-configure-autoconf: configure-autoconf
-configure-autoconf:
+configure-autoconf: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/autoconf/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/autoconf ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -3252,12 +3275,12 @@ maintainer-clean-autoconf:
 maybe-configure-automake:
 @if automake
 maybe-configure-automake: configure-automake
-configure-automake:
+configure-automake: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/automake/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/automake ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/automake/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/automake ; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/automake; \
 	cd "$(HOST_SUBDIR)/automake" || exit 1; \
@@ -3589,12 +3612,12 @@ maintainer-clean-automake:
 maybe-configure-bash:
 @if bash
 maybe-configure-bash: configure-bash
-configure-bash:
+configure-bash: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/bash/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bash ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -3926,12 +3949,16 @@ maintainer-clean-bash:
 maybe-configure-bfd:
 @if bfd
 maybe-configure-bfd: configure-bfd
-configure-bfd:
-	@test -f stage_last && exit 0; \
+configure-bfd: 
+@endif bfd
+@if bfd-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif bfd-bootstrap
+@if bfd
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/bfd; \
 	cd "$(HOST_SUBDIR)/bfd" || exit 1; \
@@ -3954,8 +3981,10 @@ maybe-configure-stage1-bfd:
 @if bfd-bootstrap
 maybe-configure-stage1-bfd: configure-stage1-bfd
 configure-stage1-bfd:
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \
@@ -3978,8 +4007,10 @@ maybe-configure-stage2-bfd:
 @if bfd-bootstrap
 maybe-configure-stage2-bfd: configure-stage2-bfd
 configure-stage2-bfd:
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -4003,8 +4034,10 @@ maybe-configure-stage3-bfd:
 @if bfd-bootstrap
 maybe-configure-stage3-bfd: configure-stage3-bfd
 configure-stage3-bfd:
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -4028,8 +4061,10 @@ maybe-configure-stage4-bfd:
 @if bfd-bootstrap
 maybe-configure-stage4-bfd: configure-stage4-bfd
 configure-stage4-bfd:
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -4053,8 +4088,10 @@ maybe-configure-stageprofile-bfd:
 @if bfd-bootstrap
 maybe-configure-stageprofile-bfd: configure-stageprofile-bfd
 configure-stageprofile-bfd:
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -4078,8 +4115,10 @@ maybe-configure-stagefeedback-bfd:
 @if bfd-bootstrap
 maybe-configure-stagefeedback-bfd: configure-stagefeedback-bfd
 configure-stagefeedback-bfd:
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -4108,8 +4147,12 @@ maybe-all-bfd:
 TARGET-bfd=all
 maybe-all-bfd: all-bfd
 all-bfd: configure-bfd
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+@endif bfd
+@if bfd-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif bfd-bootstrap
+@if bfd
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/bfd && \
@@ -4127,12 +4170,12 @@ maybe-all-stage1-bfd: all-stage1-bfd
 all-stage1: all-stage1-bfd
 TARGET-stage1-bfd = $(TARGET-bfd)
 all-stage1-bfd: configure-stage1-bfd
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)"  \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
 		$(TARGET-stage1-bfd)
 
 maybe-clean-stage1-bfd: clean-stage1-bfd
@@ -4140,10 +4183,10 @@ clean-stage1: clean-stage1-bfd
 clean-stage1-bfd:
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-bfd/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/bfd && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)"  clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif bfd-bootstrap
 
 
@@ -4156,7 +4199,7 @@ maybe-all-stage2-bfd: all-stage2-bfd
 all-stage2: all-stage2-bfd
 TARGET-stage2-bfd = $(TARGET-bfd)
 all-stage2-bfd: configure-stage2-bfd
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4170,7 +4213,7 @@ clean-stage2: clean-stage2-bfd
 clean-stage2-bfd:
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-bfd/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/bfd && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4187,7 +4230,7 @@ maybe-all-stage3-bfd: all-stage3-bfd
 all-stage3: all-stage3-bfd
 TARGET-stage3-bfd = $(TARGET-bfd)
 all-stage3-bfd: configure-stage3-bfd
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4201,7 +4244,7 @@ clean-stage3: clean-stage3-bfd
 clean-stage3-bfd:
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-bfd/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/bfd && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4218,7 +4261,7 @@ maybe-all-stage4-bfd: all-stage4-bfd
 all-stage4: all-stage4-bfd
 TARGET-stage4-bfd = $(TARGET-bfd)
 all-stage4-bfd: configure-stage4-bfd
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4232,7 +4275,7 @@ clean-stage4: clean-stage4-bfd
 clean-stage4-bfd:
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-bfd/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/bfd && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4249,7 +4292,7 @@ maybe-all-stageprofile-bfd: all-stageprofile-bfd
 all-stageprofile: all-stageprofile-bfd
 TARGET-stageprofile-bfd = $(TARGET-bfd)
 all-stageprofile-bfd: configure-stageprofile-bfd
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4263,7 +4306,7 @@ clean-stageprofile: clean-stageprofile-bfd
 clean-stageprofile-bfd:
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-bfd/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/bfd && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4280,7 +4323,7 @@ maybe-all-stagefeedback-bfd: all-stagefeedback-bfd
 all-stagefeedback: all-stagefeedback-bfd
 TARGET-stagefeedback-bfd = $(TARGET-bfd)
 all-stagefeedback-bfd: configure-stagefeedback-bfd
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4294,7 +4337,7 @@ clean-stagefeedback: clean-stagefeedback-bfd
 clean-stagefeedback-bfd:
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-bfd/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/bfd && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4590,12 +4633,16 @@ maintainer-clean-bfd:
 maybe-configure-opcodes:
 @if opcodes
 maybe-configure-opcodes: configure-opcodes
-configure-opcodes:
-	@test -f stage_last && exit 0; \
+configure-opcodes: 
+@endif opcodes
+@if opcodes-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif opcodes-bootstrap
+@if opcodes
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/opcodes; \
 	cd "$(HOST_SUBDIR)/opcodes" || exit 1; \
@@ -4618,8 +4665,10 @@ maybe-configure-stage1-opcodes:
 @if opcodes-bootstrap
 maybe-configure-stage1-opcodes: configure-stage1-opcodes
 configure-stage1-opcodes:
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \
@@ -4642,8 +4691,10 @@ maybe-configure-stage2-opcodes:
 @if opcodes-bootstrap
 maybe-configure-stage2-opcodes: configure-stage2-opcodes
 configure-stage2-opcodes:
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -4667,8 +4718,10 @@ maybe-configure-stage3-opcodes:
 @if opcodes-bootstrap
 maybe-configure-stage3-opcodes: configure-stage3-opcodes
 configure-stage3-opcodes:
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -4692,8 +4745,10 @@ maybe-configure-stage4-opcodes:
 @if opcodes-bootstrap
 maybe-configure-stage4-opcodes: configure-stage4-opcodes
 configure-stage4-opcodes:
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -4717,8 +4772,10 @@ maybe-configure-stageprofile-opcodes:
 @if opcodes-bootstrap
 maybe-configure-stageprofile-opcodes: configure-stageprofile-opcodes
 configure-stageprofile-opcodes:
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -4742,8 +4799,10 @@ maybe-configure-stagefeedback-opcodes:
 @if opcodes-bootstrap
 maybe-configure-stagefeedback-opcodes: configure-stagefeedback-opcodes
 configure-stagefeedback-opcodes:
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -4772,8 +4831,12 @@ maybe-all-opcodes:
 TARGET-opcodes=all
 maybe-all-opcodes: all-opcodes
 all-opcodes: configure-opcodes
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+@endif opcodes
+@if opcodes-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif opcodes-bootstrap
+@if opcodes
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/opcodes && \
@@ -4791,12 +4854,12 @@ maybe-all-stage1-opcodes: all-stage1-opcodes
 all-stage1: all-stage1-opcodes
 TARGET-stage1-opcodes = $(TARGET-opcodes)
 all-stage1-opcodes: configure-stage1-opcodes
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)"  \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
 		$(TARGET-stage1-opcodes)
 
 maybe-clean-stage1-opcodes: clean-stage1-opcodes
@@ -4804,10 +4867,10 @@ clean-stage1: clean-stage1-opcodes
 clean-stage1-opcodes:
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-opcodes/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)"  clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif opcodes-bootstrap
 
 
@@ -4820,7 +4883,7 @@ maybe-all-stage2-opcodes: all-stage2-opcodes
 all-stage2: all-stage2-opcodes
 TARGET-stage2-opcodes = $(TARGET-opcodes)
 all-stage2-opcodes: configure-stage2-opcodes
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4834,7 +4897,7 @@ clean-stage2: clean-stage2-opcodes
 clean-stage2-opcodes:
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-opcodes/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4851,7 +4914,7 @@ maybe-all-stage3-opcodes: all-stage3-opcodes
 all-stage3: all-stage3-opcodes
 TARGET-stage3-opcodes = $(TARGET-opcodes)
 all-stage3-opcodes: configure-stage3-opcodes
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4865,7 +4928,7 @@ clean-stage3: clean-stage3-opcodes
 clean-stage3-opcodes:
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-opcodes/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4882,7 +4945,7 @@ maybe-all-stage4-opcodes: all-stage4-opcodes
 all-stage4: all-stage4-opcodes
 TARGET-stage4-opcodes = $(TARGET-opcodes)
 all-stage4-opcodes: configure-stage4-opcodes
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4896,7 +4959,7 @@ clean-stage4: clean-stage4-opcodes
 clean-stage4-opcodes:
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-opcodes/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4913,7 +4976,7 @@ maybe-all-stageprofile-opcodes: all-stageprofile-opcodes
 all-stageprofile: all-stageprofile-opcodes
 TARGET-stageprofile-opcodes = $(TARGET-opcodes)
 all-stageprofile-opcodes: configure-stageprofile-opcodes
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4927,7 +4990,7 @@ clean-stageprofile: clean-stageprofile-opcodes
 clean-stageprofile-opcodes:
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-opcodes/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4944,7 +5007,7 @@ maybe-all-stagefeedback-opcodes: all-stagefeedback-opcodes
 all-stagefeedback: all-stagefeedback-opcodes
 TARGET-stagefeedback-opcodes = $(TARGET-opcodes)
 all-stagefeedback-opcodes: configure-stagefeedback-opcodes
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4958,7 +5021,7 @@ clean-stagefeedback: clean-stagefeedback-opcodes
 clean-stagefeedback-opcodes:
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-opcodes/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -5254,12 +5317,16 @@ maintainer-clean-opcodes:
 maybe-configure-binutils:
 @if binutils
 maybe-configure-binutils: configure-binutils
-configure-binutils:
-	@test -f stage_last && exit 0; \
+configure-binutils: 
+@endif binutils
+@if binutils-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif binutils-bootstrap
+@if binutils
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/binutils; \
 	cd "$(HOST_SUBDIR)/binutils" || exit 1; \
@@ -5282,8 +5349,10 @@ maybe-configure-stage1-binutils:
 @if binutils-bootstrap
 maybe-configure-stage1-binutils: configure-stage1-binutils
 configure-stage1-binutils:
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \
@@ -5306,8 +5375,10 @@ maybe-configure-stage2-binutils:
 @if binutils-bootstrap
 maybe-configure-stage2-binutils: configure-stage2-binutils
 configure-stage2-binutils:
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -5331,8 +5402,10 @@ maybe-configure-stage3-binutils:
 @if binutils-bootstrap
 maybe-configure-stage3-binutils: configure-stage3-binutils
 configure-stage3-binutils:
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -5356,8 +5429,10 @@ maybe-configure-stage4-binutils:
 @if binutils-bootstrap
 maybe-configure-stage4-binutils: configure-stage4-binutils
 configure-stage4-binutils:
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -5381,8 +5456,10 @@ maybe-configure-stageprofile-binutils:
 @if binutils-bootstrap
 maybe-configure-stageprofile-binutils: configure-stageprofile-binutils
 configure-stageprofile-binutils:
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -5406,8 +5483,10 @@ maybe-configure-stagefeedback-binutils:
 @if binutils-bootstrap
 maybe-configure-stagefeedback-binutils: configure-stagefeedback-binutils
 configure-stagefeedback-binutils:
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -5436,8 +5515,12 @@ maybe-all-binutils:
 TARGET-binutils=all
 maybe-all-binutils: all-binutils
 all-binutils: configure-binutils
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+@endif binutils
+@if binutils-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif binutils-bootstrap
+@if binutils
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/binutils && \
@@ -5455,12 +5538,12 @@ maybe-all-stage1-binutils: all-stage1-binutils
 all-stage1: all-stage1-binutils
 TARGET-stage1-binutils = $(TARGET-binutils)
 all-stage1-binutils: configure-stage1-binutils
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)"  \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
 		$(TARGET-stage1-binutils)
 
 maybe-clean-stage1-binutils: clean-stage1-binutils
@@ -5468,10 +5551,10 @@ clean-stage1: clean-stage1-binutils
 clean-stage1-binutils:
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-binutils/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/binutils && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)"  clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif binutils-bootstrap
 
 
@@ -5484,7 +5567,7 @@ maybe-all-stage2-binutils: all-stage2-binutils
 all-stage2: all-stage2-binutils
 TARGET-stage2-binutils = $(TARGET-binutils)
 all-stage2-binutils: configure-stage2-binutils
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5498,7 +5581,7 @@ clean-stage2: clean-stage2-binutils
 clean-stage2-binutils:
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-binutils/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/binutils && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -5515,7 +5598,7 @@ maybe-all-stage3-binutils: all-stage3-binutils
 all-stage3: all-stage3-binutils
 TARGET-stage3-binutils = $(TARGET-binutils)
 all-stage3-binutils: configure-stage3-binutils
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5529,7 +5612,7 @@ clean-stage3: clean-stage3-binutils
 clean-stage3-binutils:
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-binutils/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/binutils && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -5546,7 +5629,7 @@ maybe-all-stage4-binutils: all-stage4-binutils
 all-stage4: all-stage4-binutils
 TARGET-stage4-binutils = $(TARGET-binutils)
 all-stage4-binutils: configure-stage4-binutils
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5560,7 +5643,7 @@ clean-stage4: clean-stage4-binutils
 clean-stage4-binutils:
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-binutils/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/binutils && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -5577,7 +5660,7 @@ maybe-all-stageprofile-binutils: all-stageprofile-binutils
 all-stageprofile: all-stageprofile-binutils
 TARGET-stageprofile-binutils = $(TARGET-binutils)
 all-stageprofile-binutils: configure-stageprofile-binutils
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5591,7 +5674,7 @@ clean-stageprofile: clean-stageprofile-binutils
 clean-stageprofile-binutils:
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-binutils/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/binutils && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -5608,7 +5691,7 @@ maybe-all-stagefeedback-binutils: all-stagefeedback-binutils
 all-stagefeedback: all-stagefeedback-binutils
 TARGET-stagefeedback-binutils = $(TARGET-binutils)
 all-stagefeedback-binutils: configure-stagefeedback-binutils
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5622,7 +5705,7 @@ clean-stagefeedback: clean-stagefeedback-binutils
 clean-stagefeedback-binutils:
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-binutils/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/binutils && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -5918,12 +6001,12 @@ maintainer-clean-binutils:
 maybe-configure-bison:
 @if bison
 maybe-configure-bison: configure-bison
-configure-bison:
+configure-bison: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/bison/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/bison/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison ; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/bison; \
 	cd "$(HOST_SUBDIR)/bison" || exit 1; \
@@ -6258,12 +6341,12 @@ maintainer-clean-bison:
 maybe-configure-byacc:
 @if byacc
 maybe-configure-byacc: configure-byacc
-configure-byacc:
+configure-byacc: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/byacc/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/byacc ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/byacc/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/byacc ; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/byacc; \
 	cd "$(HOST_SUBDIR)/byacc" || exit 1; \
@@ -6598,12 +6681,12 @@ maintainer-clean-byacc:
 maybe-configure-bzip2:
 @if bzip2
 maybe-configure-bzip2: configure-bzip2
-configure-bzip2:
+configure-bzip2: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/bzip2/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bzip2 ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/bzip2/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bzip2 ; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/bzip2; \
 	cd "$(HOST_SUBDIR)/bzip2" || exit 1; \
@@ -6935,12 +7018,12 @@ maintainer-clean-bzip2:
 maybe-configure-dejagnu:
 @if dejagnu
 maybe-configure-dejagnu: configure-dejagnu
-configure-dejagnu:
+configure-dejagnu: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/dejagnu/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dejagnu ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -7272,12 +7355,12 @@ maintainer-clean-dejagnu:
 maybe-configure-diff:
 @if diff
 maybe-configure-diff: configure-diff
-configure-diff:
+configure-diff: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/diff/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/diff ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -7609,12 +7692,12 @@ maintainer-clean-diff:
 maybe-configure-dosutils:
 @if dosutils
 maybe-configure-dosutils: configure-dosutils
-configure-dosutils:
+configure-dosutils: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/dosutils/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dosutils ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/dosutils/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dosutils ; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/dosutils; \
 	cd "$(HOST_SUBDIR)/dosutils" || exit 1; \
@@ -7940,12 +8023,12 @@ maintainer-clean-dosutils:
 maybe-configure-etc:
 @if etc
 maybe-configure-etc: configure-etc
-configure-etc:
+configure-etc: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/etc/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/etc ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -8277,12 +8360,12 @@ maintainer-clean-etc:
 maybe-configure-fastjar:
 @if fastjar
 maybe-configure-fastjar: configure-fastjar
-configure-fastjar:
+configure-fastjar: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/fastjar/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fastjar ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/fastjar/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fastjar ; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/fastjar; \
 	cd "$(HOST_SUBDIR)/fastjar" || exit 1; \
@@ -8617,12 +8700,12 @@ maintainer-clean-fastjar:
 maybe-configure-fileutils:
 @if fileutils
 maybe-configure-fileutils: configure-fileutils
-configure-fileutils:
+configure-fileutils: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/fileutils/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fileutils ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -8954,12 +9037,12 @@ maintainer-clean-fileutils:
 maybe-configure-findutils:
 @if findutils
 maybe-configure-findutils: configure-findutils
-configure-findutils:
+configure-findutils: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/findutils/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/findutils ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/findutils/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/findutils ; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/findutils; \
 	cd "$(HOST_SUBDIR)/findutils" || exit 1; \
@@ -9291,12 +9374,12 @@ maintainer-clean-findutils:
 maybe-configure-find:
 @if find
 maybe-configure-find: configure-find
-configure-find:
+configure-find: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/find/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/find ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -9628,12 +9711,12 @@ maintainer-clean-find:
 maybe-configure-fixincludes:
 @if fixincludes
 maybe-configure-fixincludes: configure-fixincludes
-configure-fixincludes:
+configure-fixincludes: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/fixincludes; \
 	cd "$(HOST_SUBDIR)/fixincludes" || exit 1; \
@@ -9884,12 +9967,12 @@ maintainer-clean-fixincludes:
 maybe-configure-flex:
 @if flex
 maybe-configure-flex: configure-flex
-configure-flex:
+configure-flex: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/flex/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/flex ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/flex/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/flex ; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/flex; \
 	cd "$(HOST_SUBDIR)/flex" || exit 1; \
@@ -10224,12 +10307,16 @@ maintainer-clean-flex:
 maybe-configure-gas:
 @if gas
 maybe-configure-gas: configure-gas
-configure-gas:
-	@test -f stage_last && exit 0; \
+configure-gas: 
+@endif gas
+@if gas-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif gas-bootstrap
+@if gas
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/gas; \
 	cd "$(HOST_SUBDIR)/gas" || exit 1; \
@@ -10252,8 +10339,10 @@ maybe-configure-stage1-gas:
 @if gas-bootstrap
 maybe-configure-stage1-gas: configure-stage1-gas
 configure-stage1-gas:
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/gas ; \
@@ -10276,8 +10365,10 @@ maybe-configure-stage2-gas:
 @if gas-bootstrap
 maybe-configure-stage2-gas: configure-stage2-gas
 configure-stage2-gas:
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -10301,8 +10392,10 @@ maybe-configure-stage3-gas:
 @if gas-bootstrap
 maybe-configure-stage3-gas: configure-stage3-gas
 configure-stage3-gas:
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -10326,8 +10419,10 @@ maybe-configure-stage4-gas:
 @if gas-bootstrap
 maybe-configure-stage4-gas: configure-stage4-gas
 configure-stage4-gas:
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -10351,8 +10446,10 @@ maybe-configure-stageprofile-gas:
 @if gas-bootstrap
 maybe-configure-stageprofile-gas: configure-stageprofile-gas
 configure-stageprofile-gas:
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -10376,8 +10473,10 @@ maybe-configure-stagefeedback-gas:
 @if gas-bootstrap
 maybe-configure-stagefeedback-gas: configure-stagefeedback-gas
 configure-stagefeedback-gas:
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -10406,8 +10505,12 @@ maybe-all-gas:
 TARGET-gas=all
 maybe-all-gas: all-gas
 all-gas: configure-gas
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+@endif gas
+@if gas-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif gas-bootstrap
+@if gas
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/gas && \
@@ -10425,12 +10528,12 @@ maybe-all-stage1-gas: all-stage1-gas
 all-stage1: all-stage1-gas
 TARGET-stage1-gas = $(TARGET-gas)
 all-stage1-gas: configure-stage1-gas
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)"  \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
 		$(TARGET-stage1-gas)
 
 maybe-clean-stage1-gas: clean-stage1-gas
@@ -10438,10 +10541,10 @@ clean-stage1: clean-stage1-gas
 clean-stage1-gas:
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-gas/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/gas && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)"  clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif gas-bootstrap
 
 
@@ -10454,7 +10557,7 @@ maybe-all-stage2-gas: all-stage2-gas
 all-stage2: all-stage2-gas
 TARGET-stage2-gas = $(TARGET-gas)
 all-stage2-gas: configure-stage2-gas
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -10468,7 +10571,7 @@ clean-stage2: clean-stage2-gas
 clean-stage2-gas:
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-gas/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/gas && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -10485,7 +10588,7 @@ maybe-all-stage3-gas: all-stage3-gas
 all-stage3: all-stage3-gas
 TARGET-stage3-gas = $(TARGET-gas)
 all-stage3-gas: configure-stage3-gas
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -10499,7 +10602,7 @@ clean-stage3: clean-stage3-gas
 clean-stage3-gas:
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-gas/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/gas && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -10516,7 +10619,7 @@ maybe-all-stage4-gas: all-stage4-gas
 all-stage4: all-stage4-gas
 TARGET-stage4-gas = $(TARGET-gas)
 all-stage4-gas: configure-stage4-gas
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -10530,7 +10633,7 @@ clean-stage4: clean-stage4-gas
 clean-stage4-gas:
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-gas/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/gas && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -10547,7 +10650,7 @@ maybe-all-stageprofile-gas: all-stageprofile-gas
 all-stageprofile: all-stageprofile-gas
 TARGET-stageprofile-gas = $(TARGET-gas)
 all-stageprofile-gas: configure-stageprofile-gas
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -10561,7 +10664,7 @@ clean-stageprofile: clean-stageprofile-gas
 clean-stageprofile-gas:
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-gas/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/gas && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -10578,7 +10681,7 @@ maybe-all-stagefeedback-gas: all-stagefeedback-gas
 all-stagefeedback: all-stagefeedback-gas
 TARGET-stagefeedback-gas = $(TARGET-gas)
 all-stagefeedback-gas: configure-stagefeedback-gas
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -10592,7 +10695,7 @@ clean-stagefeedback: clean-stagefeedback-gas
 clean-stagefeedback-gas:
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-gas/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/gas && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -10888,12 +10991,16 @@ maintainer-clean-gas:
 maybe-configure-gcc:
 @if gcc
 maybe-configure-gcc: configure-gcc
-configure-gcc:
-	@test -f stage_last && exit 0; \
+configure-gcc: 
+@endif gcc
+@if gcc-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif gcc-bootstrap
+@if gcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/gcc; \
 	cd "$(HOST_SUBDIR)/gcc" || exit 1; \
@@ -10916,8 +11023,10 @@ maybe-configure-stage1-gcc:
 @if gcc-bootstrap
 maybe-configure-stage1-gcc: configure-stage1-gcc
 configure-stage1-gcc:
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \
@@ -10940,8 +11049,10 @@ maybe-configure-stage2-gcc:
 @if gcc-bootstrap
 maybe-configure-stage2-gcc: configure-stage2-gcc
 configure-stage2-gcc:
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -10965,8 +11076,10 @@ maybe-configure-stage3-gcc:
 @if gcc-bootstrap
 maybe-configure-stage3-gcc: configure-stage3-gcc
 configure-stage3-gcc:
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -10990,8 +11103,10 @@ maybe-configure-stage4-gcc:
 @if gcc-bootstrap
 maybe-configure-stage4-gcc: configure-stage4-gcc
 configure-stage4-gcc:
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -11015,8 +11130,10 @@ maybe-configure-stageprofile-gcc:
 @if gcc-bootstrap
 maybe-configure-stageprofile-gcc: configure-stageprofile-gcc
 configure-stageprofile-gcc:
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -11040,8 +11157,10 @@ maybe-configure-stagefeedback-gcc:
 @if gcc-bootstrap
 maybe-configure-stagefeedback-gcc: configure-stagefeedback-gcc
 configure-stagefeedback-gcc:
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -11070,8 +11189,12 @@ maybe-all-gcc:
 TARGET-gcc=`if [ -f stage_last ]; then echo quickstrap ; else echo all; fi`
 maybe-all-gcc: all-gcc
 all-gcc: configure-gcc
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+@endif gcc
+@if gcc-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif gcc-bootstrap
+@if gcc
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/gcc && \
@@ -11089,12 +11212,12 @@ maybe-all-stage1-gcc: all-stage1-gcc
 all-stage1: all-stage1-gcc
 TARGET-stage1-gcc = $(TARGET-gcc)
 all-stage1-gcc: configure-stage1-gcc
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) \
 		$(TARGET-stage1-gcc)
 
 maybe-clean-stage1-gcc: clean-stage1-gcc
@@ -11102,10 +11225,10 @@ clean-stage1: clean-stage1-gcc
 clean-stage1-gcc:
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-gcc/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/gcc && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) clean
 @endif gcc-bootstrap
 
 
@@ -11118,7 +11241,7 @@ maybe-all-stage2-gcc: all-stage2-gcc
 all-stage2: all-stage2-gcc
 TARGET-stage2-gcc = $(TARGET-gcc)
 all-stage2-gcc: configure-stage2-gcc
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11132,7 +11255,7 @@ clean-stage2: clean-stage2-gcc
 clean-stage2-gcc:
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-gcc/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/gcc && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -11149,7 +11272,7 @@ maybe-all-stage3-gcc: all-stage3-gcc
 all-stage3: all-stage3-gcc
 TARGET-stage3-gcc = $(TARGET-gcc)
 all-stage3-gcc: configure-stage3-gcc
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11163,7 +11286,7 @@ clean-stage3: clean-stage3-gcc
 clean-stage3-gcc:
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-gcc/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/gcc && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -11180,7 +11303,7 @@ maybe-all-stage4-gcc: all-stage4-gcc
 all-stage4: all-stage4-gcc
 TARGET-stage4-gcc = $(TARGET-gcc)
 all-stage4-gcc: configure-stage4-gcc
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11194,7 +11317,7 @@ clean-stage4: clean-stage4-gcc
 clean-stage4-gcc:
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-gcc/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/gcc && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -11211,7 +11334,7 @@ maybe-all-stageprofile-gcc: all-stageprofile-gcc
 all-stageprofile: all-stageprofile-gcc
 TARGET-stageprofile-gcc = $(TARGET-gcc)
 all-stageprofile-gcc: configure-stageprofile-gcc
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11225,7 +11348,7 @@ clean-stageprofile: clean-stageprofile-gcc
 clean-stageprofile-gcc:
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-gcc/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/gcc && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -11242,7 +11365,7 @@ maybe-all-stagefeedback-gcc: all-stagefeedback-gcc
 all-stagefeedback: all-stagefeedback-gcc
 TARGET-stagefeedback-gcc = $(TARGET-gcc)
 all-stagefeedback-gcc: configure-stagefeedback-gcc
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11256,7 +11379,7 @@ clean-stagefeedback: clean-stagefeedback-gcc
 clean-stagefeedback-gcc:
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-gcc/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/gcc && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -11552,12 +11675,12 @@ maintainer-clean-gcc:
 maybe-configure-gawk:
 @if gawk
 maybe-configure-gawk: configure-gawk
-configure-gawk:
+configure-gawk: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/gawk/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gawk ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/gawk/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gawk ; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/gawk; \
 	cd "$(HOST_SUBDIR)/gawk" || exit 1; \
@@ -11889,12 +12012,12 @@ maintainer-clean-gawk:
 maybe-configure-gettext:
 @if gettext
 maybe-configure-gettext: configure-gettext
-configure-gettext:
+configure-gettext: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -12226,12 +12349,12 @@ maintainer-clean-gettext:
 maybe-configure-gnuserv:
 @if gnuserv
 maybe-configure-gnuserv: configure-gnuserv
-configure-gnuserv:
+configure-gnuserv: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/gnuserv/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnuserv ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/gnuserv/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnuserv ; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/gnuserv; \
 	cd "$(HOST_SUBDIR)/gnuserv" || exit 1; \
@@ -12563,12 +12686,12 @@ maintainer-clean-gnuserv:
 maybe-configure-gprof:
 @if gprof
 maybe-configure-gprof: configure-gprof
-configure-gprof:
+configure-gprof: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof ; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/gprof; \
 	cd "$(HOST_SUBDIR)/gprof" || exit 1; \
@@ -12900,12 +13023,12 @@ maintainer-clean-gprof:
 maybe-configure-gzip:
 @if gzip
 maybe-configure-gzip: configure-gzip
-configure-gzip:
+configure-gzip: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/gzip/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gzip ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/gzip/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gzip ; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/gzip; \
 	cd "$(HOST_SUBDIR)/gzip" || exit 1; \
@@ -13237,12 +13360,12 @@ maintainer-clean-gzip:
 maybe-configure-hello:
 @if hello
 maybe-configure-hello: configure-hello
-configure-hello:
+configure-hello: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/hello/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/hello ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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 ; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/hello; \
 	cd "$(HOST_SUBDIR)/hello" || exit 1; \
@@ -13574,12 +13697,12 @@ maintainer-clean-hello:
 maybe-configure-indent:
 @if indent
 maybe-configure-indent: configure-indent
-configure-indent:
+configure-indent: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/indent/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/indent ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/indent/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/indent ; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/indent; \
 	cd "$(HOST_SUBDIR)/indent" || exit 1; \
@@ -13911,12 +14034,16 @@ maintainer-clean-indent:
 maybe-configure-intl:
 @if intl
 maybe-configure-intl: configure-intl
-configure-intl:
-	@test -f stage_last && exit 0; \
+configure-intl: 
+@endif intl
+@if intl-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif intl-bootstrap
+@if intl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/intl; \
 	cd "$(HOST_SUBDIR)/intl" || exit 1; \
@@ -13939,8 +14066,10 @@ maybe-configure-stage1-intl:
 @if intl-bootstrap
 maybe-configure-stage1-intl: configure-stage1-intl
 configure-stage1-intl:
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \
@@ -13963,8 +14092,10 @@ maybe-configure-stage2-intl:
 @if intl-bootstrap
 maybe-configure-stage2-intl: configure-stage2-intl
 configure-stage2-intl:
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -13988,8 +14119,10 @@ maybe-configure-stage3-intl:
 @if intl-bootstrap
 maybe-configure-stage3-intl: configure-stage3-intl
 configure-stage3-intl:
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -14013,8 +14146,10 @@ maybe-configure-stage4-intl:
 @if intl-bootstrap
 maybe-configure-stage4-intl: configure-stage4-intl
 configure-stage4-intl:
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -14038,8 +14173,10 @@ maybe-configure-stageprofile-intl:
 @if intl-bootstrap
 maybe-configure-stageprofile-intl: configure-stageprofile-intl
 configure-stageprofile-intl:
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -14063,8 +14200,10 @@ maybe-configure-stagefeedback-intl:
 @if intl-bootstrap
 maybe-configure-stagefeedback-intl: configure-stagefeedback-intl
 configure-stagefeedback-intl:
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -14093,8 +14232,12 @@ maybe-all-intl:
 TARGET-intl=all
 maybe-all-intl: all-intl
 all-intl: configure-intl
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+@endif intl
+@if intl-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif intl-bootstrap
+@if intl
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/intl && \
@@ -14112,12 +14255,12 @@ maybe-all-stage1-intl: all-stage1-intl
 all-stage1: all-stage1-intl
 TARGET-stage1-intl = $(TARGET-intl)
 all-stage1-intl: configure-stage1-intl
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)"  \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
 		$(TARGET-stage1-intl)
 
 maybe-clean-stage1-intl: clean-stage1-intl
@@ -14125,10 +14268,10 @@ clean-stage1: clean-stage1-intl
 clean-stage1-intl:
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-intl/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/intl && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)"  clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif intl-bootstrap
 
 
@@ -14141,7 +14284,7 @@ maybe-all-stage2-intl: all-stage2-intl
 all-stage2: all-stage2-intl
 TARGET-stage2-intl = $(TARGET-intl)
 all-stage2-intl: configure-stage2-intl
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14155,7 +14298,7 @@ clean-stage2: clean-stage2-intl
 clean-stage2-intl:
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-intl/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/intl && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -14172,7 +14315,7 @@ maybe-all-stage3-intl: all-stage3-intl
 all-stage3: all-stage3-intl
 TARGET-stage3-intl = $(TARGET-intl)
 all-stage3-intl: configure-stage3-intl
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14186,7 +14329,7 @@ clean-stage3: clean-stage3-intl
 clean-stage3-intl:
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-intl/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/intl && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -14203,7 +14346,7 @@ maybe-all-stage4-intl: all-stage4-intl
 all-stage4: all-stage4-intl
 TARGET-stage4-intl = $(TARGET-intl)
 all-stage4-intl: configure-stage4-intl
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14217,7 +14360,7 @@ clean-stage4: clean-stage4-intl
 clean-stage4-intl:
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-intl/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/intl && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -14234,7 +14377,7 @@ maybe-all-stageprofile-intl: all-stageprofile-intl
 all-stageprofile: all-stageprofile-intl
 TARGET-stageprofile-intl = $(TARGET-intl)
 all-stageprofile-intl: configure-stageprofile-intl
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14248,7 +14391,7 @@ clean-stageprofile: clean-stageprofile-intl
 clean-stageprofile-intl:
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-intl/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/intl && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -14265,7 +14408,7 @@ maybe-all-stagefeedback-intl: all-stagefeedback-intl
 all-stagefeedback: all-stagefeedback-intl
 TARGET-stagefeedback-intl = $(TARGET-intl)
 all-stagefeedback-intl: configure-stagefeedback-intl
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14279,7 +14422,7 @@ clean-stagefeedback: clean-stagefeedback-intl
 clean-stagefeedback-intl:
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-intl/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/intl && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -14575,12 +14718,12 @@ maintainer-clean-intl:
 maybe-configure-tcl:
 @if tcl
 maybe-configure-tcl: configure-tcl
-configure-tcl:
+configure-tcl: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/tcl/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tcl ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/tcl/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tcl ; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/tcl; \
 	cd "$(HOST_SUBDIR)/tcl" || exit 1; \
@@ -14897,12 +15040,12 @@ maintainer-clean-tcl:
 maybe-configure-itcl:
 @if itcl
 maybe-configure-itcl: configure-itcl
-configure-itcl:
+configure-itcl: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/itcl/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/itcl ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -15234,12 +15377,16 @@ maintainer-clean-itcl:
 maybe-configure-ld:
 @if ld
 maybe-configure-ld: configure-ld
-configure-ld:
-	@test -f stage_last && exit 0; \
+configure-ld: 
+@endif ld
+@if ld-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif ld-bootstrap
+@if ld
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/ld; \
 	cd "$(HOST_SUBDIR)/ld" || exit 1; \
@@ -15262,8 +15409,10 @@ maybe-configure-stage1-ld:
 @if ld-bootstrap
 maybe-configure-stage1-ld: configure-stage1-ld
 configure-stage1-ld:
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/ld ; \
@@ -15286,8 +15435,10 @@ maybe-configure-stage2-ld:
 @if ld-bootstrap
 maybe-configure-stage2-ld: configure-stage2-ld
 configure-stage2-ld:
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -15311,8 +15462,10 @@ maybe-configure-stage3-ld:
 @if ld-bootstrap
 maybe-configure-stage3-ld: configure-stage3-ld
 configure-stage3-ld:
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -15336,8 +15489,10 @@ maybe-configure-stage4-ld:
 @if ld-bootstrap
 maybe-configure-stage4-ld: configure-stage4-ld
 configure-stage4-ld:
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -15361,8 +15516,10 @@ maybe-configure-stageprofile-ld:
 @if ld-bootstrap
 maybe-configure-stageprofile-ld: configure-stageprofile-ld
 configure-stageprofile-ld:
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -15386,8 +15543,10 @@ maybe-configure-stagefeedback-ld:
 @if ld-bootstrap
 maybe-configure-stagefeedback-ld: configure-stagefeedback-ld
 configure-stagefeedback-ld:
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -15416,8 +15575,12 @@ maybe-all-ld:
 TARGET-ld=all
 maybe-all-ld: all-ld
 all-ld: configure-ld
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+@endif ld
+@if ld-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif ld-bootstrap
+@if ld
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/ld && \
@@ -15435,12 +15598,12 @@ maybe-all-stage1-ld: all-stage1-ld
 all-stage1: all-stage1-ld
 TARGET-stage1-ld = $(TARGET-ld)
 all-stage1-ld: configure-stage1-ld
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)"  \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
 		$(TARGET-stage1-ld)
 
 maybe-clean-stage1-ld: clean-stage1-ld
@@ -15448,10 +15611,10 @@ clean-stage1: clean-stage1-ld
 clean-stage1-ld:
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-ld/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/ld && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)"  clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif ld-bootstrap
 
 
@@ -15464,7 +15627,7 @@ maybe-all-stage2-ld: all-stage2-ld
 all-stage2: all-stage2-ld
 TARGET-stage2-ld = $(TARGET-ld)
 all-stage2-ld: configure-stage2-ld
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -15478,7 +15641,7 @@ clean-stage2: clean-stage2-ld
 clean-stage2-ld:
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-ld/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/ld && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -15495,7 +15658,7 @@ maybe-all-stage3-ld: all-stage3-ld
 all-stage3: all-stage3-ld
 TARGET-stage3-ld = $(TARGET-ld)
 all-stage3-ld: configure-stage3-ld
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -15509,7 +15672,7 @@ clean-stage3: clean-stage3-ld
 clean-stage3-ld:
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-ld/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/ld && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -15526,7 +15689,7 @@ maybe-all-stage4-ld: all-stage4-ld
 all-stage4: all-stage4-ld
 TARGET-stage4-ld = $(TARGET-ld)
 all-stage4-ld: configure-stage4-ld
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -15540,7 +15703,7 @@ clean-stage4: clean-stage4-ld
 clean-stage4-ld:
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-ld/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/ld && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -15557,7 +15720,7 @@ maybe-all-stageprofile-ld: all-stageprofile-ld
 all-stageprofile: all-stageprofile-ld
 TARGET-stageprofile-ld = $(TARGET-ld)
 all-stageprofile-ld: configure-stageprofile-ld
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -15571,7 +15734,7 @@ clean-stageprofile: clean-stageprofile-ld
 clean-stageprofile-ld:
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-ld/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/ld && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -15588,7 +15751,7 @@ maybe-all-stagefeedback-ld: all-stagefeedback-ld
 all-stagefeedback: all-stagefeedback-ld
 TARGET-stagefeedback-ld = $(TARGET-ld)
 all-stagefeedback-ld: configure-stagefeedback-ld
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -15602,7 +15765,7 @@ clean-stagefeedback: clean-stagefeedback-ld
 clean-stagefeedback-ld:
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-ld/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/ld && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -15898,12 +16061,16 @@ maintainer-clean-ld:
 maybe-configure-libcpp:
 @if libcpp
 maybe-configure-libcpp: configure-libcpp
-configure-libcpp:
-	@test -f stage_last && exit 0; \
+configure-libcpp: 
+@endif libcpp
+@if libcpp-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif libcpp-bootstrap
+@if libcpp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/libcpp; \
 	cd "$(HOST_SUBDIR)/libcpp" || exit 1; \
@@ -15926,8 +16093,10 @@ maybe-configure-stage1-libcpp:
 @if libcpp-bootstrap
 maybe-configure-stage1-libcpp: configure-stage1-libcpp
 configure-stage1-libcpp:
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \
@@ -15950,8 +16119,10 @@ maybe-configure-stage2-libcpp:
 @if libcpp-bootstrap
 maybe-configure-stage2-libcpp: configure-stage2-libcpp
 configure-stage2-libcpp:
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -15975,8 +16146,10 @@ maybe-configure-stage3-libcpp:
 @if libcpp-bootstrap
 maybe-configure-stage3-libcpp: configure-stage3-libcpp
 configure-stage3-libcpp:
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -16000,8 +16173,10 @@ maybe-configure-stage4-libcpp:
 @if libcpp-bootstrap
 maybe-configure-stage4-libcpp: configure-stage4-libcpp
 configure-stage4-libcpp:
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -16025,8 +16200,10 @@ maybe-configure-stageprofile-libcpp:
 @if libcpp-bootstrap
 maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp
 configure-stageprofile-libcpp:
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -16050,8 +16227,10 @@ maybe-configure-stagefeedback-libcpp:
 @if libcpp-bootstrap
 maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp
 configure-stagefeedback-libcpp:
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -16080,8 +16259,12 @@ maybe-all-libcpp:
 TARGET-libcpp=all
 maybe-all-libcpp: all-libcpp
 all-libcpp: configure-libcpp
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+@endif libcpp
+@if libcpp-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif libcpp-bootstrap
+@if libcpp
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/libcpp && \
@@ -16099,12 +16282,12 @@ maybe-all-stage1-libcpp: all-stage1-libcpp
 all-stage1: all-stage1-libcpp
 TARGET-stage1-libcpp = $(TARGET-libcpp)
 all-stage1-libcpp: configure-stage1-libcpp
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)"  \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
 		$(TARGET-stage1-libcpp)
 
 maybe-clean-stage1-libcpp: clean-stage1-libcpp
@@ -16112,10 +16295,10 @@ clean-stage1: clean-stage1-libcpp
 clean-stage1-libcpp:
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libcpp/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)"  clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif libcpp-bootstrap
 
 
@@ -16128,7 +16311,7 @@ maybe-all-stage2-libcpp: all-stage2-libcpp
 all-stage2: all-stage2-libcpp
 TARGET-stage2-libcpp = $(TARGET-libcpp)
 all-stage2-libcpp: configure-stage2-libcpp
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16142,7 +16325,7 @@ clean-stage2: clean-stage2-libcpp
 clean-stage2-libcpp:
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libcpp/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16159,7 +16342,7 @@ maybe-all-stage3-libcpp: all-stage3-libcpp
 all-stage3: all-stage3-libcpp
 TARGET-stage3-libcpp = $(TARGET-libcpp)
 all-stage3-libcpp: configure-stage3-libcpp
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16173,7 +16356,7 @@ clean-stage3: clean-stage3-libcpp
 clean-stage3-libcpp:
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libcpp/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16190,7 +16373,7 @@ maybe-all-stage4-libcpp: all-stage4-libcpp
 all-stage4: all-stage4-libcpp
 TARGET-stage4-libcpp = $(TARGET-libcpp)
 all-stage4-libcpp: configure-stage4-libcpp
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16204,7 +16387,7 @@ clean-stage4: clean-stage4-libcpp
 clean-stage4-libcpp:
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libcpp/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16221,7 +16404,7 @@ maybe-all-stageprofile-libcpp: all-stageprofile-libcpp
 all-stageprofile: all-stageprofile-libcpp
 TARGET-stageprofile-libcpp = $(TARGET-libcpp)
 all-stageprofile-libcpp: configure-stageprofile-libcpp
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16235,7 +16418,7 @@ clean-stageprofile: clean-stageprofile-libcpp
 clean-stageprofile-libcpp:
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libcpp/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16252,7 +16435,7 @@ maybe-all-stagefeedback-libcpp: all-stagefeedback-libcpp
 all-stagefeedback: all-stagefeedback-libcpp
 TARGET-stagefeedback-libcpp = $(TARGET-libcpp)
 all-stagefeedback-libcpp: configure-stagefeedback-libcpp
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16266,7 +16449,7 @@ clean-stagefeedback: clean-stagefeedback-libcpp
 clean-stagefeedback-libcpp:
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libcpp/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16562,12 +16745,16 @@ maintainer-clean-libcpp:
 maybe-configure-libdecnumber:
 @if libdecnumber
 maybe-configure-libdecnumber: configure-libdecnumber
-configure-libdecnumber:
-	@test -f stage_last && exit 0; \
+configure-libdecnumber: 
+@endif libdecnumber
+@if libdecnumber-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif libdecnumber-bootstrap
+@if libdecnumber
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/libdecnumber; \
 	cd "$(HOST_SUBDIR)/libdecnumber" || exit 1; \
@@ -16590,8 +16777,10 @@ maybe-configure-stage1-libdecnumber:
 @if libdecnumber-bootstrap
 maybe-configure-stage1-libdecnumber: configure-stage1-libdecnumber
 configure-stage1-libdecnumber:
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber ; \
@@ -16614,8 +16803,10 @@ maybe-configure-stage2-libdecnumber:
 @if libdecnumber-bootstrap
 maybe-configure-stage2-libdecnumber: configure-stage2-libdecnumber
 configure-stage2-libdecnumber:
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -16639,8 +16830,10 @@ maybe-configure-stage3-libdecnumber:
 @if libdecnumber-bootstrap
 maybe-configure-stage3-libdecnumber: configure-stage3-libdecnumber
 configure-stage3-libdecnumber:
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -16664,8 +16857,10 @@ maybe-configure-stage4-libdecnumber:
 @if libdecnumber-bootstrap
 maybe-configure-stage4-libdecnumber: configure-stage4-libdecnumber
 configure-stage4-libdecnumber:
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -16689,8 +16884,10 @@ maybe-configure-stageprofile-libdecnumber:
 @if libdecnumber-bootstrap
 maybe-configure-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
 configure-stageprofile-libdecnumber:
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -16714,8 +16911,10 @@ maybe-configure-stagefeedback-libdecnumber:
 @if libdecnumber-bootstrap
 maybe-configure-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
 configure-stagefeedback-libdecnumber:
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -16744,8 +16943,12 @@ maybe-all-libdecnumber:
 TARGET-libdecnumber=all
 maybe-all-libdecnumber: all-libdecnumber
 all-libdecnumber: configure-libdecnumber
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+@endif libdecnumber
+@if libdecnumber-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif libdecnumber-bootstrap
+@if libdecnumber
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/libdecnumber && \
@@ -16763,12 +16966,12 @@ maybe-all-stage1-libdecnumber: all-stage1-libdecnumber
 all-stage1: all-stage1-libdecnumber
 TARGET-stage1-libdecnumber = $(TARGET-libdecnumber)
 all-stage1-libdecnumber: configure-stage1-libdecnumber
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)"  \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
 		$(TARGET-stage1-libdecnumber)
 
 maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber
@@ -16776,10 +16979,10 @@ clean-stage1: clean-stage1-libdecnumber
 clean-stage1-libdecnumber:
 	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libdecnumber/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/libdecnumber && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)"  clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif libdecnumber-bootstrap
 
 
@@ -16792,7 +16995,7 @@ maybe-all-stage2-libdecnumber: all-stage2-libdecnumber
 all-stage2: all-stage2-libdecnumber
 TARGET-stage2-libdecnumber = $(TARGET-libdecnumber)
 all-stage2-libdecnumber: configure-stage2-libdecnumber
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16806,7 +17009,7 @@ clean-stage2: clean-stage2-libdecnumber
 clean-stage2-libdecnumber:
 	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libdecnumber/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/libdecnumber && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16823,7 +17026,7 @@ maybe-all-stage3-libdecnumber: all-stage3-libdecnumber
 all-stage3: all-stage3-libdecnumber
 TARGET-stage3-libdecnumber = $(TARGET-libdecnumber)
 all-stage3-libdecnumber: configure-stage3-libdecnumber
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16837,7 +17040,7 @@ clean-stage3: clean-stage3-libdecnumber
 clean-stage3-libdecnumber:
 	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libdecnumber/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/libdecnumber && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16854,7 +17057,7 @@ maybe-all-stage4-libdecnumber: all-stage4-libdecnumber
 all-stage4: all-stage4-libdecnumber
 TARGET-stage4-libdecnumber = $(TARGET-libdecnumber)
 all-stage4-libdecnumber: configure-stage4-libdecnumber
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16868,7 +17071,7 @@ clean-stage4: clean-stage4-libdecnumber
 clean-stage4-libdecnumber:
 	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libdecnumber/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/libdecnumber && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16885,7 +17088,7 @@ maybe-all-stageprofile-libdecnumber: all-stageprofile-libdecnumber
 all-stageprofile: all-stageprofile-libdecnumber
 TARGET-stageprofile-libdecnumber = $(TARGET-libdecnumber)
 all-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16899,7 +17102,7 @@ clean-stageprofile: clean-stageprofile-libdecnumber
 clean-stageprofile-libdecnumber:
 	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libdecnumber/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/libdecnumber && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16916,7 +17119,7 @@ maybe-all-stagefeedback-libdecnumber: all-stagefeedback-libdecnumber
 all-stagefeedback: all-stagefeedback-libdecnumber
 TARGET-stagefeedback-libdecnumber = $(TARGET-libdecnumber)
 all-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16930,7 +17133,7 @@ clean-stagefeedback: clean-stagefeedback-libdecnumber
 clean-stagefeedback-libdecnumber:
 	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libdecnumber/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/libdecnumber && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -17226,12 +17429,12 @@ maintainer-clean-libdecnumber:
 maybe-configure-libgui:
 @if libgui
 maybe-configure-libgui: configure-libgui
-configure-libgui:
+configure-libgui: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/libgui/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/libgui/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui ; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/libgui; \
 	cd "$(HOST_SUBDIR)/libgui" || exit 1; \
@@ -17563,12 +17766,16 @@ maintainer-clean-libgui:
 maybe-configure-libiberty:
 @if libiberty
 maybe-configure-libiberty: configure-libiberty
-configure-libiberty:
-	@test -f stage_last && exit 0; \
+configure-libiberty: 
+@endif libiberty
+@if libiberty-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif libiberty-bootstrap
+@if libiberty
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/libiberty; \
 	cd "$(HOST_SUBDIR)/libiberty" || exit 1; \
@@ -17591,8 +17798,10 @@ maybe-configure-stage1-libiberty:
 @if libiberty-bootstrap
 maybe-configure-stage1-libiberty: configure-stage1-libiberty
 configure-stage1-libiberty:
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \
@@ -17615,8 +17824,10 @@ maybe-configure-stage2-libiberty:
 @if libiberty-bootstrap
 maybe-configure-stage2-libiberty: configure-stage2-libiberty
 configure-stage2-libiberty:
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -17640,8 +17851,10 @@ maybe-configure-stage3-libiberty:
 @if libiberty-bootstrap
 maybe-configure-stage3-libiberty: configure-stage3-libiberty
 configure-stage3-libiberty:
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -17665,8 +17878,10 @@ maybe-configure-stage4-libiberty:
 @if libiberty-bootstrap
 maybe-configure-stage4-libiberty: configure-stage4-libiberty
 configure-stage4-libiberty:
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -17690,8 +17905,10 @@ maybe-configure-stageprofile-libiberty:
 @if libiberty-bootstrap
 maybe-configure-stageprofile-libiberty: configure-stageprofile-libiberty
 configure-stageprofile-libiberty:
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -17715,8 +17932,10 @@ maybe-configure-stagefeedback-libiberty:
 @if libiberty-bootstrap
 maybe-configure-stagefeedback-libiberty: configure-stagefeedback-libiberty
 configure-stagefeedback-libiberty:
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -17745,8 +17964,12 @@ maybe-all-libiberty:
 TARGET-libiberty=all
 maybe-all-libiberty: all-libiberty
 all-libiberty: configure-libiberty
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+@endif libiberty
+@if libiberty-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif libiberty-bootstrap
+@if libiberty
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/libiberty && \
@@ -17764,12 +17987,12 @@ maybe-all-stage1-libiberty: all-stage1-libiberty
 all-stage1: all-stage1-libiberty
 TARGET-stage1-libiberty = $(TARGET-libiberty)
 all-stage1-libiberty: configure-stage1-libiberty
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)"  \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
 		$(TARGET-stage1-libiberty)
 
 maybe-clean-stage1-libiberty: clean-stage1-libiberty
@@ -17777,10 +18000,10 @@ clean-stage1: clean-stage1-libiberty
 clean-stage1-libiberty:
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libiberty/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)"  clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif libiberty-bootstrap
 
 
@@ -17793,7 +18016,7 @@ maybe-all-stage2-libiberty: all-stage2-libiberty
 all-stage2: all-stage2-libiberty
 TARGET-stage2-libiberty = $(TARGET-libiberty)
 all-stage2-libiberty: configure-stage2-libiberty
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17807,7 +18030,7 @@ clean-stage2: clean-stage2-libiberty
 clean-stage2-libiberty:
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libiberty/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -17824,7 +18047,7 @@ maybe-all-stage3-libiberty: all-stage3-libiberty
 all-stage3: all-stage3-libiberty
 TARGET-stage3-libiberty = $(TARGET-libiberty)
 all-stage3-libiberty: configure-stage3-libiberty
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17838,7 +18061,7 @@ clean-stage3: clean-stage3-libiberty
 clean-stage3-libiberty:
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libiberty/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -17855,7 +18078,7 @@ maybe-all-stage4-libiberty: all-stage4-libiberty
 all-stage4: all-stage4-libiberty
 TARGET-stage4-libiberty = $(TARGET-libiberty)
 all-stage4-libiberty: configure-stage4-libiberty
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17869,7 +18092,7 @@ clean-stage4: clean-stage4-libiberty
 clean-stage4-libiberty:
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libiberty/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -17886,7 +18109,7 @@ maybe-all-stageprofile-libiberty: all-stageprofile-libiberty
 all-stageprofile: all-stageprofile-libiberty
 TARGET-stageprofile-libiberty = $(TARGET-libiberty)
 all-stageprofile-libiberty: configure-stageprofile-libiberty
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17900,7 +18123,7 @@ clean-stageprofile: clean-stageprofile-libiberty
 clean-stageprofile-libiberty:
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libiberty/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -17917,7 +18140,7 @@ maybe-all-stagefeedback-libiberty: all-stagefeedback-libiberty
 all-stagefeedback: all-stagefeedback-libiberty
 TARGET-stagefeedback-libiberty = $(TARGET-libiberty)
 all-stagefeedback-libiberty: configure-stagefeedback-libiberty
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17931,7 +18154,7 @@ clean-stagefeedback: clean-stagefeedback-libiberty
 clean-stagefeedback-libiberty:
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libiberty/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -18227,12 +18450,12 @@ maintainer-clean-libiberty:
 maybe-configure-libtool:
 @if libtool
 maybe-configure-libtool: configure-libtool
-configure-libtool:
+configure-libtool: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/libtool/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtool ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/libtool/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtool ; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/libtool; \
 	cd "$(HOST_SUBDIR)/libtool" || exit 1; \
@@ -18564,12 +18787,12 @@ maintainer-clean-libtool:
 maybe-configure-m4:
 @if m4
 maybe-configure-m4: configure-m4
-configure-m4:
+configure-m4: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/m4/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/m4 ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	test ! -f $(HOST_SUBDIR)/m4/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/m4 ; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/m4; \
 	cd "$(HOST_SUBDIR)/m4" || exit 1; \
@@ -18901,12 +19124,12 @@ maintainer-clean-m4:
 maybe-configure-make:
 @if make
 maybe-configure-make: configure-make
-configure-make:
+configure-make: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/make/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/make ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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 ; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/make; \
 	cd "$(HOST_SUBDIR)/make" || exit 1; \
@@ -19238,12 +19461,12 @@ maintainer-clean-make:
 maybe-configure-mmalloc:
 @if mmalloc
 maybe-configure-mmalloc: configure-mmalloc
-configure-mmalloc:
+configure-mmalloc: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/mmalloc/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mmalloc ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -19569,12 +19792,12 @@ maintainer-clean-mmalloc:
 maybe-configure-patch:
 @if patch
 maybe-configure-patch: configure-patch
-configure-patch:
+configure-patch: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/patch/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/patch ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -19906,12 +20129,12 @@ maintainer-clean-patch:
 maybe-configure-perl:
 @if perl
 maybe-configure-perl: configure-perl
-configure-perl:
+configure-perl: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/perl/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/perl ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -20243,12 +20466,12 @@ maintainer-clean-perl:
 maybe-configure-prms:
 @if prms
 maybe-configure-prms: configure-prms
-configure-prms:
+configure-prms: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/prms/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/prms ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -20580,12 +20803,12 @@ maintainer-clean-prms:
 maybe-configure-rcs:
 @if rcs
 maybe-configure-rcs: configure-rcs
-configure-rcs:
+configure-rcs: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/rcs/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/rcs ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -20917,12 +21140,12 @@ maintainer-clean-rcs:
 maybe-configure-readline:
 @if readline
 maybe-configure-readline: configure-readline
-configure-readline:
+configure-readline: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/readline/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/readline ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -21254,12 +21477,12 @@ maintainer-clean-readline:
 maybe-configure-release:
 @if release
 maybe-configure-release: configure-release
-configure-release:
+configure-release: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/release/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/release ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -21579,12 +21802,12 @@ maintainer-clean-release:
 maybe-configure-recode:
 @if recode
 maybe-configure-recode: configure-recode
-configure-recode:
+configure-recode: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/recode/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/recode ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -21916,12 +22139,12 @@ maintainer-clean-recode:
 maybe-configure-sed:
 @if sed
 maybe-configure-sed: configure-sed
-configure-sed:
+configure-sed: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/sed/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sed ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -22253,12 +22476,12 @@ maintainer-clean-sed:
 maybe-configure-send-pr:
 @if send-pr
 maybe-configure-send-pr: configure-send-pr
-configure-send-pr:
+configure-send-pr: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/send-pr/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/send-pr ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -22590,12 +22813,12 @@ maintainer-clean-send-pr:
 maybe-configure-shellutils:
 @if shellutils
 maybe-configure-shellutils: configure-shellutils
-configure-shellutils:
+configure-shellutils: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/shellutils/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/shellutils ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -22927,12 +23150,12 @@ maintainer-clean-shellutils:
 maybe-configure-sid:
 @if sid
 maybe-configure-sid: configure-sid
-configure-sid:
+configure-sid: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/sid/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sid ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -23264,12 +23487,12 @@ maintainer-clean-sid:
 maybe-configure-sim:
 @if sim
 maybe-configure-sim: configure-sim
-configure-sim:
+configure-sim: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/sim/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sim ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -23601,12 +23824,12 @@ maintainer-clean-sim:
 maybe-configure-tar:
 @if tar
 maybe-configure-tar: configure-tar
-configure-tar:
+configure-tar: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/tar/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tar ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -23938,12 +24161,12 @@ maintainer-clean-tar:
 maybe-configure-texinfo:
 @if texinfo
 maybe-configure-texinfo: configure-texinfo
-configure-texinfo:
+configure-texinfo: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/texinfo/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/texinfo ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -24269,12 +24492,12 @@ maintainer-clean-texinfo:
 maybe-configure-textutils:
 @if textutils
 maybe-configure-textutils: configure-textutils
-configure-textutils:
+configure-textutils: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/textutils/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/textutils ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -24606,12 +24829,12 @@ maintainer-clean-textutils:
 maybe-configure-time:
 @if time
 maybe-configure-time: configure-time
-configure-time:
+configure-time: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/time/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/time ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -24943,12 +25166,12 @@ maintainer-clean-time:
 maybe-configure-uudecode:
 @if uudecode
 maybe-configure-uudecode: configure-uudecode
-configure-uudecode:
+configure-uudecode: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/uudecode/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/uudecode ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -25280,12 +25503,12 @@ maintainer-clean-uudecode:
 maybe-configure-wdiff:
 @if wdiff
 maybe-configure-wdiff: configure-wdiff
-configure-wdiff:
+configure-wdiff: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/wdiff/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/wdiff ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -25617,12 +25840,12 @@ maintainer-clean-wdiff:
 maybe-configure-zip:
 @if zip
 maybe-configure-zip: configure-zip
-configure-zip:
+configure-zip: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/zip/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zip ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -25957,12 +26180,16 @@ maintainer-clean-zip:
 maybe-configure-zlib:
 @if zlib
 maybe-configure-zlib: configure-zlib
-configure-zlib:
-	@test -f stage_last && exit 0; \
+configure-zlib: 
+@endif zlib
+@if zlib-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif zlib-bootstrap
+@if 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 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/zlib; \
 	cd "$(HOST_SUBDIR)/zlib" || exit 1; \
@@ -25985,8 +26212,10 @@ maybe-configure-stage1-zlib:
 @if zlib-bootstrap
 maybe-configure-stage1-zlib: configure-stage1-zlib
 configure-stage1-zlib:
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	echo Configuring stage 1 in $(HOST_SUBDIR)/zlib ; \
@@ -26009,8 +26238,10 @@ maybe-configure-stage2-zlib:
 @if zlib-bootstrap
 maybe-configure-stage2-zlib: configure-stage2-zlib
 configure-stage2-zlib:
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -26034,8 +26265,10 @@ maybe-configure-stage3-zlib:
 @if zlib-bootstrap
 maybe-configure-stage3-zlib: configure-stage3-zlib
 configure-stage3-zlib:
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -26059,8 +26292,10 @@ maybe-configure-stage4-zlib:
 @if zlib-bootstrap
 maybe-configure-stage4-zlib: configure-stage4-zlib
 configure-stage4-zlib:
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -26084,8 +26319,10 @@ maybe-configure-stageprofile-zlib:
 @if zlib-bootstrap
 maybe-configure-stageprofile-zlib: configure-stageprofile-zlib
 configure-stageprofile-zlib:
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -26109,8 +26346,10 @@ maybe-configure-stagefeedback-zlib:
 @if zlib-bootstrap
 maybe-configure-stagefeedback-zlib: configure-stagefeedback-zlib
 configure-stagefeedback-zlib:
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
 	$(HOST_EXPORTS) \
 	$(POSTSTAGE1_HOST_EXPORTS) \
@@ -26139,8 +26378,12 @@ maybe-all-zlib:
 TARGET-zlib=all
 maybe-all-zlib: all-zlib
 all-zlib: configure-zlib
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+@endif zlib
+@if zlib-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif zlib-bootstrap
+@if zlib
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/zlib && \
@@ -26158,12 +26401,12 @@ maybe-all-stage1-zlib: all-stage1-zlib
 all-stage1: all-stage1-zlib
 TARGET-stage1-zlib = $(TARGET-zlib)
 all-stage1-zlib: configure-stage1-zlib
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)"  \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
 		$(TARGET-stage1-zlib)
 
 maybe-clean-stage1-zlib: clean-stage1-zlib
@@ -26171,10 +26414,10 @@ clean-stage1: clean-stage1-zlib
 clean-stage1-zlib:
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-zlib/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/zlib && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)"  clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif zlib-bootstrap
 
 
@@ -26187,7 +26430,7 @@ maybe-all-stage2-zlib: all-stage2-zlib
 all-stage2: all-stage2-zlib
 TARGET-stage2-zlib = $(TARGET-zlib)
 all-stage2-zlib: configure-stage2-zlib
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26201,7 +26444,7 @@ clean-stage2: clean-stage2-zlib
 clean-stage2-zlib:
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-zlib/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/zlib && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -26218,7 +26461,7 @@ maybe-all-stage3-zlib: all-stage3-zlib
 all-stage3: all-stage3-zlib
 TARGET-stage3-zlib = $(TARGET-zlib)
 all-stage3-zlib: configure-stage3-zlib
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26232,7 +26475,7 @@ clean-stage3: clean-stage3-zlib
 clean-stage3-zlib:
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-zlib/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/zlib && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -26249,7 +26492,7 @@ maybe-all-stage4-zlib: all-stage4-zlib
 all-stage4: all-stage4-zlib
 TARGET-stage4-zlib = $(TARGET-zlib)
 all-stage4-zlib: configure-stage4-zlib
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26263,7 +26506,7 @@ clean-stage4: clean-stage4-zlib
 clean-stage4-zlib:
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-zlib/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/zlib && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -26280,7 +26523,7 @@ maybe-all-stageprofile-zlib: all-stageprofile-zlib
 all-stageprofile: all-stageprofile-zlib
 TARGET-stageprofile-zlib = $(TARGET-zlib)
 all-stageprofile-zlib: configure-stageprofile-zlib
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26294,7 +26537,7 @@ clean-stageprofile: clean-stageprofile-zlib
 clean-stageprofile-zlib:
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-zlib/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/zlib && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -26311,7 +26554,7 @@ maybe-all-stagefeedback-zlib: all-stagefeedback-zlib
 all-stagefeedback: all-stagefeedback-zlib
 TARGET-stagefeedback-zlib = $(TARGET-zlib)
 all-stagefeedback-zlib: configure-stagefeedback-zlib
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26325,7 +26568,7 @@ clean-stagefeedback: clean-stagefeedback-zlib
 clean-stagefeedback-zlib:
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-zlib/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/zlib && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -26609,12 +26852,12 @@ maintainer-clean-zlib:
 maybe-configure-gdb:
 @if gdb
 maybe-configure-gdb: configure-gdb
-configure-gdb:
+configure-gdb: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/gdb/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdb ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -26946,12 +27189,12 @@ maintainer-clean-gdb:
 maybe-configure-expect:
 @if expect
 maybe-configure-expect: configure-expect
-configure-expect:
+configure-expect: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/expect/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/expect ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -27283,12 +27526,12 @@ maintainer-clean-expect:
 maybe-configure-guile:
 @if guile
 maybe-configure-guile: configure-guile
-configure-guile:
+configure-guile: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/guile/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/guile ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -27620,12 +27863,12 @@ maintainer-clean-guile:
 maybe-configure-tk:
 @if tk
 maybe-configure-tk: configure-tk
-configure-tk:
+configure-tk: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/tk/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tk ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -27957,12 +28200,12 @@ maintainer-clean-tk:
 maybe-configure-libtermcap:
 @if libtermcap
 maybe-configure-libtermcap: configure-libtermcap
-configure-libtermcap:
+configure-libtermcap: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/libtermcap/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtermcap ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -28228,12 +28471,12 @@ maintainer-clean-libtermcap:
 maybe-configure-utils:
 @if utils
 maybe-configure-utils: configure-utils
-configure-utils:
+configure-utils: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/utils/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/utils ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -28559,12 +28802,12 @@ maintainer-clean-utils:
 maybe-configure-gnattools:
 @if gnattools
 maybe-configure-gnattools: configure-gnattools
-configure-gnattools:
+configure-gnattools: 
 	@: $(MAKE); $(unstage)
-	@test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools ; \
-	r=`${PWD_COMMAND}`; export r; \
+	@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; \
@@ -28903,7 +29146,7 @@ maintainer-clean-gnattools:
 maybe-configure-target-libstdc++-v3:
 @if target-libstdc++-v3
 maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3
-configure-target-libstdc++-v3:
+configure-target-libstdc++-v3: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28919,11 +29162,9 @@ configure-target-libstdc++-v3:
 	  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; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
 	cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
@@ -29259,7 +29500,7 @@ maintainer-clean-target-libstdc++-v3:
 maybe-configure-target-libmudflap:
 @if target-libmudflap
 maybe-configure-target-libmudflap: configure-target-libmudflap
-configure-target-libmudflap:
+configure-target-libmudflap: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29275,11 +29516,9 @@ configure-target-libmudflap:
 	  fi; \
 	else \
 	  mv $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; \
-	fi
-	@test ! -f $(TARGET_SUBDIR)/libmudflap/Makefile || exit 0; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libmudflap/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libmudflap; \
 	cd "$(TARGET_SUBDIR)/libmudflap" || exit 1; \
@@ -29615,7 +29854,7 @@ maintainer-clean-target-libmudflap:
 maybe-configure-target-libssp:
 @if target-libssp
 maybe-configure-target-libssp: configure-target-libssp
-configure-target-libssp:
+configure-target-libssp: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29631,11 +29870,9 @@ configure-target-libssp:
 	  fi; \
 	else \
 	  mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \
-	fi
-	@test ! -f $(TARGET_SUBDIR)/libssp/Makefile || exit 0; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libssp/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libssp; \
 	cd "$(TARGET_SUBDIR)/libssp" || exit 1; \
@@ -29971,7 +30208,7 @@ maintainer-clean-target-libssp:
 maybe-configure-target-libgcc-math:
 @if target-libgcc-math
 maybe-configure-target-libgcc-math: configure-target-libgcc-math
-configure-target-libgcc-math:
+configure-target-libgcc-math: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29987,11 +30224,9 @@ configure-target-libgcc-math:
 	  fi; \
 	else \
 	  mv $(TARGET_SUBDIR)/libgcc-math/multilib.tmp $(TARGET_SUBDIR)/libgcc-math/multilib.out; \
-	fi
-	@test ! -f $(TARGET_SUBDIR)/libgcc-math/Makefile || exit 0; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libgcc-math/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc-math ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libgcc-math; \
 	cd "$(TARGET_SUBDIR)/libgcc-math" || exit 1; \
@@ -30327,7 +30562,7 @@ maintainer-clean-target-libgcc-math:
 maybe-configure-target-newlib:
 @if target-newlib
 maybe-configure-target-newlib: configure-target-newlib
-configure-target-newlib:
+configure-target-newlib: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30343,11 +30578,9 @@ configure-target-newlib:
 	  fi; \
 	else \
 	  mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \
-	fi
-	@test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/newlib; \
 	cd "$(TARGET_SUBDIR)/newlib" || exit 1; \
@@ -30683,7 +30916,7 @@ maintainer-clean-target-newlib:
 maybe-configure-target-libgfortran:
 @if target-libgfortran
 maybe-configure-target-libgfortran: configure-target-libgfortran
-configure-target-libgfortran:
+configure-target-libgfortran: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30699,11 +30932,9 @@ configure-target-libgfortran:
 	  fi; \
 	else \
 	  mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \
-	fi
-	@test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libgfortran; \
 	cd "$(TARGET_SUBDIR)/libgfortran" || exit 1; \
@@ -31039,7 +31270,7 @@ maintainer-clean-target-libgfortran:
 maybe-configure-target-libobjc:
 @if target-libobjc
 maybe-configure-target-libobjc: configure-target-libobjc
-configure-target-libobjc:
+configure-target-libobjc: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31055,11 +31286,9 @@ configure-target-libobjc:
 	  fi; \
 	else \
 	  mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \
-	fi
-	@test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libobjc; \
 	cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \
@@ -31395,7 +31624,7 @@ maintainer-clean-target-libobjc:
 maybe-configure-target-libtermcap:
 @if target-libtermcap
 maybe-configure-target-libtermcap: configure-target-libtermcap
-configure-target-libtermcap:
+configure-target-libtermcap: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31411,11 +31640,9 @@ configure-target-libtermcap:
 	  fi; \
 	else \
 	  mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
-	fi
-	@test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libtermcap; \
 	cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \
@@ -31686,7 +31913,7 @@ maintainer-clean-target-libtermcap:
 maybe-configure-target-winsup:
 @if target-winsup
 maybe-configure-target-winsup: configure-target-winsup
-configure-target-winsup:
+configure-target-winsup: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31702,11 +31929,9 @@ configure-target-winsup:
 	  fi; \
 	else \
 	  mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
-	fi
-	@test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/winsup; \
 	cd "$(TARGET_SUBDIR)/winsup" || exit 1; \
@@ -32042,7 +32267,7 @@ maintainer-clean-target-winsup:
 maybe-configure-target-libgloss:
 @if target-libgloss
 maybe-configure-target-libgloss: configure-target-libgloss
-configure-target-libgloss:
+configure-target-libgloss: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32058,11 +32283,9 @@ configure-target-libgloss:
 	  fi; \
 	else \
 	  mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
-	fi
-	@test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libgloss; \
 	cd "$(TARGET_SUBDIR)/libgloss" || exit 1; \
@@ -32393,7 +32616,7 @@ maintainer-clean-target-libgloss:
 maybe-configure-target-libiberty:
 @if target-libiberty
 maybe-configure-target-libiberty: configure-target-libiberty
-configure-target-libiberty:
+configure-target-libiberty: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32409,11 +32632,9 @@ configure-target-libiberty:
 	  fi; \
 	else \
 	  mv $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; \
-	fi
-	@test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libiberty; \
 	cd "$(TARGET_SUBDIR)/libiberty" || exit 1; \
@@ -32749,7 +32970,7 @@ maintainer-clean-target-libiberty:
 maybe-configure-target-gperf:
 @if target-gperf
 maybe-configure-target-gperf: configure-target-gperf
-configure-target-gperf:
+configure-target-gperf: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32765,11 +32986,9 @@ configure-target-gperf:
 	  fi; \
 	else \
 	  mv $(TARGET_SUBDIR)/gperf/multilib.tmp $(TARGET_SUBDIR)/gperf/multilib.out; \
-	fi
-	@test ! -f $(TARGET_SUBDIR)/gperf/Makefile || exit 0; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/gperf/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/gperf; \
 	cd "$(TARGET_SUBDIR)/gperf" || exit 1; \
@@ -33105,7 +33324,7 @@ maintainer-clean-target-gperf:
 maybe-configure-target-examples:
 @if target-examples
 maybe-configure-target-examples: configure-target-examples
-configure-target-examples:
+configure-target-examples: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33121,11 +33340,9 @@ configure-target-examples:
 	  fi; \
 	else \
 	  mv $(TARGET_SUBDIR)/examples/multilib.tmp $(TARGET_SUBDIR)/examples/multilib.out; \
-	fi
-	@test ! -f $(TARGET_SUBDIR)/examples/Makefile || exit 0; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/examples/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/examples; \
 	cd "$(TARGET_SUBDIR)/examples" || exit 1; \
@@ -33451,7 +33668,7 @@ maintainer-clean-target-examples:
 maybe-configure-target-libffi:
 @if target-libffi
 maybe-configure-target-libffi: configure-target-libffi
-configure-target-libffi:
+configure-target-libffi: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33467,11 +33684,9 @@ configure-target-libffi:
 	  fi; \
 	else \
 	  mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \
-	fi
-	@test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libffi; \
 	cd "$(TARGET_SUBDIR)/libffi" || exit 1; \
@@ -33807,7 +34022,7 @@ maintainer-clean-target-libffi:
 maybe-configure-target-libjava:
 @if target-libjava
 maybe-configure-target-libjava: configure-target-libjava
-configure-target-libjava:
+configure-target-libjava: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33823,11 +34038,9 @@ configure-target-libjava:
 	  fi; \
 	else \
 	  mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \
-	fi
-	@test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libjava; \
 	cd "$(TARGET_SUBDIR)/libjava" || exit 1; \
@@ -34163,7 +34376,7 @@ maintainer-clean-target-libjava:
 maybe-configure-target-zlib:
 @if target-zlib
 maybe-configure-target-zlib: configure-target-zlib
-configure-target-zlib:
+configure-target-zlib: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34179,11 +34392,9 @@ configure-target-zlib:
 	  fi; \
 	else \
 	  mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; \
-	fi
-	@test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/zlib; \
 	cd "$(TARGET_SUBDIR)/zlib" || exit 1; \
@@ -34519,7 +34730,7 @@ maintainer-clean-target-zlib:
 maybe-configure-target-boehm-gc:
 @if target-boehm-gc
 maybe-configure-target-boehm-gc: configure-target-boehm-gc
-configure-target-boehm-gc:
+configure-target-boehm-gc: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34535,11 +34746,9 @@ configure-target-boehm-gc:
 	  fi; \
 	else \
 	  mv $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; \
-	fi
-	@test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/boehm-gc; \
 	cd "$(TARGET_SUBDIR)/boehm-gc" || exit 1; \
@@ -34875,7 +35084,7 @@ maintainer-clean-target-boehm-gc:
 maybe-configure-target-qthreads:
 @if target-qthreads
 maybe-configure-target-qthreads: configure-target-qthreads
-configure-target-qthreads:
+configure-target-qthreads: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34891,11 +35100,9 @@ configure-target-qthreads:
 	  fi; \
 	else \
 	  mv $(TARGET_SUBDIR)/qthreads/multilib.tmp $(TARGET_SUBDIR)/qthreads/multilib.out; \
-	fi
-	@test ! -f $(TARGET_SUBDIR)/qthreads/Makefile || exit 0; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/qthreads/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/qthreads; \
 	cd "$(TARGET_SUBDIR)/qthreads" || exit 1; \
@@ -35231,7 +35438,7 @@ maintainer-clean-target-qthreads:
 maybe-configure-target-rda:
 @if target-rda
 maybe-configure-target-rda: configure-target-rda
-configure-target-rda:
+configure-target-rda: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35247,11 +35454,9 @@ configure-target-rda:
 	  fi; \
 	else \
 	  mv $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; \
-	fi
-	@test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/rda; \
 	cd "$(TARGET_SUBDIR)/rda" || exit 1; \
@@ -35587,7 +35792,7 @@ maintainer-clean-target-rda:
 maybe-configure-target-libada:
 @if target-libada
 maybe-configure-target-libada: configure-target-libada
-configure-target-libada:
+configure-target-libada: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35603,11 +35808,9 @@ configure-target-libada:
 	  fi; \
 	else \
 	  mv $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; \
-	fi
-	@test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libada; \
 	cd "$(TARGET_SUBDIR)/libada" || exit 1; \
@@ -35943,7 +36146,7 @@ maintainer-clean-target-libada:
 maybe-configure-target-libgomp:
 @if target-libgomp
 maybe-configure-target-libgomp: configure-target-libgomp
-configure-target-libgomp:
+configure-target-libgomp: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35959,11 +36162,9 @@ configure-target-libgomp:
 	  fi; \
 	else \
 	  mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
-	fi
-	@test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libgomp; \
 	cd "$(TARGET_SUBDIR)/libgomp" || exit 1; \
@@ -36418,10 +36619,12 @@ gcc-no-fixedincludes:
 
 unstage = :
 stage = :
+current_stage = ""
 
 @if gcc-bootstrap
 unstage = [ -f stage_current ] || $(MAKE) `cat stage_last`-start
 stage = if [ -f stage_current ]; then $(MAKE) `cat stage_current`-end || exit 1; else :; fi
+current_stage = "`cat stage_current 2> /dev/null`"
 @endif gcc-bootstrap
 
 .PHONY: unstage stage
@@ -36464,6 +36667,7 @@ POSTSTAGE1_FLAGS_TO_PASS = \
 	CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
 	STAGE_PREFIX=$$r/prev-gcc/ \
 	CFLAGS="$(BOOT_CFLAGS)" \
+	LIBCFLAGS="$(BOOT_CFLAGS)" \
 	LDFLAGS="$(BOOT_LDFLAGS)" \
 	ADAC="\$$(CC)"
 
@@ -37032,6 +37236,7 @@ compare:
 	fi; \
 	: $(MAKE); $(stage); \
 	rm -f .bad_compare ; \
+	echo Comparing stages 2 and 3 ; \
 	cd stage3-gcc; \
 	files=`find . -name "*$(objext)" -print` ; \
 	cd .. ; \
@@ -37052,7 +37257,7 @@ compare:
 	  cat .bad_compare; \
 	  exit 1; \
 	else \
-	  true; \
+	  echo Comparison successful.; \
 	fi ; \
 	$(STAMP) compare
 	if $(LEAN); then \
@@ -37284,6 +37489,7 @@ compare3:
 	fi; \
 	: $(MAKE); $(stage); \
 	rm -f .bad_compare ; \
+	echo Comparing stages 3 and 4 ; \
 	cd stage4-gcc; \
 	files=`find . -name "*$(objext)" -print` ; \
 	cd .. ; \
@@ -37304,7 +37510,7 @@ compare3:
 	  cat .bad_compare; \
 	  exit 1; \
 	else \
-	  true; \
+	  echo Comparison successful.; \
 	fi ; \
 	$(STAMP) compare3
 	if $(LEAN); then \
@@ -37756,55 +37962,71 @@ stagefeedback-start::
 
 @if gcc-bootstrap
 do-distclean: distclean-stage1
+
+# Provide a GCC build when we're building target libraries.  This does
+# not work as a dependency, just as the minimum necessary to avoid errors.
+stage_last:
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble
 @endif gcc-bootstrap
 
+.PHONY: restrap
+restrap:
+	@: $(MAKE); $(stage)
+	rm -rf stage1-$(TARGET_SUBDIR) stage2 stage3 stage4 stageprofile stagefeedback 
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
+
 # --------------------------------------
 # Dependencies between different modules
 # --------------------------------------
 
 # Generic dependencies for target modules on host stuff, especially gcc
+@if gcc-bootstrap
+configure-target-libstdc++-v3: stage_last
+configure-target-libmudflap: stage_last
+configure-target-libssp: stage_last
+configure-target-libgcc-math: stage_last
+configure-target-newlib: stage_last
+configure-target-libgfortran: stage_last
+configure-target-libobjc: stage_last
+configure-target-libtermcap: stage_last
+configure-target-winsup: stage_last
+configure-target-libgloss: stage_last
+configure-target-libiberty: stage_last
+configure-target-gperf: stage_last
+configure-target-examples: stage_last
+configure-target-libffi: stage_last
+configure-target-libjava: stage_last
+configure-target-zlib: stage_last
+configure-target-boehm-gc: stage_last
+configure-target-qthreads: stage_last
+configure-target-rda: stage_last
+configure-target-libada: stage_last
+configure-target-libgomp: stage_last
+@endif gcc-bootstrap
 
+@if gcc-no-bootstrap
 configure-target-libstdc++-v3: maybe-all-gcc
-
 configure-target-libmudflap: maybe-all-gcc
-
 configure-target-libssp: maybe-all-gcc
-
 configure-target-libgcc-math: maybe-all-gcc
-
 configure-target-newlib: maybe-all-gcc
-
 configure-target-libgfortran: maybe-all-gcc
-
 configure-target-libobjc: maybe-all-gcc
-
 configure-target-libtermcap: maybe-all-gcc
-
 configure-target-winsup: maybe-all-gcc
-
 configure-target-libgloss: maybe-all-gcc
-
 configure-target-libiberty: maybe-all-gcc
-
 configure-target-gperf: maybe-all-gcc
-
 configure-target-examples: maybe-all-gcc
-
 configure-target-libffi: maybe-all-gcc
-
 configure-target-libjava: maybe-all-gcc
-
 configure-target-zlib: maybe-all-gcc
-
 configure-target-boehm-gc: maybe-all-gcc
-
 configure-target-qthreads: maybe-all-gcc
-
 configure-target-rda: maybe-all-gcc
-
 configure-target-libada: maybe-all-gcc
-
 configure-target-libgomp: maybe-all-gcc
+@endif gcc-no-bootstrap
 
 
 
diff --git a/Makefile.tpl b/Makefile.tpl
index 7893e34..41c50c4 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -389,8 +389,9 @@ HOST_LIB_PATH_[+module+] = \
 [+ ENDIF lib_path +][+ ENDFOR host_modules +]
 
 # Flags to pass down to all sub-makes.
-BASE_FLAGS_TO_PASS = [+ FOR flags_to_pass +]\
-	"[+flag+]=$([+flag+])" [+ ENDFOR flags_to_pass +]\
+BASE_FLAGS_TO_PASS =[+ FOR flags_to_pass +][+ IF optional +] \
+	"`echo '[+flag+]=$([+flag+])' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"[+ ELSE optional +] \
+	"[+flag+]=$([+flag+])"[+ ENDIF optional+][+ ENDFOR flags_to_pass +] \
 	"CONFIG_SHELL=$(SHELL)" \
 	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 
 
@@ -457,16 +458,12 @@ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
 # The BUILD_* variables are a special case, which are used for the gcc
 # cross-building scheme.
 EXTRA_GCC_FLAGS = \
-	'BUILD_PREFIX=$(BUILD_PREFIX)' \
-	'BUILD_PREFIX_1=$(BUILD_PREFIX_1)' \
 	"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
-	"`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-	"`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-	"`echo 'BOOT_ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
+	"`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
 
 GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
 
@@ -500,20 +497,20 @@ all:
 	fi
 
 .PHONY: all-build
-all-build: [+
-  FOR build_modules +] \
-    maybe-all-build-[+module+][+
-  ENDFOR build_modules +]
+[+ FOR build_modules +]
+all-build: maybe-all-build-[+module+][+ ENDFOR build_modules +]
+
 .PHONY: all-host
-all-host: [+
-  FOR host_modules +] \
-    maybe-all-[+module+][+
-  ENDFOR host_modules +]
+[+ FOR host_modules +][+ IF bootstrap +]
+@if [+module+]-no-bootstrap[+ ENDIF bootstrap +]
+all-host: maybe-all-[+module+][+ IF bootstrap +]
+@endif [+module+]-no-bootstrap[+ ENDIF bootstrap +][+ ENDFOR host_modules +]
+
 .PHONY: all-target
-all-target: [+
-  FOR target_modules +] \
-    maybe-all-target-[+module+][+
-  ENDFOR target_modules +]
+[+ FOR target_modules +][+ IF bootstrap +]
+@if [+module+]-no-bootstrap[+ ENDIF bootstrap +]
+all-target: maybe-all-target-[+module+][+ IF bootstrap +]
+@endif [+module+]-no-bootstrap[+ ENDIF bootstrap +][+ ENDFOR target_modules +]
 
 # Do a target for all the subdirectories.  A ``make do-X'' will do a
 # ``make X'' in all subdirectories (because, in general, there is a
@@ -530,16 +527,12 @@ do-[+make_target+]:
 
 
 .PHONY: [+make_target+]-host
-[+make_target+]-host: [+
-  FOR host_modules +] \
-    maybe-[+make_target+]-[+module+][+
-  ENDFOR host_modules +]
+[+ FOR host_modules +]
+[+make_target+]-host: maybe-[+make_target+]-[+module+][+ ENDFOR host_modules +]
 
 .PHONY: [+make_target+]-target
-[+make_target+]-target: [+
-  FOR target_modules +] \
-    maybe-[+make_target+]-target-[+module+][+
-  ENDFOR target_modules +]
+[+ FOR target_modules +]
+[+make_target+]-target: maybe-[+make_target+]-target-[+module+][+ ENDFOR target_modules +]
 [+ ENDFOR recursive_targets +]
 
 # Here are the targets which correspond to the do-X targets.
@@ -729,13 +722,17 @@ TAGS: do-TAGS
 maybe-configure-[+prefix+][+module+]:
 @if [+prefix+][+module+]
 maybe-configure-[+prefix+][+module+]: configure-[+prefix+][+module+]
-configure-[+prefix+][+module+]:
-	@[+ IF bootstrap +]test -f stage_last && exit 0; \
-	[+ ELSE bootstrap +]: $(MAKE); $(unstage)
-	@[+ ENDIF bootstrap +][+ IF check_multilibs
-	+]r=`${PWD_COMMAND}`; export r; \
+configure-[+prefix+][+module+]: [+ IF bootstrap +]
+@endif [+prefix+][+module+]
+@if [+prefix+][+module+]-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif [+prefix+][+module+]-bootstrap
+@if [+prefix+][+module+][+ ELSE bootstrap +]
+	@: $(MAKE); $(unstage)[+ ENDIF bootstrap +]
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for [+module+]..."; \
+	[+ IF check_multilibs
+	+]echo "Checking multilib configuration for [+module+]..."; \
 	$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
 	$(CC_FOR_TARGET) --print-multi-lib > [+subdir+]/[+module+]/multilib.tmp 2> /dev/null ; \
 	if test -r [+subdir+]/[+module+]/multilib.out; then \
@@ -747,11 +744,9 @@ configure-[+prefix+][+module+]:
 	  fi; \
 	else \
 	  mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \
-	fi
-	@[+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
+	fi; \
+	[+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	[+exports+] \
 	echo Configuring in [+subdir+]/[+module+]; \
 	cd "[+subdir+]/[+module+]" || exit 1; \
@@ -775,12 +770,12 @@ maybe-configure-stage[+id+]-[+prefix+][+module+]:
 @if [+prefix+][+module+]-bootstrap
 maybe-configure-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+]
 configure-stage[+id+]-[+prefix+][+module+]:
-	@[ `cat stage_current` = stage[+id+] ] || $(MAKE) stage[+id+]-start
+	@[ $(current_stage) = stage[+id+] ] || $(MAKE) stage[+id+]-start
 	@$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+]
-	[+ IF check_multilibs
-	+]@r=`${PWD_COMMAND}`; export r; \
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for [+module+]..."; \
+	[+ IF check_multilibs
+	+]echo "Checking multilib configuration for [+module+]..."; \
 	$(CC_FOR_TARGET) --print-multi-lib > [+subdir+]/[+module+]/multilib.tmp 2> /dev/null ; \
 	if test -r [+subdir+]/[+module+]/multilib.out; then \
 	  if cmp -s [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; then \
@@ -791,8 +786,8 @@ configure-stage[+id+]-[+prefix+][+module+]:
 	  fi; \
 	else \
 	  mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \
-	fi
-	@[+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
+	fi; \
+	[+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
 	[+exports+][+ IF prev +] \
 	[+poststage1_exports+][+ ENDIF prev +] \
 	echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \
@@ -820,10 +815,14 @@ maybe-all-[+prefix+][+module+]:
 TARGET-[+prefix+][+module+]=[+
   IF target +][+target+][+ ELSE +]all[+ ENDIF target +]
 maybe-all-[+prefix+][+module+]: all-[+prefix+][+module+]
-all-[+prefix+][+module+]: configure-[+prefix+][+module+]
-	@[+ IF bootstrap +]test -f stage_last && exit 0; \
-	[+ ELSE bootstrap +]: $(MAKE); $(unstage)
-	@[+ ENDIF bootstrap +]r=`${PWD_COMMAND}`; export r; \
+all-[+prefix+][+module+]: configure-[+prefix+][+module+][+ IF bootstrap +]
+@endif [+prefix+][+module+]
+@if [+prefix+][+module+]-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+@endif [+prefix+][+module+]-bootstrap
+@if [+prefix+][+module+][+ ELSE bootstrap +]
+	@: $(MAKE); $(unstage)[+ ENDIF bootstrap +]
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	[+exports+] \
 	(cd [+subdir+]/[+module+] && \
@@ -841,7 +840,7 @@ maybe-all-stage[+id+]-[+prefix+][+module+]: all-stage[+id+]-[+prefix+][+module+]
 all-stage[+id+]: all-stage[+id+]-[+prefix+][+module+]
 TARGET-stage[+id+]-[+prefix+][+module+] = $(TARGET-[+prefix+][+module+])
 all-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+]
-	@[ `cat stage_current` = stage[+id+] ] || $(MAKE) stage[+id+]-start
+	@[ $(current_stage) = stage[+id+] ] || $(MAKE) stage[+id+]-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	[+exports+][+ IF prev +] \
@@ -857,7 +856,7 @@ clean-stage[+id+]: clean-stage[+id+]-[+prefix+][+module+]
 clean-stage[+id+]-[+prefix+][+module+]:
 	@[ -f [+subdir+]/[+module+]/Makefile ] || [ -f [+subdir+]/stage[+id+]-[+module+]/Makefile ] \
 	  || exit 0 ; \
-	[ `cat stage_current` = stage[+id+] ] || $(MAKE) stage[+id+]-start
+	[ $(current_stage) = stage[+id+] ] || $(MAKE) stage[+id+]-start; \
 	cd [+subdir+]/[+module+] && \
 	$(MAKE) [+args+] [+ IF prev +] \
 		[+poststage1_args+] [+ ENDIF prev +] \
@@ -1210,10 +1209,12 @@ gcc-no-fixedincludes:
 
 unstage = :
 stage = :
+current_stage = ""
 
 @if gcc-bootstrap
 unstage = [ -f stage_current ] || $(MAKE) `cat stage_last`-start
 stage = if [ -f stage_current ]; then $(MAKE) `cat stage_current`-end || exit 1; else :; fi
+current_stage = "`cat stage_current 2> /dev/null`"
 @endif gcc-bootstrap
 
 .PHONY: unstage stage
@@ -1256,6 +1257,7 @@ POSTSTAGE1_FLAGS_TO_PASS = \
 	CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
 	STAGE_PREFIX=$$r/prev-gcc/ \
 	CFLAGS="$(BOOT_CFLAGS)" \
+	LIBCFLAGS="$(BOOT_CFLAGS)" \
 	LDFLAGS="$(BOOT_LDFLAGS)" \
 	ADAC="\$$(CC)"
 
@@ -1337,6 +1339,7 @@ do-clean: clean-stage[+id+]
 	fi; \
 	: $(MAKE); $(stage); \
 	rm -f .bad_compare ; \
+	echo Comparing stages [+prev+] and [+id+] ; \
 	cd stage[+id+]-gcc; \
 	files=`find . -name "*$(objext)" -print` ; \
 	cd .. ; \
@@ -1357,7 +1360,7 @@ do-clean: clean-stage[+id+]
 	  cat .bad_compare; \
 	  exit 1; \
 	else \
-	  true; \
+	  echo Comparison successful.; \
 	fi ; \
 	$(STAMP) [+compare-target+][+ IF prev +]
 	if $(LEAN); then \
@@ -1420,19 +1423,39 @@ stagefeedback-start::
 
 @if gcc-bootstrap
 do-distclean: distclean-stage1
+
+# Provide a GCC build when we're building target libraries.  This does
+# not work as a dependency, just as the minimum necessary to avoid errors.
+stage_last:
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble
 @endif gcc-bootstrap
 
+.PHONY: restrap
+restrap:
+	@: $(MAKE); $(stage)
+	rm -rf stage1-$(TARGET_SUBDIR) [+ FOR bootstrap-stage +][+ IF prev
+	  +]stage[+id+] [+ ENDIF prev +][+ ENDFOR bootstrap-stage +]
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
+
 # --------------------------------------
 # Dependencies between different modules
 # --------------------------------------
 
 # Generic dependencies for target modules on host stuff, especially gcc
-[+ FOR target_modules +][+ IF bootstrap +]
-@if gcc-bootstrap[+ FOR bootstrap_stage +]
-configure-stage[+id+]-target-[+module+]: maybe-all-stage[+id+]-gcc[+ ENDFOR +]
-@endif gcc-bootstrap[+ ENDIF bootstrap +]
-configure-target-[+module+]: maybe-all-gcc
-[+ ENDFOR target_modules +]
+@if gcc-bootstrap[+ FOR target_modules +][+ IF bootstrap
+  +][+ FOR bootstrap_stage +]
+configure-stage[+id+]-target-[+module+]: maybe-all-stage[+id+]-gcc[+
+  ENDFOR +][+ ELSE bootstrap +]
+configure-target-[+module+]: stage_last[+
+  ENDIF bootstrap +][+ ENDFOR target_modules +]
+@endif gcc-bootstrap
+
+@if gcc-no-bootstrap[+ FOR target_modules +][+ IF bootstrap
+  +][+ ELSE +]
+configure-target-[+module+]: maybe-all-gcc[+
+  ENDIF bootstrap +][+ ENDFOR target_modules +]
+@endif gcc-no-bootstrap
+
 
 [+ FOR lang_env_dependencies +]
 configure-target-[+module+]: maybe-all-target-newlib maybe-all-target-libgloss
diff --git a/configure b/configure
index 7549484..d74e611 100755
--- a/configure
+++ b/configure
@@ -1862,8 +1862,6 @@ if test "${build}" != "${host}" ; then
   CXX=${CXX-${host_alias}-c++}
   CXXFLAGS=${CXXFLAGS-"-g -O2"}
   CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
-  BUILD_PREFIX=${build_alias}-
-  BUILD_PREFIX_1=${build_alias}-
 
 else
   # Set reasonable default values for some tools even if not Canadian.
@@ -1875,13 +1873,10 @@ else
   # This is all going to change when we autoconfiscate...
 
   CC_FOR_BUILD="\$(CC)"
-  BUILD_PREFIX=
-  BUILD_PREFIX_1=loser-
-
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1885: checking for $ac_word" >&5
+echo "configure:1880: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1911,7 +1906,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1915: checking for $ac_word" >&5
+echo "configure:1910: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1962,7 +1957,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1966: checking for $ac_word" >&5
+echo "configure:1961: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1994,7 +1989,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1998: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1993: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -2005,12 +2000,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 2009 "configure"
+#line 2004 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:2014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -2036,12 +2031,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2040: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2035: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2045: checking whether we are using GNU C" >&5
+echo "configure:2040: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2050,7 +2045,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -2069,7 +2064,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2073: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2068: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2136,7 +2131,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}gnatbind", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gnatbind; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2140: checking for $ac_word" >&5
+echo "configure:2135: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2168,7 +2163,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "gnatbind", so it can be a program name with args.
 set dummy gnatbind; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2172: checking for $ac_word" >&5
+echo "configure:2167: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2201,7 +2196,7 @@ fi
 fi
 
 echo $ac_n "checking whether compiler driver understands Ada""... $ac_c" 1>&6
-echo "configure:2205: checking whether compiler driver understands Ada" >&5
+echo "configure:2200: checking whether compiler driver understands Ada" >&5
 if eval "test \"`echo '$''{'acx_cv_cc_gcc_supports_ada'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2233,7 +2228,7 @@ else
 fi
 
 echo $ac_n "checking how to compare bootstrapped objects""... $ac_c" 1>&6
-echo "configure:2237: checking how to compare bootstrapped objects" >&5
+echo "configure:2232: checking how to compare bootstrapped objects" >&5
 if eval "test \"`echo '$''{'gcc_cv_prog_cmp_skip'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2331,9 +2326,9 @@ saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $gmpinc"
 # Check GMP actually works
 echo $ac_n "checking for correct version of gmp.h""... $ac_c" 1>&6
-echo "configure:2335: checking for correct version of gmp.h" >&5
+echo "configure:2330: checking for correct version of gmp.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2337 "configure"
+#line 2332 "configure"
 #include "confdefs.h"
 #include "gmp.h"
 int main() {
@@ -2344,7 +2339,7 @@ choke me
 
 ; return 0; }
 EOF
-if { (eval echo configure:2348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -2357,12 +2352,12 @@ rm -f conftest*
 
 if test x"$have_gmp" = xyes; then
   echo $ac_n "checking for MPFR""... $ac_c" 1>&6
-echo "configure:2361: checking for MPFR" >&5
+echo "configure:2356: checking for MPFR" >&5
 
   saved_LIBS="$LIBS"
   LIBS="$LIBS $gmplibs"
   cat > conftest.$ac_ext <<EOF
-#line 2366 "configure"
+#line 2361 "configure"
 #include "confdefs.h"
 #include <gmp.h>
 #include <mpfr.h>
@@ -2370,7 +2365,7 @@ int main() {
 mpfr_t n; mpfr_init(n);
 ; return 0; }
 EOF
-if { (eval echo configure:2374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -3387,8 +3382,6 @@ done
 
 
 
-
-
 # Build module lists & subconfigure args.
 
 
@@ -3415,7 +3408,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3419: checking for $ac_word" >&5
+echo "configure:3412: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3455,7 +3448,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3459: checking for $ac_word" >&5
+echo "configure:3452: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3494,7 +3487,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3498: checking for $ac_word" >&5
+echo "configure:3491: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_M4'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3533,7 +3526,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3537: checking for $ac_word" >&5
+echo "configure:3530: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3573,7 +3566,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3577: checking for $ac_word" >&5
+echo "configure:3570: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3612,7 +3605,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3616: checking for $ac_word" >&5
+echo "configure:3609: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3665,7 +3658,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3669: checking for $ac_word" >&5
+echo "configure:3662: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_EXPECT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3706,7 +3699,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3710: checking for $ac_word" >&5
+echo "configure:3703: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RUNTEST'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3754,7 +3747,7 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias-
     # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3758: checking for $ac_word" >&5
+echo "configure:3751: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3785,7 +3778,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3789: checking for $ac_word" >&5
+echo "configure:3782: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3829,7 +3822,7 @@ fi
     # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3833: checking for $ac_word" >&5
+echo "configure:3826: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3860,7 +3853,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3864: checking for $ac_word" >&5
+echo "configure:3857: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3904,7 +3897,7 @@ fi
     # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3908: checking for $ac_word" >&5
+echo "configure:3901: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3935,7 +3928,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3939: checking for $ac_word" >&5
+echo "configure:3932: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3979,7 +3972,7 @@ fi
     # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3983: checking for $ac_word" >&5
+echo "configure:3976: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4010,7 +4003,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4014: checking for $ac_word" >&5
+echo "configure:4007: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4054,7 +4047,7 @@ fi
     # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4058: checking for $ac_word" >&5
+echo "configure:4051: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4085,7 +4078,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4089: checking for $ac_word" >&5
+echo "configure:4082: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4129,7 +4122,7 @@ fi
     # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4133: checking for $ac_word" >&5
+echo "configure:4126: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4160,7 +4153,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4164: checking for $ac_word" >&5
+echo "configure:4157: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4204,7 +4197,7 @@ fi
     # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4208: checking for $ac_word" >&5
+echo "configure:4201: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4235,7 +4228,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4239: checking for $ac_word" >&5
+echo "configure:4232: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4274,7 +4267,7 @@ fi
     # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4278: checking for $ac_word" >&5
+echo "configure:4271: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4305,7 +4298,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4309: checking for $ac_word" >&5
+echo "configure:4302: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4344,7 +4337,7 @@ fi
     # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4348: checking for $ac_word" >&5
+echo "configure:4341: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4375,7 +4368,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4379: checking for $ac_word" >&5
+echo "configure:4372: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4419,7 +4412,7 @@ fi
     # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4423: checking for $ac_word" >&5
+echo "configure:4416: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4450,7 +4443,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4454: checking for $ac_word" >&5
+echo "configure:4447: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4494,7 +4487,7 @@ fi
     # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4498: checking for $ac_word" >&5
+echo "configure:4491: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4525,7 +4518,7 @@ fi
     # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4529: checking for $ac_word" >&5
+echo "configure:4522: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4589,7 +4582,7 @@ fi
  if test -n "$with_build_time_tools"; then
   for ncn_progname in cc gcc; do
     echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:4593: checking for ${ncn_progname} in $with_build_time_tools" >&5
+echo "configure:4586: checking for ${ncn_progname} in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/${ncn_progname}; then
       ac_cv_prog_CC_FOR_TARGET=$with_build_time_tools/${ncn_progname}
       echo "$ac_t""yes" 1>&6
@@ -4606,7 +4599,7 @@ if test -z "$ac_cv_prog_CC_FOR_TARGET"; then
       # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4610: checking for $ac_word" >&5
+echo "configure:4603: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4637,7 +4630,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4641: checking for $ac_word" >&5
+echo "configure:4634: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4680,7 +4673,7 @@ fi
  if test -n "$with_build_time_tools"; then
   for ncn_progname in c++ g++ cxx gxx; do
     echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:4684: checking for ${ncn_progname} in $with_build_time_tools" >&5
+echo "configure:4677: checking for ${ncn_progname} in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/${ncn_progname}; then
       ac_cv_prog_CXX_FOR_TARGET=$with_build_time_tools/${ncn_progname}
       echo "$ac_t""yes" 1>&6
@@ -4697,7 +4690,7 @@ if test -z "$ac_cv_prog_CXX_FOR_TARGET"; then
       # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4701: checking for $ac_word" >&5
+echo "configure:4694: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4728,7 +4721,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4732: checking for $ac_word" >&5
+echo "configure:4725: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4771,7 +4764,7 @@ fi
  if test -n "$with_build_time_tools"; then
   for ncn_progname in gcc; do
     echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:4775: checking for ${ncn_progname} in $with_build_time_tools" >&5
+echo "configure:4768: checking for ${ncn_progname} in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/${ncn_progname}; then
       ac_cv_prog_GCC_FOR_TARGET=$with_build_time_tools/${ncn_progname}
       echo "$ac_t""yes" 1>&6
@@ -4788,7 +4781,7 @@ if test -z "$ac_cv_prog_GCC_FOR_TARGET"; then
       # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4792: checking for $ac_word" >&5
+echo "configure:4785: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4819,7 +4812,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4823: checking for $ac_word" >&5
+echo "configure:4816: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4857,7 +4850,7 @@ fi
  if test -n "$with_build_time_tools"; then
   for ncn_progname in gcj; do
     echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:4861: checking for ${ncn_progname} in $with_build_time_tools" >&5
+echo "configure:4854: checking for ${ncn_progname} in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/${ncn_progname}; then
       ac_cv_prog_GCJ_FOR_TARGET=$with_build_time_tools/${ncn_progname}
       echo "$ac_t""yes" 1>&6
@@ -4874,7 +4867,7 @@ if test -z "$ac_cv_prog_GCJ_FOR_TARGET"; then
       # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4878: checking for $ac_word" >&5
+echo "configure:4871: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4905,7 +4898,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4909: checking for $ac_word" >&5
+echo "configure:4902: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4948,7 +4941,7 @@ fi
  if test -n "$with_build_time_tools"; then
   for ncn_progname in gfortran; do
     echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:4952: checking for ${ncn_progname} in $with_build_time_tools" >&5
+echo "configure:4945: checking for ${ncn_progname} in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/${ncn_progname}; then
       ac_cv_prog_GFORTRAN_FOR_TARGET=$with_build_time_tools/${ncn_progname}
       echo "$ac_t""yes" 1>&6
@@ -4965,7 +4958,7 @@ if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET"; then
       # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4969: checking for $ac_word" >&5
+echo "configure:4962: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4996,7 +4989,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5000: checking for $ac_word" >&5
+echo "configure:4993: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5103,7 +5096,7 @@ rm conftest.c
 if test -z "$ac_cv_path_AR_FOR_TARGET" ; then
   if test -n "$with_build_time_tools"; then
     echo $ac_n "checking for ar in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5107: checking for ar in $with_build_time_tools" >&5
+echo "configure:5100: checking for ar in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/ar; then
       AR_FOR_TARGET=`cd $with_build_time_tools && pwd`/ar
       ac_cv_path_AR_FOR_TARGET=$AR_FOR_TARGET
@@ -5121,7 +5114,7 @@ if test -z "$ac_cv_path_AR_FOR_TARGET" ; then
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5125: checking for $ac_word" >&5
+echo "configure:5118: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_AR_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5158,7 +5151,7 @@ if test -z "$ac_cv_path_AR_FOR_TARGET" ; then
    if test -n "$with_build_time_tools"; then
   for ncn_progname in ar; do
     echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5162: checking for ${ncn_progname} in $with_build_time_tools" >&5
+echo "configure:5155: checking for ${ncn_progname} in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/${ncn_progname}; then
       ac_cv_prog_AR_FOR_TARGET=$with_build_time_tools/${ncn_progname}
       echo "$ac_t""yes" 1>&6
@@ -5175,7 +5168,7 @@ if test -z "$ac_cv_prog_AR_FOR_TARGET"; then
       # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5179: checking for $ac_word" >&5
+echo "configure:5172: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5206,7 +5199,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5210: checking for $ac_word" >&5
+echo "configure:5203: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5256,7 +5249,7 @@ fi
 if test -z "$ac_cv_path_AS_FOR_TARGET" ; then
   if test -n "$with_build_time_tools"; then
     echo $ac_n "checking for as in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5260: checking for as in $with_build_time_tools" >&5
+echo "configure:5253: checking for as in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/as; then
       AS_FOR_TARGET=`cd $with_build_time_tools && pwd`/as
       ac_cv_path_AS_FOR_TARGET=$AS_FOR_TARGET
@@ -5274,7 +5267,7 @@ if test -z "$ac_cv_path_AS_FOR_TARGET" ; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5278: checking for $ac_word" >&5
+echo "configure:5271: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_AS_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5311,7 +5304,7 @@ if test -z "$ac_cv_path_AS_FOR_TARGET" ; then
    if test -n "$with_build_time_tools"; then
   for ncn_progname in as; do
     echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5315: checking for ${ncn_progname} in $with_build_time_tools" >&5
+echo "configure:5308: checking for ${ncn_progname} in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/${ncn_progname}; then
       ac_cv_prog_AS_FOR_TARGET=$with_build_time_tools/${ncn_progname}
       echo "$ac_t""yes" 1>&6
@@ -5328,7 +5321,7 @@ if test -z "$ac_cv_prog_AS_FOR_TARGET"; then
       # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5332: checking for $ac_word" >&5
+echo "configure:5325: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5359,7 +5352,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5363: checking for $ac_word" >&5
+echo "configure:5356: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5409,7 +5402,7 @@ fi
 if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then
   if test -n "$with_build_time_tools"; then
     echo $ac_n "checking for dlltool in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5413: checking for dlltool in $with_build_time_tools" >&5
+echo "configure:5406: checking for dlltool in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/dlltool; then
       DLLTOOL_FOR_TARGET=`cd $with_build_time_tools && pwd`/dlltool
       ac_cv_path_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET
@@ -5427,7 +5420,7 @@ if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5431: checking for $ac_word" >&5
+echo "configure:5424: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5464,7 +5457,7 @@ if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then
    if test -n "$with_build_time_tools"; then
   for ncn_progname in dlltool; do
     echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5468: checking for ${ncn_progname} in $with_build_time_tools" >&5
+echo "configure:5461: checking for ${ncn_progname} in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/${ncn_progname}; then
       ac_cv_prog_DLLTOOL_FOR_TARGET=$with_build_time_tools/${ncn_progname}
       echo "$ac_t""yes" 1>&6
@@ -5481,7 +5474,7 @@ if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET"; then
       # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5485: checking for $ac_word" >&5
+echo "configure:5478: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5512,7 +5505,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5516: checking for $ac_word" >&5
+echo "configure:5509: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5562,7 +5555,7 @@ fi
 if test -z "$ac_cv_path_LD_FOR_TARGET" ; then
   if test -n "$with_build_time_tools"; then
     echo $ac_n "checking for ld in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5566: checking for ld in $with_build_time_tools" >&5
+echo "configure:5559: checking for ld in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/ld; then
       LD_FOR_TARGET=`cd $with_build_time_tools && pwd`/ld
       ac_cv_path_LD_FOR_TARGET=$LD_FOR_TARGET
@@ -5580,7 +5573,7 @@ if test -z "$ac_cv_path_LD_FOR_TARGET" ; then
   # Extract the first word of "ld", so it can be a program name with args.
 set dummy ld; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5584: checking for $ac_word" >&5
+echo "configure:5577: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5617,7 +5610,7 @@ if test -z "$ac_cv_path_LD_FOR_TARGET" ; then
    if test -n "$with_build_time_tools"; then
   for ncn_progname in ld; do
     echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5621: checking for ${ncn_progname} in $with_build_time_tools" >&5
+echo "configure:5614: checking for ${ncn_progname} in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/${ncn_progname}; then
       ac_cv_prog_LD_FOR_TARGET=$with_build_time_tools/${ncn_progname}
       echo "$ac_t""yes" 1>&6
@@ -5634,7 +5627,7 @@ if test -z "$ac_cv_prog_LD_FOR_TARGET"; then
       # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5638: checking for $ac_word" >&5
+echo "configure:5631: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5665,7 +5658,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5669: checking for $ac_word" >&5
+echo "configure:5662: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5715,7 +5708,7 @@ fi
 if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then
   if test -n "$with_build_time_tools"; then
     echo $ac_n "checking for lipo in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5719: checking for lipo in $with_build_time_tools" >&5
+echo "configure:5712: checking for lipo in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/lipo; then
       LIPO_FOR_TARGET=`cd $with_build_time_tools && pwd`/lipo
       ac_cv_path_LIPO_FOR_TARGET=$LIPO_FOR_TARGET
@@ -5733,7 +5726,7 @@ if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then
   # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5737: checking for $ac_word" >&5
+echo "configure:5730: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_LIPO_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5770,7 +5763,7 @@ if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then
    if test -n "$with_build_time_tools"; then
   for ncn_progname in lipo; do
     echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5774: checking for ${ncn_progname} in $with_build_time_tools" >&5
+echo "configure:5767: checking for ${ncn_progname} in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/${ncn_progname}; then
       ac_cv_prog_LIPO_FOR_TARGET=$with_build_time_tools/${ncn_progname}
       echo "$ac_t""yes" 1>&6
@@ -5787,7 +5780,7 @@ if test -z "$ac_cv_prog_LIPO_FOR_TARGET"; then
       # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5791: checking for $ac_word" >&5
+echo "configure:5784: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5818,7 +5811,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5822: checking for $ac_word" >&5
+echo "configure:5815: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5868,7 +5861,7 @@ fi
 if test -z "$ac_cv_path_NM_FOR_TARGET" ; then
   if test -n "$with_build_time_tools"; then
     echo $ac_n "checking for nm in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5872: checking for nm in $with_build_time_tools" >&5
+echo "configure:5865: checking for nm in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/nm; then
       NM_FOR_TARGET=`cd $with_build_time_tools && pwd`/nm
       ac_cv_path_NM_FOR_TARGET=$NM_FOR_TARGET
@@ -5886,7 +5879,7 @@ if test -z "$ac_cv_path_NM_FOR_TARGET" ; then
   # Extract the first word of "nm", so it can be a program name with args.
 set dummy nm; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5890: checking for $ac_word" >&5
+echo "configure:5883: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5923,7 +5916,7 @@ if test -z "$ac_cv_path_NM_FOR_TARGET" ; then
    if test -n "$with_build_time_tools"; then
   for ncn_progname in nm; do
     echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5927: checking for ${ncn_progname} in $with_build_time_tools" >&5
+echo "configure:5920: checking for ${ncn_progname} in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/${ncn_progname}; then
       ac_cv_prog_NM_FOR_TARGET=$with_build_time_tools/${ncn_progname}
       echo "$ac_t""yes" 1>&6
@@ -5940,7 +5933,7 @@ if test -z "$ac_cv_prog_NM_FOR_TARGET"; then
       # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5944: checking for $ac_word" >&5
+echo "configure:5937: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5971,7 +5964,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5975: checking for $ac_word" >&5
+echo "configure:5968: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6021,7 +6014,7 @@ fi
 if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then
   if test -n "$with_build_time_tools"; then
     echo $ac_n "checking for objdump in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6025: checking for objdump in $with_build_time_tools" >&5
+echo "configure:6018: checking for objdump in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/objdump; then
       OBJDUMP_FOR_TARGET=`cd $with_build_time_tools && pwd`/objdump
       ac_cv_path_OBJDUMP_FOR_TARGET=$OBJDUMP_FOR_TARGET
@@ -6039,7 +6032,7 @@ if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6043: checking for $ac_word" >&5
+echo "configure:6036: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6076,7 +6069,7 @@ if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then
    if test -n "$with_build_time_tools"; then
   for ncn_progname in objdump; do
     echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6080: checking for ${ncn_progname} in $with_build_time_tools" >&5
+echo "configure:6073: checking for ${ncn_progname} in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/${ncn_progname}; then
       ac_cv_prog_OBJDUMP_FOR_TARGET=$with_build_time_tools/${ncn_progname}
       echo "$ac_t""yes" 1>&6
@@ -6093,7 +6086,7 @@ if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET"; then
       # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6097: checking for $ac_word" >&5
+echo "configure:6090: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6124,7 +6117,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6128: checking for $ac_word" >&5
+echo "configure:6121: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6174,7 +6167,7 @@ fi
 if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then
   if test -n "$with_build_time_tools"; then
     echo $ac_n "checking for ranlib in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6178: checking for ranlib in $with_build_time_tools" >&5
+echo "configure:6171: checking for ranlib in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/ranlib; then
       RANLIB_FOR_TARGET=`cd $with_build_time_tools && pwd`/ranlib
       ac_cv_path_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET
@@ -6192,7 +6185,7 @@ if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6196: checking for $ac_word" >&5
+echo "configure:6189: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6229,7 +6222,7 @@ if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then
    if test -n "$with_build_time_tools"; then
   for ncn_progname in ranlib; do
     echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6233: checking for ${ncn_progname} in $with_build_time_tools" >&5
+echo "configure:6226: checking for ${ncn_progname} in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/${ncn_progname}; then
       ac_cv_prog_RANLIB_FOR_TARGET=$with_build_time_tools/${ncn_progname}
       echo "$ac_t""yes" 1>&6
@@ -6246,7 +6239,7 @@ if test -z "$ac_cv_prog_RANLIB_FOR_TARGET"; then
       # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6250: checking for $ac_word" >&5
+echo "configure:6243: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6277,7 +6270,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6281: checking for $ac_word" >&5
+echo "configure:6274: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6327,7 +6320,7 @@ fi
 if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then
   if test -n "$with_build_time_tools"; then
     echo $ac_n "checking for strip in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6331: checking for strip in $with_build_time_tools" >&5
+echo "configure:6324: checking for strip in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/strip; then
       STRIP_FOR_TARGET=`cd $with_build_time_tools && pwd`/strip
       ac_cv_path_STRIP_FOR_TARGET=$STRIP_FOR_TARGET
@@ -6345,7 +6338,7 @@ if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6349: checking for $ac_word" >&5
+echo "configure:6342: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_STRIP_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6382,7 +6375,7 @@ if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then
    if test -n "$with_build_time_tools"; then
   for ncn_progname in strip; do
     echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6386: checking for ${ncn_progname} in $with_build_time_tools" >&5
+echo "configure:6379: checking for ${ncn_progname} in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/${ncn_progname}; then
       ac_cv_prog_STRIP_FOR_TARGET=$with_build_time_tools/${ncn_progname}
       echo "$ac_t""yes" 1>&6
@@ -6399,7 +6392,7 @@ if test -z "$ac_cv_prog_STRIP_FOR_TARGET"; then
       # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6403: checking for $ac_word" >&5
+echo "configure:6396: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6430,7 +6423,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6434: checking for $ac_word" >&5
+echo "configure:6427: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6480,7 +6473,7 @@ fi
 if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then
   if test -n "$with_build_time_tools"; then
     echo $ac_n "checking for windres in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6484: checking for windres in $with_build_time_tools" >&5
+echo "configure:6477: checking for windres in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/windres; then
       WINDRES_FOR_TARGET=`cd $with_build_time_tools && pwd`/windres
       ac_cv_path_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET
@@ -6498,7 +6491,7 @@ if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6502: checking for $ac_word" >&5
+echo "configure:6495: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_WINDRES_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6535,7 +6528,7 @@ if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then
    if test -n "$with_build_time_tools"; then
   for ncn_progname in windres; do
     echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6539: checking for ${ncn_progname} in $with_build_time_tools" >&5
+echo "configure:6532: checking for ${ncn_progname} in $with_build_time_tools" >&5
     if test -x $with_build_time_tools/${ncn_progname}; then
       ac_cv_prog_WINDRES_FOR_TARGET=$with_build_time_tools/${ncn_progname}
       echo "$ac_t""yes" 1>&6
@@ -6552,7 +6545,7 @@ if test -z "$ac_cv_prog_WINDRES_FOR_TARGET"; then
       # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6556: checking for $ac_word" >&5
+echo "configure:6549: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6583,7 +6576,7 @@ fi
       # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6587: checking for $ac_word" >&5
+echo "configure:6580: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6631,7 +6624,7 @@ fi
 RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET"
 
 echo $ac_n "checking where to find the target ar""... $ac_c" 1>&6
-echo "configure:6635: checking where to find the target ar" >&5
+echo "configure:6628: checking where to find the target ar" >&5
 if test "x${build}" != "x${host}" ; then
   if expr "x$AR_FOR_TARGET" : "x/" > /dev/null; then
     # We already found the complete path
@@ -6664,7 +6657,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target as""... $ac_c" 1>&6
-echo "configure:6668: checking where to find the target as" >&5
+echo "configure:6661: checking where to find the target as" >&5
 if test "x${build}" != "x${host}" ; then
   if expr "x$AS_FOR_TARGET" : "x/" > /dev/null; then
     # We already found the complete path
@@ -6697,7 +6690,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target cc""... $ac_c" 1>&6
-echo "configure:6701: checking where to find the target cc" >&5
+echo "configure:6694: checking where to find the target cc" >&5
 if test "x${build}" != "x${host}" ; then
   if expr "x$CC_FOR_TARGET" : "x/" > /dev/null; then
     # We already found the complete path
@@ -6730,7 +6723,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target c++""... $ac_c" 1>&6
-echo "configure:6734: checking where to find the target c++" >&5
+echo "configure:6727: checking where to find the target c++" >&5
 if test "x${build}" != "x${host}" ; then
   if expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then
     # We already found the complete path
@@ -6766,7 +6759,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target c++ for libstdc++""... $ac_c" 1>&6
-echo "configure:6770: checking where to find the target c++ for libstdc++" >&5
+echo "configure:6763: checking where to find the target c++ for libstdc++" >&5
 if test "x${build}" != "x${host}" ; then
   if expr "x$RAW_CXX_FOR_TARGET" : "x/" > /dev/null; then
     # We already found the complete path
@@ -6802,7 +6795,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target dlltool""... $ac_c" 1>&6
-echo "configure:6806: checking where to find the target dlltool" >&5
+echo "configure:6799: checking where to find the target dlltool" >&5
 if test "x${build}" != "x${host}" ; then
   if expr "x$DLLTOOL_FOR_TARGET" : "x/" > /dev/null; then
     # We already found the complete path
@@ -6835,7 +6828,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target gcc""... $ac_c" 1>&6
-echo "configure:6839: checking where to find the target gcc" >&5
+echo "configure:6832: checking where to find the target gcc" >&5
 if test "x${build}" != "x${host}" ; then
   if expr "x$GCC_FOR_TARGET" : "x/" > /dev/null; then
     # We already found the complete path
@@ -6868,7 +6861,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target gcj""... $ac_c" 1>&6
-echo "configure:6872: checking where to find the target gcj" >&5
+echo "configure:6865: checking where to find the target gcj" >&5
 if test "x${build}" != "x${host}" ; then
   if expr "x$GCJ_FOR_TARGET" : "x/" > /dev/null; then
     # We already found the complete path
@@ -6904,7 +6897,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target gfortran""... $ac_c" 1>&6
-echo "configure:6908: checking where to find the target gfortran" >&5
+echo "configure:6901: checking where to find the target gfortran" >&5
 if test "x${build}" != "x${host}" ; then
   if expr "x$GFORTRAN_FOR_TARGET" : "x/" > /dev/null; then
     # We already found the complete path
@@ -6940,7 +6933,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target ld""... $ac_c" 1>&6
-echo "configure:6944: checking where to find the target ld" >&5
+echo "configure:6937: checking where to find the target ld" >&5
 if test "x${build}" != "x${host}" ; then
   if expr "x$LD_FOR_TARGET" : "x/" > /dev/null; then
     # We already found the complete path
@@ -6973,7 +6966,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target lipo""... $ac_c" 1>&6
-echo "configure:6977: checking where to find the target lipo" >&5
+echo "configure:6970: checking where to find the target lipo" >&5
 if test "x${build}" != "x${host}" ; then
   if expr "x$LIPO_FOR_TARGET" : "x/" > /dev/null; then
     # We already found the complete path
@@ -6996,7 +6989,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target nm""... $ac_c" 1>&6
-echo "configure:7000: checking where to find the target nm" >&5
+echo "configure:6993: checking where to find the target nm" >&5
 if test "x${build}" != "x${host}" ; then
   if expr "x$NM_FOR_TARGET" : "x/" > /dev/null; then
     # We already found the complete path
@@ -7029,7 +7022,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target objdump""... $ac_c" 1>&6
-echo "configure:7033: checking where to find the target objdump" >&5
+echo "configure:7026: checking where to find the target objdump" >&5
 if test "x${build}" != "x${host}" ; then
   if expr "x$OBJDUMP_FOR_TARGET" : "x/" > /dev/null; then
     # We already found the complete path
@@ -7062,7 +7055,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target ranlib""... $ac_c" 1>&6
-echo "configure:7066: checking where to find the target ranlib" >&5
+echo "configure:7059: checking where to find the target ranlib" >&5
 if test "x${build}" != "x${host}" ; then
   if expr "x$RANLIB_FOR_TARGET" : "x/" > /dev/null; then
     # We already found the complete path
@@ -7095,7 +7088,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target strip""... $ac_c" 1>&6
-echo "configure:7099: checking where to find the target strip" >&5
+echo "configure:7092: checking where to find the target strip" >&5
 if test "x${build}" != "x${host}" ; then
   if expr "x$STRIP_FOR_TARGET" : "x/" > /dev/null; then
     # We already found the complete path
@@ -7128,7 +7121,7 @@ else
   fi
 fi
 echo $ac_n "checking where to find the target windres""... $ac_c" 1>&6
-echo "configure:7132: checking where to find the target windres" >&5
+echo "configure:7125: checking where to find the target windres" >&5
 if test "x${build}" != "x${host}" ; then
   if expr "x$WINDRES_FOR_TARGET" : "x/" > /dev/null; then
     # We already found the complete path
@@ -7189,7 +7182,7 @@ fi
 
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:7193: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:7186: checking whether to enable maintainer-specific portions of Makefiles" >&5
 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -7435,8 +7428,6 @@ s%@alphaieee_frag@%%g
 /@ospace_frag@/r $ospace_frag
 s%@ospace_frag@%%g
 s%@RPATH_ENVVAR@%$RPATH_ENVVAR%g
-s%@BUILD_PREFIX@%$BUILD_PREFIX%g
-s%@BUILD_PREFIX_1@%$BUILD_PREFIX_1%g
 s%@tooldir@%$tooldir%g
 s%@build_tooldir@%$build_tooldir%g
 s%@CONFIGURE_GDB_TK@%$CONFIGURE_GDB_TK%g
diff --git a/configure.in b/configure.in
index 785ace8..adb53b9 100644
--- a/configure.in
+++ b/configure.in
@@ -1060,8 +1060,6 @@ if test "${build}" != "${host}" ; then
   CXX=${CXX-${host_alias}-c++}
   CXXFLAGS=${CXXFLAGS-"-g -O2"}
   CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
-  BUILD_PREFIX=${build_alias}-
-  BUILD_PREFIX_1=${build_alias}-
 
 else
   # Set reasonable default values for some tools even if not Canadian.
@@ -1073,9 +1071,6 @@ else
   # This is all going to change when we autoconfiscate...
 
   CC_FOR_BUILD="\$(CC)"
-  BUILD_PREFIX=
-  BUILD_PREFIX_1=loser-
-
   AC_PROG_CC
 
   # We must set the default linker to the linker used by gcc for the correct
@@ -2160,8 +2155,6 @@ AC_SUBST_FILE(ospace_frag)
 
 # Miscellanea: directories, flags, etc.
 AC_SUBST(RPATH_ENVVAR)
-AC_SUBST(BUILD_PREFIX)
-AC_SUBST(BUILD_PREFIX_1)
 AC_SUBST(tooldir)
 AC_SUBST(build_tooldir)
 AC_SUBST(CONFIGURE_GDB_TK)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4add31e..51a0635 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,28 @@
+2006-02-20  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR bootstrap/25476
+
+	* Makefile.in (LDFLAGS): Define from autoconf substitution.
+
+	* Makefile.in (BOOTSTRAPPING): New.
+	(quickstrap): New definition if BOOTSTRAPPING=yes.
+
+	* Makefile.in (CONFIG_LANGUAGES): Substitute all_selected_languages.
+	* configure.ac: Substitute all_selected_languages with the languages
+	that were configured.  For all the other variables except
+	lang_specs_files, include all the languages in the tree.
+	* configure: Regenerate.
+	
+	* Makefile.in (stmp-fixinc): Copy includes from the prev-gcc directory,
+	if there is one.  Run the commands to run fixincludes in the same
+	subshell.
+
+	* doc/makefile.texi: Document new makefile targets from toplevel bootstrap.
+	* doc/install.texi: Document exact conventions for searching target tools.
+	Document --with-build-time-tools.  Document toplevel bootstrap.  Document
+	something more about building an Ada cross-compiler.  Don't list GNU Make
+	requirements which affect all platforms.
+
 2006-02-19  Roger Sayle  <roger@eyesopen.com>
 
 	PR middle-end/19543
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 82987c1..ae94126 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -130,7 +130,7 @@ T_ADAFLAGS =
 SUBDIRS =@subdirs@ build
 
 # Selection of languages to be made.
-CONFIG_LANGUAGES = @all_languages@
+CONFIG_LANGUAGES = @all_selected_languages@
 LANGUAGES = c gcov$(exeext) gcov-dump$(exeext) $(CONFIG_LANGUAGES)
 
 # Selection of languages to be made during stage1 build.
@@ -150,6 +150,7 @@ BOOT_LANGUAGES = c @all_boot_languages@
 XCFLAGS =
 TCFLAGS =
 CFLAGS = -g
+LDFLAGS = @LDFLAGS@
 STAGE1_CFLAGS = -g @stage1_cflags@
 STAGE1_CHECKING = -DENABLE_CHECKING -DENABLE_ASSERT_CHECKING
 BOOT_CFLAGS = -g -O2
@@ -3193,17 +3194,23 @@ stmp-fixinc: gsyslimits.h macro_list \
 	fi
 	rm -rf include; mkdir include
 	-chmod a+rx include
-	(TARGET_MACHINE='$(target)'; srcdir=`cd $(srcdir); ${PWD_COMMAND}`; \
-	  SHELL='$(SHELL)'; MACRO_LIST=`${PWD_COMMAND}`/macro_list ; \
-	  export TARGET_MACHINE srcdir SHELL MACRO_LIST && \
-	  cd $(build_objdir)/fixincludes && \
-	  $(SHELL) ./fixinc.sh ../../gcc/include \
-	    $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS) )
-	rm -f include/syslimits.h
-	if [ -f include/limits.h ]; then \
-	  mv include/limits.h include/syslimits.h; \
+	if [ -d ../prev-gcc ]; then \
+	  cd ../prev-gcc && \
+	  $(MAKE) $(INSTALL_HEADERS_DIR) DESTDIR=`pwd`/../gcc/ \
+	    libsubdir=. ; \
 	else \
-	  cp $(srcdir)/gsyslimits.h include/syslimits.h; \
+	  (TARGET_MACHINE='$(target)'; srcdir=`cd $(srcdir); ${PWD_COMMAND}`; \
+	    SHELL='$(SHELL)'; MACRO_LIST=`${PWD_COMMAND}`/macro_list ; \
+	    export TARGET_MACHINE srcdir SHELL MACRO_LIST && \
+	    cd $(build_objdir)/fixincludes && \
+	    $(SHELL) ./fixinc.sh ../../gcc/include \
+	      $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS) ); \
+	  rm -f include/syslimits.h; \
+	  if [ -f include/limits.h ]; then \
+	    mv include/limits.h include/syslimits.h; \
+	  else \
+	    cp $(srcdir)/gsyslimits.h include/syslimits.h; \
+	  fi; \
 	fi
 	chmod a+r include/syslimits.h
 	$(STAMP) stmp-fixinc
@@ -4239,12 +4246,19 @@ bubblestrap:
 	  $(MAKE) $(REMAKEFLAGS) stage4_build || exit 1; \
 	fi
 
+BOOTSTRAPPING := $(shell if test -f ../stage_last; then echo yes; else echo no; fi)
+ifeq ($(BOOTSTRAPPING),yes)
+# Provide quickstrap as a target that people can type into the gcc directory,
+# and that fails if you're not into it.
+quickstrap: all
+else
 quickstrap:
 	if test -f stage_last ; then \
 	  LAST=`cat stage_last`; rm $$LAST; $(MAKE) $(REMAKEFLAGS) $$LAST; \
 	else \
 	  $(MAKE) $(REMAKEFLAGS) stage1_build; \
 	fi
+endif
 
 cleanstrap:
 	-$(MAKE) clean
diff --git a/gcc/configure b/gcc/configure
index 7a2b70e..e1b1a79 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP strict1_warn cxx_compat_warn warn_cflags WERROR nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR stage1_cflags COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO collect2 gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir subdirs srcdir all_boot_languages all_compilers all_gtfiles all_gtfiles_files_langs all_gtfiles_files_files all_lang_makefrags all_lang_makefiles all_languages all_stagestuff build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines check_languages cc_set_by_configure quoted_cc_set_by_configure cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir libstdcxx_incdir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file stage_prefix_set_by_configure quoted_stage_prefix_set_by_configure thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP strict1_warn cxx_compat_warn warn_cflags WERROR nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR stage1_cflags COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO collect2 gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir subdirs srcdir all_boot_languages all_compilers all_gtfiles all_gtfiles_files_langs all_gtfiles_files_files all_lang_makefrags all_lang_makefiles all_languages all_selected_languages all_stagestuff build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines check_languages cc_set_by_configure quoted_cc_set_by_configure cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir libstdcxx_incdir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file stage_prefix_set_by_configure quoted_stage_prefix_set_by_configure thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
 ac_subst_files='language_hooks'
 
 # Initialize some variables set by options.
@@ -7184,28 +7184,6 @@ else
   enable_languages=c
 fi;
 
-subdirs=
-for lang in ${srcdir}/*/config-lang.in
-do
-	case $lang in
-	# The odd quoting in the next line works around
-	# an apparent bug in bash 1.12 on linux.
-	${srcdir}/[*]/config-lang.in) ;;
-	*)
-	  lang_alias=`sed -n -e 's,^language=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^language=\([^   ]*\).*$,\1,p' $lang`
-	  if test "x$lang_alias" = x
-	  then
-	        echo "$lang doesn't set \$language." 1>&2
-	        exit 1
-	  fi
-	  case ",$enable_languages," in
-	  *,$lang_alias,*)
-	    subdirs="$subdirs `echo $lang | sed -e 's,^.*/\([^/]*\)/config-lang.in$,\1,'`" ;;
-	  esac
-	  ;;
-	esac
-done
-
 
 # -------------------------
 # Checks for other programs
@@ -7634,7 +7612,7 @@ if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then
 else
     ac_prog_version=`$MAKEINFO --version 2>&1 |
                    sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
-  echo "configure:7637: version of makeinfo is $ac_prog_version" >&5
+  echo "configure:7615: version of makeinfo is $ac_prog_version" >&5
   case $ac_prog_version in
     '')     gcc_cv_prog_makeinfo_modern=no;;
     4.[4-9]*)
@@ -15767,22 +15745,10 @@ fi
 # Make empty files to contain the specs and options for each language.
 # Then add #include lines to for a compiler that has specs and/or options.
 
+subdirs=
 lang_opt_files=
 lang_specs_files=
 lang_tree_files=
-for subdir in . $subdirs
-do
-	if test -f $srcdir/$subdir/lang.opt; then
-	    lang_opt_files="$lang_opt_files $srcdir/$subdir/lang.opt"
-	fi
-	if test -f $srcdir/$subdir/lang-specs.h; then
-	    lang_specs_files="$lang_specs_files $srcdir/$subdir/lang-specs.h"
-	fi
-	if test -f $srcdir/$subdir/$subdir-tree.def; then
-	    lang_tree_files="$lang_tree_files $srcdir/$subdir/$subdir-tree.def"
-	fi
-done
-
 # These (without "all_") are set in each config-lang.in.
 # `language' must be a single word so is spelled singularly.
 all_languages=
@@ -15800,6 +15766,10 @@ all_gtfiles="$target_gtfiles"
 all_gtfiles_files_langs=
 all_gtfiles_files_files=
 
+# These are the languages that are set in --enable-languages,
+# and are available in the GCC tree.
+all_selected_languages=
+
 # Add the language fragments.
 # Languages are added via two mechanisms.  Some information must be
 # recorded in makefile variables, these are defined in config-lang.in.
@@ -15809,59 +15779,91 @@ all_gtfiles_files_files=
 
 language_hooks="Make-hooks"
 
-for s in $subdirs
+for lang in ${srcdir}/*/config-lang.in
 do
-		language=
-		boot_language=
-		compilers=
-		stagestuff=
-		outputs=
-		gtfiles=
-		. ${srcdir}/$s/config-lang.in
-		if test "x$language" = x
-		then
-			echo "${srcdir}/$s/config-lang.in doesn't set \$language." 1>&2
-			exit 1
-		fi
-		all_lang_makefrags="$all_lang_makefrags \$(srcdir)/$s/Make-lang.in"
-		if test -f ${srcdir}/$s/Makefile.in
-		then all_lang_makefiles="$s/Makefile"
-		fi
-		all_languages="$all_languages $language"
-		if test "x$boot_language" = xyes
-		then
-			all_boot_languages="$all_boot_languages $language"
-		fi
-		all_compilers="$all_compilers $compilers"
-		all_stagestuff="$all_stagestuff $stagestuff"
-		all_outputs="$all_outputs $outputs"
-		all_gtfiles="$all_gtfiles $gtfiles"
-                for f in $gtfiles
-                do
-                         all_gtfiles_files_langs="$all_gtfiles_files_langs ${s} "
-                         all_gtfiles_files_files="$all_gtfiles_files_files ${f} "
-                done
+    case $lang in
+    # The odd quoting in the next line works around
+    # an apparent bug in bash 1.12 on linux.
+    ${srcdir}/[*]/config-lang.in)
+        continue ;;
+    *)
+        lang_alias=`sed -n -e 's,^language=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^language=\([^   ]*\).*$,\1,p' $lang`
+        if test "x$lang_alias" = x
+        then
+              echo "$lang doesn't set \$language." 1>&2
+              exit 1
+        fi
+        subdir="`echo $lang | sed -e 's,^.*/\([^/]*\)/config-lang.in$,\1,'`"
+        subdirs="$subdirs $subdir"
+        case ",$enable_languages," in
+        *,$lang_alias,*)
+            all_selected_languages="$all_selected_languages $lang_alias"
+	    if test -f $srcdir/$subdir/lang-specs.h; then
+	        lang_specs_files="$lang_specs_files $srcdir/$subdir/lang-specs.h"
+	    fi
+	    ;;
+        esac
+
+	if test -f $srcdir/$subdir/lang.opt; then
+	    lang_opt_files="$lang_opt_files $srcdir/$subdir/lang.opt"
+	fi
+	if test -f $srcdir/$subdir/$subdir-tree.def; then
+	    lang_tree_files="$lang_tree_files $srcdir/$subdir/$subdir-tree.def"
+	fi
+
+	language=
+	boot_language=
+	compilers=
+	stagestuff=
+	outputs=
+	gtfiles=
+	. ${srcdir}/$subdir/config-lang.in
+	if test "x$language" = x
+	then
+		echo "${srcdir}/$subdir/config-lang.in doesn't set \$language." 1>&2
+		exit 1
+	fi
+	all_lang_makefrags="$all_lang_makefrags \$(srcdir)/$subdir/Make-lang.in"
+	if test -f ${srcdir}/$subdir/Makefile.in
+		then all_lang_makefiles="$subdir/Makefile"
+	fi
+	all_languages="$all_languages $language"
+	if test "x$boot_language" = xyes
+	then
+		all_boot_languages="$all_boot_languages $language"
+	fi
+	all_compilers="$all_compilers $compilers"
+	all_stagestuff="$all_stagestuff $stagestuff"
+	all_outputs="$all_outputs $outputs"
+	all_gtfiles="$all_gtfiles $gtfiles"
+        for f in $gtfiles
+        do
+                 all_gtfiles_files_langs="$all_gtfiles_files_langs ${subdir} "
+                 all_gtfiles_files_files="$all_gtfiles_files_files ${f} "
+        done
+	;;
+    esac
 done
 
 # Pick up gtfiles for c
 gtfiles=
-s="c"
+subdir="c"
 . ${srcdir}/c-config-lang.in
 all_gtfiles="$all_gtfiles $gtfiles"
 for f in $gtfiles
 do
-        all_gtfiles_files_langs="$all_gtfiles_files_langs ${s} "
+        all_gtfiles_files_langs="$all_gtfiles_files_langs ${subdir} "
         all_gtfiles_files_files="$all_gtfiles_files_files ${f} "
 done
 
 check_languages=
-for language in $all_languages
+for language in $all_selected_languages
 do
-		check_languages="$check_languages check-$language"
+	check_languages="$check_languages check-$language"
 done
 
 # We link each language in with a set of hooks, reached indirectly via
-# lang.${target}.
+# lang.${target}.  Only do so for selected languages.
 
 rm -f Make-hooks
 touch Make-hooks
@@ -15870,12 +15872,13 @@ target_list="all.cross start.encap rest.encap tags \
 	uninstall info man srcextra srcman srcinfo \
 	mostlyclean clean distclean maintainer-clean \
 	stage1 stage2 stage3 stage4 stageprofile stagefeedback"
+
 for t in $target_list
 do
 	x=
-	for lang in $all_languages
+	for lang in $all_selected_languages
 	do
-			x="$x $lang.$t"
+		x="$x $lang.$t"
 	done
 	echo "lang.$t: $x" >> Make-hooks
 done
@@ -16028,6 +16031,7 @@ objdir=`${PWDCMD-pwd}`
 
 
 
+
 # Echo link setup.
 if test x${build} = x${host} ; then
   if test x${host} = x${target} ; then
@@ -16802,6 +16806,7 @@ s,@all_gtfiles_files_files@,$all_gtfiles_files_files,;t t
 s,@all_lang_makefrags@,$all_lang_makefrags,;t t
 s,@all_lang_makefiles@,$all_lang_makefiles,;t t
 s,@all_languages@,$all_languages,;t t
+s,@all_selected_languages@,$all_selected_languages,;t t
 s,@all_stagestuff@,$all_stagestuff,;t t
 s,@build_exeext@,$build_exeext,;t t
 s,@build_install_headers_dir@,$build_install_headers_dir,;t t
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 3c597ba..e3d13fc 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -817,30 +817,6 @@ AC_ARG_ENABLE(languages,
 esac],
 [enable_languages=c])
 
-subdirs=
-for lang in ${srcdir}/*/config-lang.in
-do
-	case $lang in
-	# The odd quoting in the next line works around
-	# an apparent bug in bash 1.12 on linux.
-changequote(,)dnl
-	${srcdir}/[*]/config-lang.in) ;;
-	*)
-	  lang_alias=`sed -n -e 's,^language=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^language=\([^   ]*\).*$,\1,p' $lang`
-	  if test "x$lang_alias" = x
-	  then
-	        echo "$lang doesn't set \$language." 1>&2
-	        exit 1
-	  fi
-	  case ",$enable_languages," in
-	  *,$lang_alias,*)
-	    subdirs="$subdirs `echo $lang | sed -e 's,^.*/\([^/]*\)/config-lang.in$,\1,'`" ;;
-	  esac
-	  ;;
-changequote([,])dnl
-	esac
-done
-
 
 # -------------------------
 # Checks for other programs
@@ -3258,22 +3234,10 @@ AC_SUBST(MAINT)dnl
 # Make empty files to contain the specs and options for each language.
 # Then add #include lines to for a compiler that has specs and/or options.
 
+subdirs=
 lang_opt_files=
 lang_specs_files=
 lang_tree_files=
-for subdir in . $subdirs
-do
-	if test -f $srcdir/$subdir/lang.opt; then
-	    lang_opt_files="$lang_opt_files $srcdir/$subdir/lang.opt"
-	fi
-	if test -f $srcdir/$subdir/lang-specs.h; then
-	    lang_specs_files="$lang_specs_files $srcdir/$subdir/lang-specs.h"
-	fi
-	if test -f $srcdir/$subdir/$subdir-tree.def; then
-	    lang_tree_files="$lang_tree_files $srcdir/$subdir/$subdir-tree.def"
-	fi
-done
-
 # These (without "all_") are set in each config-lang.in.
 # `language' must be a single word so is spelled singularly.
 all_languages=
@@ -3291,6 +3255,10 @@ all_gtfiles="$target_gtfiles"
 all_gtfiles_files_langs=
 all_gtfiles_files_files=
 
+# These are the languages that are set in --enable-languages,
+# and are available in the GCC tree.
+all_selected_languages=
+
 # Add the language fragments.
 # Languages are added via two mechanisms.  Some information must be
 # recorded in makefile variables, these are defined in config-lang.in.
@@ -3300,59 +3268,93 @@ all_gtfiles_files_files=
 
 language_hooks="Make-hooks"
 
-for s in $subdirs
+for lang in ${srcdir}/*/config-lang.in
 do
-		language=
-		boot_language=
-		compilers=
-		stagestuff=
-		outputs=
-		gtfiles=
-		. ${srcdir}/$s/config-lang.in
-		if test "x$language" = x
-		then
-			echo "${srcdir}/$s/config-lang.in doesn't set \$language." 1>&2
-			exit 1
-		fi
-		all_lang_makefrags="$all_lang_makefrags \$(srcdir)/$s/Make-lang.in"
-		if test -f ${srcdir}/$s/Makefile.in
-		then all_lang_makefiles="$s/Makefile"
-		fi
-		all_languages="$all_languages $language"
-		if test "x$boot_language" = xyes
-		then
-			all_boot_languages="$all_boot_languages $language"
-		fi
-		all_compilers="$all_compilers $compilers"
-		all_stagestuff="$all_stagestuff $stagestuff"
-		all_outputs="$all_outputs $outputs"
-		all_gtfiles="$all_gtfiles $gtfiles"
-                for f in $gtfiles
-                do
-                         all_gtfiles_files_langs="$all_gtfiles_files_langs ${s} "
-                         all_gtfiles_files_files="$all_gtfiles_files_files ${f} "
-                done
+    case $lang in
+    # The odd quoting in the next line works around
+    # an apparent bug in bash 1.12 on linux.
+changequote(,)dnl
+    ${srcdir}/[*]/config-lang.in)
+        continue ;;
+    *)
+        lang_alias=`sed -n -e 's,^language=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^language=\([^   ]*\).*$,\1,p' $lang`
+        if test "x$lang_alias" = x
+        then
+              echo "$lang doesn't set \$language." 1>&2
+              exit 1
+        fi
+        subdir="`echo $lang | sed -e 's,^.*/\([^/]*\)/config-lang.in$,\1,'`"
+        subdirs="$subdirs $subdir"
+        case ",$enable_languages," in
+        *,$lang_alias,*)
+            all_selected_languages="$all_selected_languages $lang_alias"
+	    if test -f $srcdir/$subdir/lang-specs.h; then
+	        lang_specs_files="$lang_specs_files $srcdir/$subdir/lang-specs.h"
+	    fi
+	    ;;
+        esac
+changequote([,])dnl
+
+	if test -f $srcdir/$subdir/lang.opt; then
+	    lang_opt_files="$lang_opt_files $srcdir/$subdir/lang.opt"
+	fi
+	if test -f $srcdir/$subdir/$subdir-tree.def; then
+	    lang_tree_files="$lang_tree_files $srcdir/$subdir/$subdir-tree.def"
+	fi
+
+	language=
+	boot_language=
+	compilers=
+	stagestuff=
+	outputs=
+	gtfiles=
+	. ${srcdir}/$subdir/config-lang.in
+	if test "x$language" = x
+	then
+		echo "${srcdir}/$subdir/config-lang.in doesn't set \$language." 1>&2
+		exit 1
+	fi
+	all_lang_makefrags="$all_lang_makefrags \$(srcdir)/$subdir/Make-lang.in"
+	if test -f ${srcdir}/$subdir/Makefile.in
+		then all_lang_makefiles="$subdir/Makefile"
+	fi
+	all_languages="$all_languages $language"
+	if test "x$boot_language" = xyes
+	then
+		all_boot_languages="$all_boot_languages $language"
+	fi
+	all_compilers="$all_compilers $compilers"
+	all_stagestuff="$all_stagestuff $stagestuff"
+	all_outputs="$all_outputs $outputs"
+	all_gtfiles="$all_gtfiles $gtfiles"
+        for f in $gtfiles
+        do
+                 all_gtfiles_files_langs="$all_gtfiles_files_langs ${subdir} "
+                 all_gtfiles_files_files="$all_gtfiles_files_files ${f} "
+        done
+	;;
+    esac
 done
 
 # Pick up gtfiles for c
 gtfiles=
-s="c"
+subdir="c"
 . ${srcdir}/c-config-lang.in
 all_gtfiles="$all_gtfiles $gtfiles"
 for f in $gtfiles
 do
-        all_gtfiles_files_langs="$all_gtfiles_files_langs ${s} "
+        all_gtfiles_files_langs="$all_gtfiles_files_langs ${subdir} "
         all_gtfiles_files_files="$all_gtfiles_files_files ${f} "
 done
 
 check_languages=
-for language in $all_languages
+for language in $all_selected_languages
 do
-		check_languages="$check_languages check-$language"
+	check_languages="$check_languages check-$language"
 done
 
 # We link each language in with a set of hooks, reached indirectly via
-# lang.${target}.
+# lang.${target}.  Only do so for selected languages.
 
 rm -f Make-hooks
 touch Make-hooks
@@ -3361,12 +3363,13 @@ target_list="all.cross start.encap rest.encap tags \
 	uninstall info man srcextra srcman srcinfo \
 	mostlyclean clean distclean maintainer-clean \
 	stage1 stage2 stage3 stage4 stageprofile stagefeedback"
+
 for t in $target_list
 do
 	x=
-	for lang in $all_languages
+	for lang in $all_selected_languages
 	do
-			x="$x $lang.$t"
+		x="$x $lang.$t"
 	done
 	echo "lang.$t: $x" >> Make-hooks
 done
@@ -3463,6 +3466,7 @@ AC_SUBST(all_gtfiles_files_files)
 AC_SUBST(all_lang_makefrags)
 AC_SUBST(all_lang_makefiles)
 AC_SUBST(all_languages)
+AC_SUBST(all_selected_languages)
 AC_SUBST(all_stagestuff)
 AC_SUBST(build_exeext)
 AC_SUBST(build_install_headers_dir)
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index f76cead..846323f 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -527,6 +527,7 @@ Second, when configuring a native system, either @command{cc} or
 your environment before running configure.  Otherwise the configuration
 scripts may fail.
 
+@ignore
 Note that the bootstrap compiler and the resulting GCC must be link
 compatible, else the bootstrap will fail with linker errors about
 incompatible object file formats.  Several multilibed targets are
@@ -537,6 +538,7 @@ affected by this requirement, see
 @ifhtml
 @uref{specific.html,,host/target specific installation notes}.
 @end ifhtml
+@end ignore
 
 To configure GCC:
 
@@ -777,7 +779,8 @@ assembler found is not actually the GNU assembler.  (Confusion may also
 result if the compiler finds the GNU assembler but has not been
 configured with @option{--with-gnu-as}.)  If you have more than one
 assembler installed on your system, you may want to use this option in
-connection with @option{--with-as=@var{pathname}}.
+connection with @option{--with-as=@var{pathname}} or
+@option{--with-build-time-tools=@var{pathname}}.
 
 The following systems are the only ones where it makes a difference
 whether you use the GNU assembler.  On any other system,
@@ -800,28 +803,40 @@ the 386, if you use the GNU assembler, you should also use the GNU linker
 (and specify @option{--with-gnu-ld}).
 
 @item @anchor{with-as}--with-as=@var{pathname}
-Specify that the
-compiler should use the assembler pointed to by @var{pathname}, rather
-than the one found by the standard rules to find an assembler, which
-are:
+Specify that the compiler should use the assembler pointed to by
+@var{pathname}, rather than the one found by the standard rules to find
+an assembler, which are:
 @itemize @bullet
 @item
-Check the @file{@var{libexec}/gcc/@var{target}/@var{version}}
-directory, where @var{libexec} defaults to
-@file{@var{exec-prefix}/libexec} and @var{exec-prefix} defaults to
-@var{prefix} which defaults to @file{/usr/local} unless overridden by
-the @option{--prefix=@var{pathname}} switch described
-above.  @var{target} is the target system triple, such as
-@samp{sparc-sun-solaris2.7}, and @var{version} denotes the GCC
-version, such as 3.0.
+Unless GCC is being built with a cross compiler, check the
+@file{@var{libexec}/gcc/@var{target}/@var{version}} directory.
+@var{libexec} defaults to @file{@var{exec-prefix}/libexec};
+@var{exec-prefix} defaults to @var{prefix}, which
+defaults to @file{/usr/local} unless overridden by the
+@option{--prefix=@var{pathname}} switch described above.  @var{target}
+is the target system triple, such as @samp{sparc-sun-solaris2.7}, and
+@var{version} denotes the GCC version, such as 3.0.
+
 @item
-Check operating system specific directories (e.g.@: @file{/usr/ccs/bin} on
+If the target system is the same that you are building on, check
+operating system specific directories (e.g.@: @file{/usr/ccs/bin} on
 Sun Solaris 2).
+
+@item
+Check in the @env{PATH} for a tool whose name is prefixed by the
+target system triple.
+
+@item
+Check in the @env{PATH} for a tool whose name is not prefixed by the
+target system triple, if the host and target system triple are
+the same (in other words, we use a host tool if it can be used for
+the target as well).
 @end itemize
-Note that these rules do not check for the value of @env{PATH}.  You may
-want to use @option{--with-as} if no assembler is installed in the
-directories listed above, or if you have multiple assemblers installed
-and want to choose one that is not found by the above rules.
+
+You may want to use @option{--with-as} if no assembler
+is installed in the directories listed above, or if you have multiple
+assemblers installed and want to choose one that is not found by the
+above rules.
 
 @item @anchor{with-gnu-ld}--with-gnu-ld
 Same as @uref{#with-gnu-as,,@option{--with-gnu-as}}
@@ -1072,9 +1087,9 @@ Building the Ada compiler has special requirements, see below.
 If you do not pass this flag, or specify the option @code{all}, then all
 default languages available in the @file{gcc} sub-tree will be configured.
 Ada, Objective-C++, and treelang are not default languages; the rest are.
-Re-defining @code{LANGUAGES} when calling @samp{make bootstrap}
-@strong{does not} work anymore, as those language sub-directories might
-not have been configured!
+Re-defining @code{LANGUAGES} when calling @samp{make} @strong{does not}
+work anymore, as those language sub-directories might not have been
+configured!
 
 @item --disable-libada
 Specify that the run-time libraries and tools used by GNAT should not
@@ -1294,11 +1309,29 @@ Specifies a list of directories which contain the target runtime
 libraries.  These libraries will be copied into the @file{gcc} install
 directory.  If the directory list is omitted, this option has no
 effect.
+
 @item --with-newlib
 Specifies that @samp{newlib} is
 being used as the target C library.  This causes @code{__eprintf} to be
 omitted from @file{libgcc.a} on the assumption that it will be provided by
 @samp{newlib}.
+
+@item --with-build-time-tools=@var{dir}
+Specifies where to find the set of target tools (assembler, linker, etc.)
+that will be used while building GCC itself.  This option can be useful
+if the directory layouts are different between the system you are building
+GCC on, and the system where you will deploy it.
+
+For example, on a @option{ia64-hp-hpux} system, you may have the GNU
+assembler and linker in @file{/usr/bin}, and the native tools in a
+different path, and build a toolchain that expects to find the
+native tools in @file{/usr/bin}.
+
+When you use this option, you should ensure that @var{dir} includes
+@command{ar}, @command{as}, @command{ld}, @command{nm},
+@command{ranlib} and @command{strip} if necessary, and possibly
+@command{objdump}.  Otherwise, GCC may use an inconsistent set of
+tools.
 @end table
 
 @subheading Fortran-Specific Options
@@ -1521,22 +1554,22 @@ documentation pre-built for the unmodified documentation in the release.
 
 @section Building a native compiler
 
-For a native build issue the command @samp{make bootstrap}.  This
-will build the entire GCC system, which includes the following steps:
+For a native build, the command @samp{make} will trigger a 3-stage
+bootstrap of the compiler.  This will build the entire GCC system
+and ensure that it compiles itself correctly, by doing the
+following steps:
 
 @itemize @bullet
 @item
-Build host tools necessary to build the compiler such as texinfo, bison,
+Build tools necessary to build the compiler such as texinfo, bison,
 gperf.
 
 @item
-Build target tools for use by the compiler such as binutils (bfd,
-binutils, gas, gprof, ld, and opcodes)
-if they have been individually linked
-or moved into the top level GCC source tree before configuring.
-
-@item
-Perform a 3-stage bootstrap of the compiler.
+Perform a 3-stage bootstrap of the compiler.  This includes building
+three times the target tools for use by the compiler such as binutils
+(bfd, binutils, gas, gprof, ld, and opcodes) if they have been
+individually linked or moved into the top level GCC source tree before
+configuring.
 
 @item
 Perform a comparison test of the stage2 and stage3 compilers.
@@ -1547,8 +1580,8 @@ Build runtime libraries using the stage3 compiler from the previous step.
 @end itemize
 
 If you are short on disk space you might consider @samp{make
-bootstrap-lean} instead.  This is identical to @samp{make
-bootstrap} except that object files from the stage1 and
+bootstrap-lean} instead.  The sequence of compilation is the
+same described above, but object files from the stage1 and
 stage2 of the 3-stage bootstrap of the compiler are deleted as
 soon as they are no longer needed.
 
@@ -1565,7 +1598,7 @@ roughly 40% of disk space both for the bootstrap and the final installation.
 
 If you wish to use non-default GCC flags when compiling the stage2 and
 stage3 compilers, set @code{BOOT_CFLAGS} on the command line when doing
-@samp{make bootstrap}.  Non-default optimization flags are less well
+@samp{make}.  Non-default optimization flags are less well
 tested here than the default of @samp{-g -O2}, but should still work.
 In a few cases, you may find that you need to specify special flags such
 as @option{-msoft-float} here to complete the bootstrap; or, if the
@@ -1574,17 +1607,17 @@ around this, by choosing @code{BOOT_CFLAGS} to avoid the parts of the
 stage1 compiler that were miscompiled, or by using @samp{make
 bootstrap4} to increase the number of stages of bootstrap.
 
-Note that using non-standard @code{CFLAGS} can cause bootstrap to fail in
-@file{libiberty}, if these trigger a warning with the new compiler.  For
-example using @samp{-O2 -g -mcpu=i686} on @code{i686-pc-linux-gnu} will
-cause bootstrap failure as @option{-mcpu=} is deprecated in 3.4.0 and above.
+Note that using non-standard @code{CFLAGS} can cause bootstrap to fail
+if these trigger a warning with the new compiler.  For example using
+@samp{-O2 -g -mcpu=i686} on @code{i686-pc-linux-gnu} will cause bootstrap
+failure as @option{-mcpu=} is deprecated in 3.4.0 and above.
 
 
 If you used the flag @option{--enable-languages=@dots{}} to restrict
 the compilers to be built, only those you've actually enabled will be
 built.  This will of course only build those runtime libraries, for
 which the particular compiler has been built.  Please note,
-that re-defining @env{LANGUAGES} when calling @samp{make bootstrap}
+that re-defining @env{LANGUAGES} when calling @samp{make}
 @strong{does not} work anymore!
 
 If the comparison of stage2 and stage3 fails, this normally indicates
@@ -1594,6 +1627,15 @@ a few systems, meaningful comparison of object files is impossible; they
 always appear ``different''.  If you encounter this problem, you will
 need to disable comparison in the @file{Makefile}.)
 
+If you do not want to bootstrap your compiler, you can configure with
+@option{--disable-bootstrap}.  In particular cases, you may want to
+bootstrap your compiler even if the target system is not the same as
+the one you are building on: for example, you could build a
+@code{powerpc-unknown-linux-gnu} toolchain on a
+@code{powerpc64-unknown-linux-gnu} host.  In this case, pass
+@option{--enable-bootstrap} to the configure script.
+
+
 @section Building a cross compiler
 
 We recommend reading the
@@ -1678,21 +1720,25 @@ compilation options.  Check your target's definition of
 
 @section Building in parallel
 
-You can use @samp{make bootstrap MAKE="make -j 2" -j 2}, or just
-@samp{make -j 2 bootstrap} for GNU Make 3.79 and above, instead of
-@samp{make bootstrap} to build GCC in parallel.
-You can also specify a bigger number, and in most cases using a value
-greater than the number of processors in your machine will result in
-fewer and shorter I/O latency hits, thus improving overall throughput;
-this is especially true for slow drives and network filesystems.
+You can use @samp{make -j 2}@footnote{Only supported by GNU Make 3.79
+  and above, which is anyway necessary to build GCC.}, instead of @samp{make},
+to build GCC in parallel.  You can also specify a bigger number, and
+in most cases using a value greater than the number of processors in
+your machine will result in fewer and shorter I/O latency hits, thus
+improving overall throughput; this is especially true for slow drives
+and network filesystems.
 
 @section Building the Ada compiler
 
 In order to build GNAT, the Ada compiler, you need a working GNAT
-compiler (GNAT version 3.14 or later, or GCC version 3.1 or later),
-including GNAT tools such as @command{gnatmake} and @command{gnatlink},
-since the Ada front end is written in Ada (with some
-GNAT-specific extensions), and GNU make.
+compiler (GNAT version 3.14 or later, or GCC version 3.1 or later).
+This includes GNAT tools such as @command{gnatmake} and
+@command{gnatlink}, since the Ada front end is written in Ada and
+uses some GNAT-specific extensions.
+
+In order to build a cross compiler, it is suggested to install
+the new compiler as native first, and then use it to build the cross
+compiler.
 
 @command{configure} does not test whether the GNAT installation works
 and has a sufficiently recent version; if too old a GNAT version is
@@ -1704,7 +1750,7 @@ used to disable building the Ada front end.
 It is possible to use profile feedback to optimize the compiler itself.  This
 should result in a faster compiler binary.  Experiments done on x86 using gcc
 3.3 showed approximately 7 percent speedup on compiling C programs.  To
-bootstrap compiler with profile feedback, use @code{make profiledbootstrap}.
+bootstrap the compiler with profile feedback, use @code{make profiledbootstrap}.
 
 When @samp{make profiledbootstrap} is run, it will first build a @code{stage1}
 compiler.  This compiler is used to build a @code{stageprofile} compiler
@@ -1712,7 +1758,7 @@ instrumented to collect execution counts of instruction and branch
 probabilities.  Then runtime libraries are compiled with profile collected.
 Finally a @code{stagefeedback} compiler is built using the information collected.
 
-Unlike @samp{make bootstrap} several additional restrictions apply.  The
+Unlike standard bootstrap, several additional restrictions apply.  The
 compiler used to build @code{stage1} needs to support a 64-bit integral type.
 It is recommended to only use GCC for this.  Also parallel make is currently
 not supported since collisions in profile collecting may occur.
@@ -2018,7 +2064,7 @@ it will not be created otherwise.  This is regarded as a feature,
 not as a bug, because it gives slightly more control to the packagers
 using the @code{DESTDIR} feature.
 
-If you built a released version of GCC using @samp{make bootstrap} then please
+If you are bootstrapping a released version of GCC then please
 quickly review the build status page for your release, available from
 @uref{http://gcc.gnu.org/buildstat.html}.
 If your system is not listed for the version of GCC that you built,
@@ -2476,17 +2522,16 @@ and it is not possible to build parallel applications.  Cray modules are not
 supported; in particular, Craylibs are assumed to be in
 @file{/opt/ctl/craylibs/craylibs}.
 
-You absolutely @strong{must} use GNU make on this platform.  Also, you
-need to tell GCC where to find the assembler and the linker.  The
-simplest way to do so is by providing @option{--with-as} and
-@option{--with-ld} to @file{configure}, e.g.@:
+On this platform, you need to tell GCC where to find the assembler and
+the linker.  The simplest way to do so is by providing @option{--with-as}
+and @option{--with-ld} to @file{configure}, e.g.@:
 
 @smallexample
     configure --with-as=/opt/ctl/bin/cam --with-ld=/opt/ctl/bin/cld \
       --enable-languages=c
 @end smallexample
 
-The comparison test during @samp{make bootstrap} fails on Unicos/Mk
+The comparison test at the end of the bootstrapping process fails on Unicos/Mk
 because the assembler inserts timestamps into object files.  You should
 be able to work around this by doing @samp{make all} after getting this
 failure.
@@ -2824,9 +2869,9 @@ and Latin-America.
 
 The HP assembler on these systems has some problems.  Most notably the
 assembler inserts timestamps into each object file it creates, causing
-the 3-stage comparison test to fail during a @samp{make bootstrap}.
-You should be able to continue by saying @samp{make all} after getting
-the failure from @samp{make bootstrap}.
+the 3-stage comparison test to fail during a bootstrap.
+You should be able to continue by saying @samp{make all-host all-target}
+after getting the failure from @samp{make}.
 
 GCC 4.0 requires CVS binutils as of April 28, 2004 or later.  Earlier
 versions require binutils 2.8 or later.
@@ -2912,10 +2957,10 @@ many limitations.  For example, it does not support weak symbols or alias
 definitions.  As a result, explicit template instantiations are required
 when using C++.  This makes it difficult if not impossible to build many
 C++ applications.  You can't generate debugging information when using
-the HP assembler.  Finally, @samp{make bootstrap} fails in the final
+the HP assembler.  Finally, bootstrapping fails in the final
 comparison of object modules due to the time stamps that it inserts into
 the modules.  The bootstrap can be continued from this point with
-@samp{make all}.
+@samp{make all-host all-target}.
 
 A recent linker patch must be installed for the correct operation of
 GCC 3.3 and later.  @code{PHSS_26559} and @code{PHSS_24304} are the
@@ -3080,7 +3125,7 @@ command like this:
 @emph{You should substitute @samp{i686} in the above command with the appropriate
 processor for your host.}
 
-After the usual @samp{make bootstrap} and
+After the usual @samp{make} and
 @samp{make install}, you can then access the UDK-targeted GCC
 tools by adding @command{udk-} before the commonly known name.  For
 example, to invoke the C compiler, you would use @command{udk-gcc}.
@@ -3129,9 +3174,6 @@ removed and the system libunwind library will always be used.
 @heading @anchor{x-ibm-aix}*-ibm-aix*
 Support for AIX version 3 and older was discontinued in GCC 3.4.
 
-AIX Make frequently has problems with GCC makefiles.  GNU Make 3.79.1 or
-newer is recommended to build on this platform.
-
 ``out of memory'' bootstrap failures may indicate a problem with
 process resource limits (ulimit).  Hard limits are configured in the
 @file{/etc/security/limits} system configuration file.
@@ -3144,8 +3186,8 @@ one may use GNU Bash instead of AIX @command{/bin/sh}, e.g.,
    % export CONFIG_SHELL
 @end smallexample
 
-and then proceed as described in @uref{build.html,,the build instructions},
-where we strongly recommend using GNU make and specifying an absolute path
+and then proceed as described in @uref{build.html,,the build
+instructions}, where we strongly recommend specifying an absolute path
 to invoke @var{srcdir}/configure.
 
 Errors involving @code{alloca} when building GCC generally are due
diff --git a/gcc/doc/makefile.texi b/gcc/doc/makefile.texi
index 3fb3072..8dcf496 100644
--- a/gcc/doc/makefile.texi
+++ b/gcc/doc/makefile.texi
@@ -7,6 +7,8 @@
 @cindex makefile targets
 @cindex targets, makefile
 
+These targets are available from the @samp{gcc} directory:
+
 @table @code
 @item all
 This is the default target.  Depending on what your build/host/target
@@ -72,49 +74,59 @@ make check-gcc RUNTESTFLAGS="execute.exp=19980413-*"
 
 Note that running the testsuite may require additional tools be
 installed, such as TCL or dejagnu.
+@end table
 
-@item bootstrap
-Builds GCC three times---once with the native compiler, once with the
-native-built compiler it just built, and once with the compiler it built
-the second time.  In theory, the last two should produce the same
-results, which @samp{make compare} can check.  Each step of this process
-is called a ``stage'', and the results of each stage @var{N}
-(@var{N} = 1@dots{}3) are copied to a subdirectory @file{stage@var{N}/}.
+The toplevel tree from which you start GCC compilation is not
+the GCC directory, but rather a complex Makefile that coordinates
+the various steps of the build, including bootstrapping the compiler
+and using the new compiler to build target libraries.
+
+When GCC is configured for a native configuration, the default action
+for @command{make} is to do a full three-stage bootstrap.  This means
+that GCC is built three times---once with the native compiler, once with
+the native-built compiler it just built, and once with the compiler it
+built the second time.  In theory, the last two should produce the same
+results, which @samp{make compare} can check.  Each stage is configured
+separately and compiled into a separate directory, to minimize problems
+due to ABI incompatibilities between the native compiler and GCC.
+
+If you do a change, rebuilding will also start from the first stage
+and ``bubble'' up the change through the three stages.  Each stage
+is taken from its build directory (if it had been built previously),
+rebuilt, and copied to its subdirectory.  This will allow you to, for
+example, continue a bootstrap after fixing a bug which causes the
+stage2 build to crash.  It does not provide as good coverage of the
+compiler as bootstrapping from scratch, but it ensures that the new
+code is syntactically correct (e.g. that you did not use GCC extensions
+by mistake), and avoids spurious bootstrap comparison
+failures@footnote{Except if the compiler was buggy and miscompiled
+  some of the files that were not modified.  In this case, it's best
+  to use @command{make restrap}.}.
+
+Other targets available from the top level include:
 
+@table @code
 @item bootstrap-lean
 Like @code{bootstrap}, except that the various stages are removed once
 they're no longer needed.  This saves disk space.
 
-@item bubblestrap
-This incrementally rebuilds each of the three stages, one at a time.
-It does this by ``bubbling'' the stages up from their subdirectories
-(if they had been built previously), rebuilding them, and copying them
-back to their subdirectories.  This will allow you to, for example,
-continue a bootstrap after fixing a bug which causes the stage2 build
-to crash.
+@item bootstrap2
+@itemx bootstrap2-lean
+Performs only the first two stages of bootstrap.  Unlike a three-stage
+bootstrap, this does not perform a comparison to test that the compiler
+is running properly.  Note that the disk space required by a ``lean''
+bootstrap is approximately independent of the number of stages.
 
-@item quickstrap
-Rebuilds the most recently built stage.  Since each stage requires
-special invocation, using this target means you don't have to keep
-track of which stage you're on or what invocation that stage needs.
+@item stage@var{N}-bubble (@var{N} = 1@dots{}4)
+Rebuild all the stages up to @var{N}, with the appropriate flags,
+``bubbling'' the changes as described above.
 
-@item cleanstrap
-Removed everything (@samp{make clean}) and rebuilds (@samp{make bootstrap}).
+@item all-stage@var{N} (@var{N} = 1@dots{}4)
+Assuming that stage @var{N} has already been built, rebuild it with the
+appropriate flags.  This is rarely needed.
 
-@item restrap
-Like @code{cleanstrap}, except that the process starts from the first
-stage build, not from scratch.
-
-@item stage@var{N} (@var{N} = 1@dots{}4)
-For each stage, moves the appropriate files to the @file{stage@var{N}}
-subdirectory.
-
-@item unstage@var{N} (@var{N} = 1@dots{}4)
-Undoes the corresponding @code{stage@var{N}}.
-
-@item restage@var{N} (@var{N} = 1@dots{}4)
-Undoes the corresponding @code{stage@var{N}} and rebuilds it with the
-appropriate flags.
+@item cleanstrap
+Remove everything (@samp{make clean}) and rebuilds (@samp{make bootstrap}).
 
 @item compare
 Compares the results of stages 2 and 3.  This ensures that the compiler
@@ -125,7 +137,53 @@ regardless of how it itself was compiled.
 Builds a compiler with profiling feedback information.  For more
 information, see
 @ref{Building,,Building with profile feedback,gccinstall,Installing GCC}.
-This is actually a target in the top-level directory, which then
-recurses into the @file{gcc} subdirectory multiple times.
+
+@item restrap
+Restart a bootstrap, so that everything that was not built with
+the system compiler is rebuilt.
+
+@item stage@var{N}-start (@var{N} = 1@dots{}4)
+For each package that is bootstrapped, rename directories so that,
+for example, @file{gcc} points to the stage@var{N} GCC, compiled
+with the stage@var{N-1} GCC@footnote{Customarily, the system compiler
+  is also termed the @file{stage0} GCC.}.
+
+You will invoke this target if you need to test or debug the
+stage@var{N} GCC.  If you only need to execute GCC (but you need
+not run @samp{make} either to rebuild it or to run test suites),
+you should be able to work directly in the @file{stage@var{N}-gcc}
+directory.  This makes it easier to debug multiple stages in
+parallel.
+
+@item stage
+For each package that is bootstrapped, relocate its build directory
+to indicate its stage.  For example, if the @file{gcc} directory
+points to the stage2 GCC, after invoking this target it will be
+renamed to @file{stage2-gcc}.
 
 @end table
+
+If you wish to use non-default GCC flags when compiling the stage2 and
+stage3 compilers, set @code{BOOT_CFLAGS} on the command line when doing
+@samp{make}.
+
+Usually, the first stage only builds the languages that the compiler
+is written in: typically, C and maybe Ada.  If you are debugging a
+miscompilation of a different stage2 front-end (for example, of the
+Fortran front-end), you may want to have front-ends for other languages
+in the first stage as well.  To do so, set @code{STAGE1_LANGUAGES}
+on the command line when doing @samp{make}.
+
+For example, in the aforementioned scenario of debugging a Fortran
+front-end miscompilation caused by the stage1 compiler, you may need a
+command like
+
+@example
+make stage2-bubble STAGE1_LANGUAGES=c,fortran
+@end example
+
+Alternatively, you can use per-language targets to build and test
+languages that are not enabled by default in stage1.  For example,
+@command{make f951} will build a Fortran compiler even in the stage1
+build directory.
+