public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/modula-2] Topological sort implemented for -fscaffold-static.
@ 2022-07-29 10:41 Gaius Mulley
  0 siblings, 0 replies; only message in thread
From: Gaius Mulley @ 2022-07-29 10:41 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:9fb8757161c51172f5c52d5d869d6b09079a4115

commit 9fb8757161c51172f5c52d5d869d6b09079a4115
Author: Gaius Mulley <gaius.mulley@southwales.ac.uk>
Date:   Fri Jul 29 11:41:17 2022 +0100

    Topological sort implemented for -fscaffold-static.
    
    This patch implements the compile time topological sort for resolving the
    module initialization order should -fscaffold-static be used.  It also fixes
    some library bugs (_finish renamed _fini).  The autoconf files were
    rebuilt using gnu autoconf-269.  Application link tests have been added.
    
    ChangeLog:
    
            * Makefile.in : Rebuilt.
            * configure : Rebuilt.
    
    gcc/m2/ChangeLog:
    
            * Make-lang.in (GM2-COMP-BOOT-DEFS): M2Graph.def added.
            (GM2-COMP-BOOT-MODS) M2Graph.mod added.
            (GM2-COMP-DEFS): M2Graph.def added.  (GM2-COMP-MODS) M2Graph.mod
            added.
            * gm2-compiler/M2Scaffold.mod (SymbolTable): Import identifiers
            IsImport, IsImportStatement, GetModuleDefImportStatementList,
            GetModuleModImportStatementList, GetImportModule and
            GetImportStatementList.  (Lists) Import KillList, IsItemInList.
            (addDependentStatement) New procedure.  (addDependentImport) New
            procedure.  (TopologicallySortList) New procedure function.
            (AddEntry) Only add name to ctorGlobals if ctorGlobals is non NIL.
            (AddModuleToCtor) Check that the module is not a DEFINITION FOR
            "C".  (WriteList) Renamed from WriteCtorList and pass list as a
            parameter.  (CreateCtorListFromImports) Extended to topologically
            sort the import dependency graph.
            * gm2-compiler/SymbolTable.mod: Corrected indentation.
            * mc/keyc.mod: Add "public" as a variable name to avoid.
            * gm2-compiler/M2Graph.def: New file.
            * gm2-compiler/M2Graph.mod: New file.
    
    libgm2/ChangeLog:
    
            * Makefile.in: Rebuilt.
            * aclocal.m4: Rebuilt.
            * configure: Rebuilt.
            * libm2cor/Makefile.in: Rebuilt.
            * libm2iso/Makefile.in: Rebuilt.
            * libm2log/Makefile.in: Rebuilt.
            * libm2min/Makefile.in: Rebuilt.
            * libm2pim/Makefile.in: Rebuilt.
            * libm2pim/UnixArgs.cc: Replaced _finish with _fini.
            * libm2pim/dtoa.cc: Replaced _finish with _fini.
            * libm2pim/ldtoa.cc: Replaced _finish with _fini.
    
    gcc/testsuite/gm2/ChangeLog:
    
            * projects/log/run/pass/hello/projects-log-run-pass-hello.exp: New file.
            * projects/log/run/pass/hello/hello.mod: New file.
            * projects/README: New file.
            * projects/iso/run/pass/hello/projects-iso-run-pass-hello.exp: New file.
            * projects/iso/run/pass/hello/hello.mod: New file.
            * projects/iso/run/pass/halma/halma.mod: New file.
            * projects/iso/run/pass/halma/projects-iso-run-pass-halma.exp: New file.
            * projects/pim/run/pass/hello/projects-pim-run-pass-hello.exp: New file.
            * projects/pim/run/pass/hello/hello.mod: New file.
            * projects/pim/run/pass/random/MakeBoxes.def: New file.
            * projects/pim/run/pass/random/AdvMap.def: New file.
            * projects/pim/run/pass/random/MakeBoxes.mod: New file.
            * projects/pim/run/pass/random/WriteMap.def: New file.
            * projects/pim/run/pass/random/Map.mod: New file.
            * projects/pim/run/pass/random/StoreCoords.mod: New file.
            * projects/pim/run/pass/random/Chance.mod: New file.
            * projects/pim/run/pass/random/MapOptions.mod: New file.
            * projects/pim/run/pass/random/Options.mod: New file.
            * projects/pim/run/pass/random/BoxMap.def: New file.
            * projects/pim/run/pass/random/StoreCoords.def: New file.
            * projects/pim/run/pass/random/MapOptions.def: New file.
            * projects/pim/run/pass/random/Options.def: New file.
            * projects/pim/run/pass/random/Chance.def: New file.
            * projects/pim/run/pass/random/projects-pim-run-pass-random.exp:
            New file.
            * projects/pim/run/pass/random/RoomMap.def: New file.
            * projects/pim/run/pass/random/WriteMap.mod: New file.
            * projects/pim/run/pass/random/Geometry.def: New file.
            * projects/pim/run/pass/random/AdvMap.mod: New file.
            * projects/pim/run/pass/random/RoomMap.mod: New file.
            * projects/pim/run/pass/random/Geometry.mod: New file.
            * projects/pim/run/pass/random/BoxMap.mod: New file.
    
    Signed-off-by: Gaius Mulley <gaius.mulley@southwales.ac.uk>

Diff:
---
 Makefile.in                                        | 3182 +++++++++-----------
 configure                                          |   14 +-
 gcc/m2/Make-lang.in                                |    8 +-
 gcc/m2/gm2-compiler/M2Graph.def                    |   58 +
 gcc/m2/gm2-compiler/M2Graph.mod                    |  234 ++
 gcc/m2/gm2-compiler/M2Scaffold.mod                 |  143 +-
 gcc/m2/gm2-compiler/SymbolTable.mod                |    4 +-
 gcc/m2/gm2spec.cc                                  |    4 +-
 gcc/m2/mc/keyc.mod                                 |    3 +-
 gcc/testsuite/gm2/projects/README                  |    3 +
 .../gm2/projects/iso/run/pass/halma/halma.mod      | 1952 ++++++++++++
 .../run/pass/halma/projects-iso-run-pass-halma.exp |   40 +
 .../gm2/projects/iso/run/pass/hello/hello.mod      |    7 +
 .../run/pass/hello/projects-iso-run-pass-hello.exp |   40 +
 .../gm2/projects/log/run/pass/hello/hello.mod      |    7 +
 .../run/pass/hello/projects-log-run-pass-hello.exp |   40 +
 .../gm2/projects/pim/run/pass/hello/hello.mod      |    7 +
 .../run/pass/hello/projects-pim-run-pass-hello.exp |   40 +
 .../gm2/projects/pim/run/pass/random/AdvMap.def    |  107 +
 .../gm2/projects/pim/run/pass/random/AdvMap.mod    |  420 +++
 .../gm2/projects/pim/run/pass/random/BoxMap.def    |   81 +
 .../gm2/projects/pim/run/pass/random/BoxMap.mod    | 1784 +++++++++++
 .../gm2/projects/pim/run/pass/random/Chance.def    |   87 +
 .../gm2/projects/pim/run/pass/random/Chance.mod    |  222 ++
 .../gm2/projects/pim/run/pass/random/Geometry.def  |  100 +
 .../gm2/projects/pim/run/pass/random/Geometry.mod  |  155 +
 .../gm2/projects/pim/run/pass/random/MakeBoxes.def |   67 +
 .../gm2/projects/pim/run/pass/random/MakeBoxes.mod |  238 ++
 .../gm2/projects/pim/run/pass/random/Map.mod       |   30 +
 .../projects/pim/run/pass/random/MapOptions.def    |   51 +
 .../projects/pim/run/pass/random/MapOptions.mod    |   51 +
 .../gm2/projects/pim/run/pass/random/Options.def   |   47 +
 .../gm2/projects/pim/run/pass/random/Options.mod   |  171 ++
 .../gm2/projects/pim/run/pass/random/RoomMap.def   |   91 +
 .../gm2/projects/pim/run/pass/random/RoomMap.mod   | 1497 +++++++++
 .../projects/pim/run/pass/random/StoreCoords.def   |   72 +
 .../projects/pim/run/pass/random/StoreCoords.mod   |  235 ++
 .../gm2/projects/pim/run/pass/random/WriteMap.def  |   48 +
 .../gm2/projects/pim/run/pass/random/WriteMap.mod  |  185 ++
 .../pass/random/projects-pim-run-pass-random.exp   |   51 +
 libgm2/Makefile.in                                 |   13 +-
 libgm2/aclocal.m4                                  |  200 +-
 libgm2/configure                                   |  218 +-
 libgm2/libm2cor/Makefile.in                        |  114 +-
 libgm2/libm2iso/Makefile.in                        |   72 +-
 libgm2/libm2log/Makefile.in                        |   49 +-
 libgm2/libm2min/Makefile.in                        |   49 +-
 libgm2/libm2pim/Makefile.in                        |  117 +-
 libgm2/libm2pim/UnixArgs.cc                        |    4 +-
 libgm2/libm2pim/dtoa.cc                            |    4 +-
 libgm2/libm2pim/ldtoa.cc                           |    4 +-
 51 files changed, 10164 insertions(+), 2256 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 4fdd484c02b..a717c8c4e8b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1065,10 +1065,7 @@ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
 # cross-building scheme.
 EXTRA_GCC_FLAGS = \
 	"GCC_FOR_TARGET=$(GCC_FOR_TARGET) $$TFLAGS" \
-<<<<<<< HEAD
 	"GM2_FOR_TARGET=$(GM2_FOR_TARGET) $$TFLAGS" \
-=======
->>>>>>> master
 	"`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
 
@@ -1133,7 +1130,6 @@ configure-host:  \
     maybe-configure-gnattools \
     maybe-configure-lto-plugin \
     maybe-configure-libcc1 \
-    maybe-configure-gm2tools \
     maybe-configure-gotools \
     maybe-configure-libctf
 .PHONY: configure-target
@@ -1312,7 +1308,6 @@ all-host: maybe-all-gnattools
 all-host: maybe-all-lto-plugin
 @endif lto-plugin-no-bootstrap
 all-host: maybe-all-libcc1
-all-host: maybe-all-gm2tools
 all-host: maybe-all-gotools
 @if libctf-no-bootstrap
 all-host: maybe-all-libctf
@@ -1429,7 +1424,6 @@ info-host: maybe-info-c++tools
 info-host: maybe-info-gnattools
 info-host: maybe-info-lto-plugin
 info-host: maybe-info-libcc1
-info-host: maybe-info-gm2tools
 info-host: maybe-info-gotools
 info-host: maybe-info-libctf
 
@@ -1521,7 +1515,6 @@ dvi-host: maybe-dvi-c++tools
 dvi-host: maybe-dvi-gnattools
 dvi-host: maybe-dvi-lto-plugin
 dvi-host: maybe-dvi-libcc1
-dvi-host: maybe-dvi-gm2tools
 dvi-host: maybe-dvi-gotools
 dvi-host: maybe-dvi-libctf
 
@@ -1613,7 +1606,6 @@ pdf-host: maybe-pdf-c++tools
 pdf-host: maybe-pdf-gnattools
 pdf-host: maybe-pdf-lto-plugin
 pdf-host: maybe-pdf-libcc1
-pdf-host: maybe-pdf-gm2tools
 pdf-host: maybe-pdf-gotools
 pdf-host: maybe-pdf-libctf
 
@@ -1705,7 +1697,6 @@ html-host: maybe-html-c++tools
 html-host: maybe-html-gnattools
 html-host: maybe-html-lto-plugin
 html-host: maybe-html-libcc1
-html-host: maybe-html-gm2tools
 html-host: maybe-html-gotools
 html-host: maybe-html-libctf
 
@@ -1797,7 +1788,6 @@ TAGS-host: maybe-TAGS-c++tools
 TAGS-host: maybe-TAGS-gnattools
 TAGS-host: maybe-TAGS-lto-plugin
 TAGS-host: maybe-TAGS-libcc1
-TAGS-host: maybe-TAGS-gm2tools
 TAGS-host: maybe-TAGS-gotools
 TAGS-host: maybe-TAGS-libctf
 
@@ -1889,7 +1879,6 @@ install-info-host: maybe-install-info-c++tools
 install-info-host: maybe-install-info-gnattools
 install-info-host: maybe-install-info-lto-plugin
 install-info-host: maybe-install-info-libcc1
-install-info-host: maybe-install-info-gm2tools
 install-info-host: maybe-install-info-gotools
 install-info-host: maybe-install-info-libctf
 
@@ -1981,7 +1970,6 @@ install-dvi-host: maybe-install-dvi-c++tools
 install-dvi-host: maybe-install-dvi-gnattools
 install-dvi-host: maybe-install-dvi-lto-plugin
 install-dvi-host: maybe-install-dvi-libcc1
-install-dvi-host: maybe-install-dvi-gm2tools
 install-dvi-host: maybe-install-dvi-gotools
 install-dvi-host: maybe-install-dvi-libctf
 
@@ -2073,7 +2061,6 @@ install-pdf-host: maybe-install-pdf-c++tools
 install-pdf-host: maybe-install-pdf-gnattools
 install-pdf-host: maybe-install-pdf-lto-plugin
 install-pdf-host: maybe-install-pdf-libcc1
-install-pdf-host: maybe-install-pdf-gm2tools
 install-pdf-host: maybe-install-pdf-gotools
 install-pdf-host: maybe-install-pdf-libctf
 
@@ -2165,7 +2152,6 @@ install-html-host: maybe-install-html-c++tools
 install-html-host: maybe-install-html-gnattools
 install-html-host: maybe-install-html-lto-plugin
 install-html-host: maybe-install-html-libcc1
-install-html-host: maybe-install-html-gm2tools
 install-html-host: maybe-install-html-gotools
 install-html-host: maybe-install-html-libctf
 
@@ -2257,7 +2243,6 @@ installcheck-host: maybe-installcheck-c++tools
 installcheck-host: maybe-installcheck-gnattools
 installcheck-host: maybe-installcheck-lto-plugin
 installcheck-host: maybe-installcheck-libcc1
-installcheck-host: maybe-installcheck-gm2tools
 installcheck-host: maybe-installcheck-gotools
 installcheck-host: maybe-installcheck-libctf
 
@@ -2349,7 +2334,6 @@ mostlyclean-host: maybe-mostlyclean-c++tools
 mostlyclean-host: maybe-mostlyclean-gnattools
 mostlyclean-host: maybe-mostlyclean-lto-plugin
 mostlyclean-host: maybe-mostlyclean-libcc1
-mostlyclean-host: maybe-mostlyclean-gm2tools
 mostlyclean-host: maybe-mostlyclean-gotools
 mostlyclean-host: maybe-mostlyclean-libctf
 
@@ -2441,7 +2425,6 @@ clean-host: maybe-clean-c++tools
 clean-host: maybe-clean-gnattools
 clean-host: maybe-clean-lto-plugin
 clean-host: maybe-clean-libcc1
-clean-host: maybe-clean-gm2tools
 clean-host: maybe-clean-gotools
 clean-host: maybe-clean-libctf
 
@@ -2533,7 +2516,6 @@ distclean-host: maybe-distclean-c++tools
 distclean-host: maybe-distclean-gnattools
 distclean-host: maybe-distclean-lto-plugin
 distclean-host: maybe-distclean-libcc1
-distclean-host: maybe-distclean-gm2tools
 distclean-host: maybe-distclean-gotools
 distclean-host: maybe-distclean-libctf
 
@@ -2625,7 +2607,6 @@ maintainer-clean-host: maybe-maintainer-clean-c++tools
 maintainer-clean-host: maybe-maintainer-clean-gnattools
 maintainer-clean-host: maybe-maintainer-clean-lto-plugin
 maintainer-clean-host: maybe-maintainer-clean-libcc1
-maintainer-clean-host: maybe-maintainer-clean-gm2tools
 maintainer-clean-host: maybe-maintainer-clean-gotools
 maintainer-clean-host: maybe-maintainer-clean-libctf
 
@@ -2702,7 +2683,7 @@ local-distclean:
 	-rm -f texinfo/doc/Makefile texinfo/po/POTFILES
 	-rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
 	-rmdir texinfo/makeinfo texinfo/po texinfo/util 2>/dev/null
-	-rmdir c++tools fastjar gcc gnattools gm2tools gotools 2>/dev/null
+	-rmdir c++tools fastjar gcc gnattools gotools 2>/dev/null
 	-rmdir libcc1 libiberty texinfo zlib 2>/dev/null
 	-find . -name config.cache -exec rm -f {} \; \; 2>/dev/null
 
@@ -2775,7 +2756,6 @@ check-host:  \
     maybe-check-gnattools \
     maybe-check-lto-plugin \
     maybe-check-libcc1 \
-    maybe-check-gm2tools \
     maybe-check-gotools \
     maybe-check-libctf
 
@@ -2914,7 +2894,6 @@ install-host-nogcc:  \
     maybe-install-gnattools \
     maybe-install-lto-plugin \
     maybe-install-libcc1 \
-    maybe-install-gm2tools \
     maybe-install-gotools \
     maybe-install-libctf
 
@@ -2970,7 +2949,6 @@ install-host:  \
     maybe-install-gnattools \
     maybe-install-lto-plugin \
     maybe-install-libcc1 \
-    maybe-install-gm2tools \
     maybe-install-gotools \
     maybe-install-libctf
 
@@ -3082,7 +3060,6 @@ install-strip-host:  \
     maybe-install-strip-gnattools \
     maybe-install-strip-lto-plugin \
     maybe-install-strip-libcc1 \
-    maybe-install-strip-gm2tools \
     maybe-install-strip-gotools \
     maybe-install-strip-libctf
 
@@ -3164,7 +3141,7 @@ configure-build-libiberty: stage_current
 @endif gcc-bootstrap
 @if build-libiberty
 maybe-configure-build-libiberty: configure-build-libiberty
-configure-build-libiberty:
+configure-build-libiberty: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3221,7 +3198,7 @@ configure-build-bison: stage_current
 @endif gcc-bootstrap
 @if build-bison
 maybe-configure-build-bison: configure-build-bison
-configure-build-bison:
+configure-build-bison: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3278,7 +3255,7 @@ configure-build-flex: stage_current
 @endif gcc-bootstrap
 @if build-flex
 maybe-configure-build-flex: configure-build-flex
-configure-build-flex:
+configure-build-flex: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3335,7 +3312,7 @@ configure-build-m4: stage_current
 @endif gcc-bootstrap
 @if build-m4
 maybe-configure-build-m4: configure-build-m4
-configure-build-m4:
+configure-build-m4: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3392,7 +3369,7 @@ configure-build-texinfo: stage_current
 @endif gcc-bootstrap
 @if build-texinfo
 maybe-configure-build-texinfo: configure-build-texinfo
-configure-build-texinfo:
+configure-build-texinfo: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3449,7 +3426,7 @@ configure-build-fixincludes: stage_current
 @endif gcc-bootstrap
 @if build-fixincludes
 maybe-configure-build-fixincludes: configure-build-fixincludes
-configure-build-fixincludes:
+configure-build-fixincludes: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3506,7 +3483,7 @@ configure-build-libcpp: stage_current
 @endif gcc-bootstrap
 @if build-libcpp
 maybe-configure-build-libcpp: configure-build-libcpp
-configure-build-libcpp:
+configure-build-libcpp: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3568,7 +3545,7 @@ configure-bfd: stage_current
 @endif gcc-bootstrap
 @if bfd
 maybe-configure-bfd: configure-bfd
-configure-bfd:
+configure-bfd: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
@@ -4355,7 +4332,7 @@ maybe-info-bfd:
 maybe-info-bfd: info-bfd
 
 info-bfd: \
-    configure-bfd
+    configure-bfd 
 	@[ -f ./bfd/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4380,7 +4357,7 @@ maybe-dvi-bfd:
 maybe-dvi-bfd: dvi-bfd
 
 dvi-bfd: \
-    configure-bfd
+    configure-bfd 
 	@[ -f ./bfd/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4405,7 +4382,7 @@ maybe-pdf-bfd:
 maybe-pdf-bfd: pdf-bfd
 
 pdf-bfd: \
-    configure-bfd
+    configure-bfd 
 	@[ -f ./bfd/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4430,7 +4407,7 @@ maybe-html-bfd:
 maybe-html-bfd: html-bfd
 
 html-bfd: \
-    configure-bfd
+    configure-bfd 
 	@[ -f ./bfd/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4455,7 +4432,7 @@ maybe-TAGS-bfd:
 maybe-TAGS-bfd: TAGS-bfd
 
 TAGS-bfd: \
-    configure-bfd
+    configure-bfd 
 	@[ -f ./bfd/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4481,7 +4458,7 @@ maybe-install-info-bfd: install-info-bfd
 
 install-info-bfd: \
     configure-bfd \
-    info-bfd
+    info-bfd 
 	@[ -f ./bfd/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4507,7 +4484,7 @@ maybe-install-dvi-bfd: install-dvi-bfd
 
 install-dvi-bfd: \
     configure-bfd \
-    dvi-bfd
+    dvi-bfd 
 	@[ -f ./bfd/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4533,7 +4510,7 @@ maybe-install-pdf-bfd: install-pdf-bfd
 
 install-pdf-bfd: \
     configure-bfd \
-    pdf-bfd
+    pdf-bfd 
 	@[ -f ./bfd/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4559,7 +4536,7 @@ maybe-install-html-bfd: install-html-bfd
 
 install-html-bfd: \
     configure-bfd \
-    html-bfd
+    html-bfd 
 	@[ -f ./bfd/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4584,7 +4561,7 @@ maybe-installcheck-bfd:
 maybe-installcheck-bfd: installcheck-bfd
 
 installcheck-bfd: \
-    configure-bfd
+    configure-bfd 
 	@[ -f ./bfd/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4608,7 +4585,7 @@ maybe-mostlyclean-bfd:
 @if bfd
 maybe-mostlyclean-bfd: mostlyclean-bfd
 
-mostlyclean-bfd:
+mostlyclean-bfd: 
 	@[ -f ./bfd/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4632,7 +4609,7 @@ maybe-clean-bfd:
 @if bfd
 maybe-clean-bfd: clean-bfd
 
-clean-bfd:
+clean-bfd: 
 	@[ -f ./bfd/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4656,7 +4633,7 @@ maybe-distclean-bfd:
 @if bfd
 maybe-distclean-bfd: distclean-bfd
 
-distclean-bfd:
+distclean-bfd: 
 	@[ -f ./bfd/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4680,7 +4657,7 @@ maybe-maintainer-clean-bfd:
 @if bfd
 maybe-maintainer-clean-bfd: maintainer-clean-bfd
 
-maintainer-clean-bfd:
+maintainer-clean-bfd: 
 	@[ -f ./bfd/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -4708,7 +4685,7 @@ configure-opcodes: stage_current
 @endif gcc-bootstrap
 @if opcodes
 maybe-configure-opcodes: configure-opcodes
-configure-opcodes:
+configure-opcodes: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
@@ -5495,7 +5472,7 @@ maybe-info-opcodes:
 maybe-info-opcodes: info-opcodes
 
 info-opcodes: \
-    configure-opcodes
+    configure-opcodes 
 	@[ -f ./opcodes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5520,7 +5497,7 @@ maybe-dvi-opcodes:
 maybe-dvi-opcodes: dvi-opcodes
 
 dvi-opcodes: \
-    configure-opcodes
+    configure-opcodes 
 	@[ -f ./opcodes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5545,7 +5522,7 @@ maybe-pdf-opcodes:
 maybe-pdf-opcodes: pdf-opcodes
 
 pdf-opcodes: \
-    configure-opcodes
+    configure-opcodes 
 	@[ -f ./opcodes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5570,7 +5547,7 @@ maybe-html-opcodes:
 maybe-html-opcodes: html-opcodes
 
 html-opcodes: \
-    configure-opcodes
+    configure-opcodes 
 	@[ -f ./opcodes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5595,7 +5572,7 @@ maybe-TAGS-opcodes:
 maybe-TAGS-opcodes: TAGS-opcodes
 
 TAGS-opcodes: \
-    configure-opcodes
+    configure-opcodes 
 	@[ -f ./opcodes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5621,7 +5598,7 @@ maybe-install-info-opcodes: install-info-opcodes
 
 install-info-opcodes: \
     configure-opcodes \
-    info-opcodes
+    info-opcodes 
 	@[ -f ./opcodes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5647,7 +5624,7 @@ maybe-install-dvi-opcodes: install-dvi-opcodes
 
 install-dvi-opcodes: \
     configure-opcodes \
-    dvi-opcodes
+    dvi-opcodes 
 	@[ -f ./opcodes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5673,7 +5650,7 @@ maybe-install-pdf-opcodes: install-pdf-opcodes
 
 install-pdf-opcodes: \
     configure-opcodes \
-    pdf-opcodes
+    pdf-opcodes 
 	@[ -f ./opcodes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5699,7 +5676,7 @@ maybe-install-html-opcodes: install-html-opcodes
 
 install-html-opcodes: \
     configure-opcodes \
-    html-opcodes
+    html-opcodes 
 	@[ -f ./opcodes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5724,7 +5701,7 @@ maybe-installcheck-opcodes:
 maybe-installcheck-opcodes: installcheck-opcodes
 
 installcheck-opcodes: \
-    configure-opcodes
+    configure-opcodes 
 	@[ -f ./opcodes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5748,7 +5725,7 @@ maybe-mostlyclean-opcodes:
 @if opcodes
 maybe-mostlyclean-opcodes: mostlyclean-opcodes
 
-mostlyclean-opcodes:
+mostlyclean-opcodes: 
 	@[ -f ./opcodes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5772,7 +5749,7 @@ maybe-clean-opcodes:
 @if opcodes
 maybe-clean-opcodes: clean-opcodes
 
-clean-opcodes:
+clean-opcodes: 
 	@[ -f ./opcodes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5796,7 +5773,7 @@ maybe-distclean-opcodes:
 @if opcodes
 maybe-distclean-opcodes: distclean-opcodes
 
-distclean-opcodes:
+distclean-opcodes: 
 	@[ -f ./opcodes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5820,7 +5797,7 @@ maybe-maintainer-clean-opcodes:
 @if opcodes
 maybe-maintainer-clean-opcodes: maintainer-clean-opcodes
 
-maintainer-clean-opcodes:
+maintainer-clean-opcodes: 
 	@[ -f ./opcodes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5848,7 +5825,7 @@ configure-binutils: stage_current
 @endif gcc-bootstrap
 @if binutils
 maybe-configure-binutils: configure-binutils
-configure-binutils:
+configure-binutils: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
@@ -6635,7 +6612,7 @@ maybe-info-binutils:
 maybe-info-binutils: info-binutils
 
 info-binutils: \
-    configure-binutils
+    configure-binutils 
 	@[ -f ./binutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6660,7 +6637,7 @@ maybe-dvi-binutils:
 maybe-dvi-binutils: dvi-binutils
 
 dvi-binutils: \
-    configure-binutils
+    configure-binutils 
 	@[ -f ./binutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6685,7 +6662,7 @@ maybe-pdf-binutils:
 maybe-pdf-binutils: pdf-binutils
 
 pdf-binutils: \
-    configure-binutils
+    configure-binutils 
 	@[ -f ./binutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6710,7 +6687,7 @@ maybe-html-binutils:
 maybe-html-binutils: html-binutils
 
 html-binutils: \
-    configure-binutils
+    configure-binutils 
 	@[ -f ./binutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6735,7 +6712,7 @@ maybe-TAGS-binutils:
 maybe-TAGS-binutils: TAGS-binutils
 
 TAGS-binutils: \
-    configure-binutils
+    configure-binutils 
 	@[ -f ./binutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6761,7 +6738,7 @@ maybe-install-info-binutils: install-info-binutils
 
 install-info-binutils: \
     configure-binutils \
-    info-binutils
+    info-binutils 
 	@[ -f ./binutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6787,7 +6764,7 @@ maybe-install-dvi-binutils: install-dvi-binutils
 
 install-dvi-binutils: \
     configure-binutils \
-    dvi-binutils
+    dvi-binutils 
 	@[ -f ./binutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6813,7 +6790,7 @@ maybe-install-pdf-binutils: install-pdf-binutils
 
 install-pdf-binutils: \
     configure-binutils \
-    pdf-binutils
+    pdf-binutils 
 	@[ -f ./binutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6839,7 +6816,7 @@ maybe-install-html-binutils: install-html-binutils
 
 install-html-binutils: \
     configure-binutils \
-    html-binutils
+    html-binutils 
 	@[ -f ./binutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6864,7 +6841,7 @@ maybe-installcheck-binutils:
 maybe-installcheck-binutils: installcheck-binutils
 
 installcheck-binutils: \
-    configure-binutils
+    configure-binutils 
 	@[ -f ./binutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6888,7 +6865,7 @@ maybe-mostlyclean-binutils:
 @if binutils
 maybe-mostlyclean-binutils: mostlyclean-binutils
 
-mostlyclean-binutils:
+mostlyclean-binutils: 
 	@[ -f ./binutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6912,7 +6889,7 @@ maybe-clean-binutils:
 @if binutils
 maybe-clean-binutils: clean-binutils
 
-clean-binutils:
+clean-binutils: 
 	@[ -f ./binutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6936,7 +6913,7 @@ maybe-distclean-binutils:
 @if binutils
 maybe-distclean-binutils: distclean-binutils
 
-distclean-binutils:
+distclean-binutils: 
 	@[ -f ./binutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6960,7 +6937,7 @@ maybe-maintainer-clean-binutils:
 @if binutils
 maybe-maintainer-clean-binutils: maintainer-clean-binutils
 
-maintainer-clean-binutils:
+maintainer-clean-binutils: 
 	@[ -f ./binutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6988,7 +6965,7 @@ configure-bison: stage_current
 @endif gcc-bootstrap
 @if bison
 maybe-configure-bison: configure-bison
-configure-bison:
+configure-bison: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7092,7 +7069,7 @@ maybe-info-bison:
 maybe-info-bison: info-bison
 
 info-bison: \
-    configure-bison
+    configure-bison 
 	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7118,7 +7095,7 @@ maybe-dvi-bison:
 maybe-dvi-bison: dvi-bison
 
 dvi-bison: \
-    configure-bison
+    configure-bison 
 	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7144,7 +7121,7 @@ maybe-pdf-bison:
 maybe-pdf-bison: pdf-bison
 
 pdf-bison: \
-    configure-bison
+    configure-bison 
 	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7170,7 +7147,7 @@ maybe-html-bison:
 maybe-html-bison: html-bison
 
 html-bison: \
-    configure-bison
+    configure-bison 
 	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7196,7 +7173,7 @@ maybe-TAGS-bison:
 maybe-TAGS-bison: TAGS-bison
 
 TAGS-bison: \
-    configure-bison
+    configure-bison 
 	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7223,7 +7200,7 @@ maybe-install-info-bison: install-info-bison
 
 install-info-bison: \
     configure-bison \
-    info-bison
+    info-bison 
 	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7250,7 +7227,7 @@ maybe-install-dvi-bison: install-dvi-bison
 
 install-dvi-bison: \
     configure-bison \
-    dvi-bison
+    dvi-bison 
 	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7277,7 +7254,7 @@ maybe-install-pdf-bison: install-pdf-bison
 
 install-pdf-bison: \
     configure-bison \
-    pdf-bison
+    pdf-bison 
 	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7304,7 +7281,7 @@ maybe-install-html-bison: install-html-bison
 
 install-html-bison: \
     configure-bison \
-    html-bison
+    html-bison 
 	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7330,7 +7307,7 @@ maybe-installcheck-bison:
 maybe-installcheck-bison: installcheck-bison
 
 installcheck-bison: \
-    configure-bison
+    configure-bison 
 	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7355,7 +7332,7 @@ maybe-mostlyclean-bison:
 @if bison
 maybe-mostlyclean-bison: mostlyclean-bison
 
-mostlyclean-bison:
+mostlyclean-bison: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7380,7 +7357,7 @@ maybe-clean-bison:
 @if bison
 maybe-clean-bison: clean-bison
 
-clean-bison:
+clean-bison: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7405,7 +7382,7 @@ maybe-distclean-bison:
 @if bison
 maybe-distclean-bison: distclean-bison
 
-distclean-bison:
+distclean-bison: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7430,7 +7407,7 @@ maybe-maintainer-clean-bison:
 @if bison
 maybe-maintainer-clean-bison: maintainer-clean-bison
 
-maintainer-clean-bison:
+maintainer-clean-bison: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7459,7 +7436,7 @@ configure-cgen: stage_current
 @endif gcc-bootstrap
 @if cgen
 maybe-configure-cgen: configure-cgen
-configure-cgen:
+configure-cgen: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7560,7 +7537,7 @@ maybe-info-cgen:
 maybe-info-cgen: info-cgen
 
 info-cgen: \
-    configure-cgen
+    configure-cgen 
 	@: $(MAKE); $(unstage)
 	@[ -f ./cgen/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7586,7 +7563,7 @@ maybe-dvi-cgen:
 maybe-dvi-cgen: dvi-cgen
 
 dvi-cgen: \
-    configure-cgen
+    configure-cgen 
 	@: $(MAKE); $(unstage)
 	@[ -f ./cgen/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7612,7 +7589,7 @@ maybe-pdf-cgen:
 maybe-pdf-cgen: pdf-cgen
 
 pdf-cgen: \
-    configure-cgen
+    configure-cgen 
 	@: $(MAKE); $(unstage)
 	@[ -f ./cgen/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7638,7 +7615,7 @@ maybe-html-cgen:
 maybe-html-cgen: html-cgen
 
 html-cgen: \
-    configure-cgen
+    configure-cgen 
 	@: $(MAKE); $(unstage)
 	@[ -f ./cgen/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7664,7 +7641,7 @@ maybe-TAGS-cgen:
 maybe-TAGS-cgen: TAGS-cgen
 
 TAGS-cgen: \
-    configure-cgen
+    configure-cgen 
 	@: $(MAKE); $(unstage)
 	@[ -f ./cgen/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7691,7 +7668,7 @@ maybe-install-info-cgen: install-info-cgen
 
 install-info-cgen: \
     configure-cgen \
-    info-cgen
+    info-cgen 
 	@: $(MAKE); $(unstage)
 	@[ -f ./cgen/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7718,7 +7695,7 @@ maybe-install-dvi-cgen: install-dvi-cgen
 
 install-dvi-cgen: \
     configure-cgen \
-    dvi-cgen
+    dvi-cgen 
 	@: $(MAKE); $(unstage)
 	@[ -f ./cgen/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7745,7 +7722,7 @@ maybe-install-pdf-cgen: install-pdf-cgen
 
 install-pdf-cgen: \
     configure-cgen \
-    pdf-cgen
+    pdf-cgen 
 	@: $(MAKE); $(unstage)
 	@[ -f ./cgen/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7772,7 +7749,7 @@ maybe-install-html-cgen: install-html-cgen
 
 install-html-cgen: \
     configure-cgen \
-    html-cgen
+    html-cgen 
 	@: $(MAKE); $(unstage)
 	@[ -f ./cgen/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7798,7 +7775,7 @@ maybe-installcheck-cgen:
 maybe-installcheck-cgen: installcheck-cgen
 
 installcheck-cgen: \
-    configure-cgen
+    configure-cgen 
 	@: $(MAKE); $(unstage)
 	@[ -f ./cgen/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7823,7 +7800,7 @@ maybe-mostlyclean-cgen:
 @if cgen
 maybe-mostlyclean-cgen: mostlyclean-cgen
 
-mostlyclean-cgen:
+mostlyclean-cgen: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./cgen/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7848,7 +7825,7 @@ maybe-clean-cgen:
 @if cgen
 maybe-clean-cgen: clean-cgen
 
-clean-cgen:
+clean-cgen: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./cgen/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7873,7 +7850,7 @@ maybe-distclean-cgen:
 @if cgen
 maybe-distclean-cgen: distclean-cgen
 
-distclean-cgen:
+distclean-cgen: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./cgen/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7898,7 +7875,7 @@ maybe-maintainer-clean-cgen:
 @if cgen
 maybe-maintainer-clean-cgen: maintainer-clean-cgen
 
-maintainer-clean-cgen:
+maintainer-clean-cgen: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./cgen/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -7927,7 +7904,7 @@ configure-dejagnu: stage_current
 @endif gcc-bootstrap
 @if dejagnu
 maybe-configure-dejagnu: configure-dejagnu
-configure-dejagnu:
+configure-dejagnu: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8028,7 +8005,7 @@ maybe-info-dejagnu:
 maybe-info-dejagnu: info-dejagnu
 
 info-dejagnu: \
-    configure-dejagnu
+    configure-dejagnu 
 	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8054,7 +8031,7 @@ maybe-dvi-dejagnu:
 maybe-dvi-dejagnu: dvi-dejagnu
 
 dvi-dejagnu: \
-    configure-dejagnu
+    configure-dejagnu 
 	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8080,7 +8057,7 @@ maybe-pdf-dejagnu:
 maybe-pdf-dejagnu: pdf-dejagnu
 
 pdf-dejagnu: \
-    configure-dejagnu
+    configure-dejagnu 
 	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8106,7 +8083,7 @@ maybe-html-dejagnu:
 maybe-html-dejagnu: html-dejagnu
 
 html-dejagnu: \
-    configure-dejagnu
+    configure-dejagnu 
 	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8132,7 +8109,7 @@ maybe-TAGS-dejagnu:
 maybe-TAGS-dejagnu: TAGS-dejagnu
 
 TAGS-dejagnu: \
-    configure-dejagnu
+    configure-dejagnu 
 	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8159,7 +8136,7 @@ maybe-install-info-dejagnu: install-info-dejagnu
 
 install-info-dejagnu: \
     configure-dejagnu \
-    info-dejagnu
+    info-dejagnu 
 	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8186,7 +8163,7 @@ maybe-install-dvi-dejagnu: install-dvi-dejagnu
 
 install-dvi-dejagnu: \
     configure-dejagnu \
-    dvi-dejagnu
+    dvi-dejagnu 
 	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8213,7 +8190,7 @@ maybe-install-pdf-dejagnu: install-pdf-dejagnu
 
 install-pdf-dejagnu: \
     configure-dejagnu \
-    pdf-dejagnu
+    pdf-dejagnu 
 	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8240,7 +8217,7 @@ maybe-install-html-dejagnu: install-html-dejagnu
 
 install-html-dejagnu: \
     configure-dejagnu \
-    html-dejagnu
+    html-dejagnu 
 	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8266,7 +8243,7 @@ maybe-installcheck-dejagnu:
 maybe-installcheck-dejagnu: installcheck-dejagnu
 
 installcheck-dejagnu: \
-    configure-dejagnu
+    configure-dejagnu 
 	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8291,7 +8268,7 @@ maybe-mostlyclean-dejagnu:
 @if dejagnu
 maybe-mostlyclean-dejagnu: mostlyclean-dejagnu
 
-mostlyclean-dejagnu:
+mostlyclean-dejagnu: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8316,7 +8293,7 @@ maybe-clean-dejagnu:
 @if dejagnu
 maybe-clean-dejagnu: clean-dejagnu
 
-clean-dejagnu:
+clean-dejagnu: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8341,7 +8318,7 @@ maybe-distclean-dejagnu:
 @if dejagnu
 maybe-distclean-dejagnu: distclean-dejagnu
 
-distclean-dejagnu:
+distclean-dejagnu: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8366,7 +8343,7 @@ maybe-maintainer-clean-dejagnu:
 @if dejagnu
 maybe-maintainer-clean-dejagnu: maintainer-clean-dejagnu
 
-maintainer-clean-dejagnu:
+maintainer-clean-dejagnu: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8395,7 +8372,7 @@ configure-etc: stage_current
 @endif gcc-bootstrap
 @if etc
 maybe-configure-etc: configure-etc
-configure-etc:
+configure-etc: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8496,7 +8473,7 @@ maybe-info-etc:
 maybe-info-etc: info-etc
 
 info-etc: \
-    configure-etc
+    configure-etc 
 	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8522,7 +8499,7 @@ maybe-dvi-etc:
 maybe-dvi-etc: dvi-etc
 
 dvi-etc: \
-    configure-etc
+    configure-etc 
 	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8548,7 +8525,7 @@ maybe-pdf-etc:
 maybe-pdf-etc: pdf-etc
 
 pdf-etc: \
-    configure-etc
+    configure-etc 
 	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8574,7 +8551,7 @@ maybe-html-etc:
 maybe-html-etc: html-etc
 
 html-etc: \
-    configure-etc
+    configure-etc 
 	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8600,7 +8577,7 @@ maybe-TAGS-etc:
 maybe-TAGS-etc: TAGS-etc
 
 TAGS-etc: \
-    configure-etc
+    configure-etc 
 	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8627,7 +8604,7 @@ maybe-install-info-etc: install-info-etc
 
 install-info-etc: \
     configure-etc \
-    info-etc
+    info-etc 
 	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8654,7 +8631,7 @@ maybe-install-dvi-etc: install-dvi-etc
 
 install-dvi-etc: \
     configure-etc \
-    dvi-etc
+    dvi-etc 
 	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8681,7 +8658,7 @@ maybe-install-pdf-etc: install-pdf-etc
 
 install-pdf-etc: \
     configure-etc \
-    pdf-etc
+    pdf-etc 
 	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8708,7 +8685,7 @@ maybe-install-html-etc: install-html-etc
 
 install-html-etc: \
     configure-etc \
-    html-etc
+    html-etc 
 	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8734,7 +8711,7 @@ maybe-installcheck-etc:
 maybe-installcheck-etc: installcheck-etc
 
 installcheck-etc: \
-    configure-etc
+    configure-etc 
 	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8759,7 +8736,7 @@ maybe-mostlyclean-etc:
 @if etc
 maybe-mostlyclean-etc: mostlyclean-etc
 
-mostlyclean-etc:
+mostlyclean-etc: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8784,7 +8761,7 @@ maybe-clean-etc:
 @if etc
 maybe-clean-etc: clean-etc
 
-clean-etc:
+clean-etc: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8809,7 +8786,7 @@ maybe-distclean-etc:
 @if etc
 maybe-distclean-etc: distclean-etc
 
-distclean-etc:
+distclean-etc: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8834,7 +8811,7 @@ maybe-maintainer-clean-etc:
 @if etc
 maybe-maintainer-clean-etc: maintainer-clean-etc
 
-maintainer-clean-etc:
+maintainer-clean-etc: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8863,7 +8840,7 @@ configure-fastjar: stage_current
 @endif gcc-bootstrap
 @if fastjar
 maybe-configure-fastjar: configure-fastjar
-configure-fastjar:
+configure-fastjar: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8967,7 +8944,7 @@ maybe-info-fastjar:
 maybe-info-fastjar: info-fastjar
 
 info-fastjar: \
-    configure-fastjar
+    configure-fastjar 
 	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -8993,7 +8970,7 @@ maybe-dvi-fastjar:
 maybe-dvi-fastjar: dvi-fastjar
 
 dvi-fastjar: \
-    configure-fastjar
+    configure-fastjar 
 	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -9019,7 +8996,7 @@ maybe-pdf-fastjar:
 maybe-pdf-fastjar: pdf-fastjar
 
 pdf-fastjar: \
-    configure-fastjar
+    configure-fastjar 
 	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -9045,7 +9022,7 @@ maybe-html-fastjar:
 maybe-html-fastjar: html-fastjar
 
 html-fastjar: \
-    configure-fastjar
+    configure-fastjar 
 	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -9071,7 +9048,7 @@ maybe-TAGS-fastjar:
 maybe-TAGS-fastjar: TAGS-fastjar
 
 TAGS-fastjar: \
-    configure-fastjar
+    configure-fastjar 
 	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -9098,7 +9075,7 @@ maybe-install-info-fastjar: install-info-fastjar
 
 install-info-fastjar: \
     configure-fastjar \
-    info-fastjar
+    info-fastjar 
 	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -9125,7 +9102,7 @@ maybe-install-dvi-fastjar: install-dvi-fastjar
 
 install-dvi-fastjar: \
     configure-fastjar \
-    dvi-fastjar
+    dvi-fastjar 
 	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -9152,7 +9129,7 @@ maybe-install-pdf-fastjar: install-pdf-fastjar
 
 install-pdf-fastjar: \
     configure-fastjar \
-    pdf-fastjar
+    pdf-fastjar 
 	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -9179,7 +9156,7 @@ maybe-install-html-fastjar: install-html-fastjar
 
 install-html-fastjar: \
     configure-fastjar \
-    html-fastjar
+    html-fastjar 
 	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -9205,7 +9182,7 @@ maybe-installcheck-fastjar:
 maybe-installcheck-fastjar: installcheck-fastjar
 
 installcheck-fastjar: \
-    configure-fastjar
+    configure-fastjar 
 	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -9230,7 +9207,7 @@ maybe-mostlyclean-fastjar:
 @if fastjar
 maybe-mostlyclean-fastjar: mostlyclean-fastjar
 
-mostlyclean-fastjar:
+mostlyclean-fastjar: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -9255,7 +9232,7 @@ maybe-clean-fastjar:
 @if fastjar
 maybe-clean-fastjar: clean-fastjar
 
-clean-fastjar:
+clean-fastjar: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -9280,7 +9257,7 @@ maybe-distclean-fastjar:
 @if fastjar
 maybe-distclean-fastjar: distclean-fastjar
 
-distclean-fastjar:
+distclean-fastjar: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -9305,7 +9282,7 @@ maybe-maintainer-clean-fastjar:
 @if fastjar
 maybe-maintainer-clean-fastjar: maintainer-clean-fastjar
 
-maintainer-clean-fastjar:
+maintainer-clean-fastjar: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -9334,7 +9311,7 @@ configure-fixincludes: stage_current
 @endif gcc-bootstrap
 @if fixincludes
 maybe-configure-fixincludes: configure-fixincludes
-configure-fixincludes:
+configure-fixincludes: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
@@ -10121,7 +10098,7 @@ maybe-info-fixincludes:
 maybe-info-fixincludes: info-fixincludes
 
 info-fixincludes: \
-    configure-fixincludes
+    configure-fixincludes 
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10146,7 +10123,7 @@ maybe-dvi-fixincludes:
 maybe-dvi-fixincludes: dvi-fixincludes
 
 dvi-fixincludes: \
-    configure-fixincludes
+    configure-fixincludes 
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10171,7 +10148,7 @@ maybe-pdf-fixincludes:
 maybe-pdf-fixincludes: pdf-fixincludes
 
 pdf-fixincludes: \
-    configure-fixincludes
+    configure-fixincludes 
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10196,7 +10173,7 @@ maybe-html-fixincludes:
 maybe-html-fixincludes: html-fixincludes
 
 html-fixincludes: \
-    configure-fixincludes
+    configure-fixincludes 
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10232,7 +10209,7 @@ maybe-install-info-fixincludes: install-info-fixincludes
 
 install-info-fixincludes: \
     configure-fixincludes \
-    info-fixincludes
+    info-fixincludes 
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10268,7 +10245,7 @@ maybe-install-pdf-fixincludes: install-pdf-fixincludes
 
 install-pdf-fixincludes: \
     configure-fixincludes \
-    pdf-fixincludes
+    pdf-fixincludes 
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10294,7 +10271,7 @@ maybe-install-html-fixincludes: install-html-fixincludes
 
 install-html-fixincludes: \
     configure-fixincludes \
-    html-fixincludes
+    html-fixincludes 
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10319,7 +10296,7 @@ maybe-installcheck-fixincludes:
 maybe-installcheck-fixincludes: installcheck-fixincludes
 
 installcheck-fixincludes: \
-    configure-fixincludes
+    configure-fixincludes 
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10343,7 +10320,7 @@ maybe-mostlyclean-fixincludes:
 @if fixincludes
 maybe-mostlyclean-fixincludes: mostlyclean-fixincludes
 
-mostlyclean-fixincludes:
+mostlyclean-fixincludes: 
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10367,7 +10344,7 @@ maybe-clean-fixincludes:
 @if fixincludes
 maybe-clean-fixincludes: clean-fixincludes
 
-clean-fixincludes:
+clean-fixincludes: 
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10391,7 +10368,7 @@ maybe-distclean-fixincludes:
 @if fixincludes
 maybe-distclean-fixincludes: distclean-fixincludes
 
-distclean-fixincludes:
+distclean-fixincludes: 
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10415,7 +10392,7 @@ maybe-maintainer-clean-fixincludes:
 @if fixincludes
 maybe-maintainer-clean-fixincludes: maintainer-clean-fixincludes
 
-maintainer-clean-fixincludes:
+maintainer-clean-fixincludes: 
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10443,7 +10420,7 @@ configure-flex: stage_current
 @endif gcc-bootstrap
 @if flex
 maybe-configure-flex: configure-flex
-configure-flex:
+configure-flex: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10547,7 +10524,7 @@ maybe-info-flex:
 maybe-info-flex: info-flex
 
 info-flex: \
-    configure-flex
+    configure-flex 
 	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -10573,7 +10550,7 @@ maybe-dvi-flex:
 maybe-dvi-flex: dvi-flex
 
 dvi-flex: \
-    configure-flex
+    configure-flex 
 	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -10599,7 +10576,7 @@ maybe-pdf-flex:
 maybe-pdf-flex: pdf-flex
 
 pdf-flex: \
-    configure-flex
+    configure-flex 
 	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -10625,7 +10602,7 @@ maybe-html-flex:
 maybe-html-flex: html-flex
 
 html-flex: \
-    configure-flex
+    configure-flex 
 	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -10651,7 +10628,7 @@ maybe-TAGS-flex:
 maybe-TAGS-flex: TAGS-flex
 
 TAGS-flex: \
-    configure-flex
+    configure-flex 
 	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -10678,7 +10655,7 @@ maybe-install-info-flex: install-info-flex
 
 install-info-flex: \
     configure-flex \
-    info-flex
+    info-flex 
 	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -10705,7 +10682,7 @@ maybe-install-dvi-flex: install-dvi-flex
 
 install-dvi-flex: \
     configure-flex \
-    dvi-flex
+    dvi-flex 
 	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -10732,7 +10709,7 @@ maybe-install-pdf-flex: install-pdf-flex
 
 install-pdf-flex: \
     configure-flex \
-    pdf-flex
+    pdf-flex 
 	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -10759,7 +10736,7 @@ maybe-install-html-flex: install-html-flex
 
 install-html-flex: \
     configure-flex \
-    html-flex
+    html-flex 
 	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -10785,7 +10762,7 @@ maybe-installcheck-flex:
 maybe-installcheck-flex: installcheck-flex
 
 installcheck-flex: \
-    configure-flex
+    configure-flex 
 	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -10810,7 +10787,7 @@ maybe-mostlyclean-flex:
 @if flex
 maybe-mostlyclean-flex: mostlyclean-flex
 
-mostlyclean-flex:
+mostlyclean-flex: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -10835,7 +10812,7 @@ maybe-clean-flex:
 @if flex
 maybe-clean-flex: clean-flex
 
-clean-flex:
+clean-flex: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -10860,7 +10837,7 @@ maybe-distclean-flex:
 @if flex
 maybe-distclean-flex: distclean-flex
 
-distclean-flex:
+distclean-flex: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -10885,7 +10862,7 @@ maybe-maintainer-clean-flex:
 @if flex
 maybe-maintainer-clean-flex: maintainer-clean-flex
 
-maintainer-clean-flex:
+maintainer-clean-flex: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -10914,7 +10891,7 @@ configure-gas: stage_current
 @endif gcc-bootstrap
 @if gas
 maybe-configure-gas: configure-gas
-configure-gas:
+configure-gas: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
@@ -11701,7 +11678,7 @@ maybe-info-gas:
 maybe-info-gas: info-gas
 
 info-gas: \
-    configure-gas
+    configure-gas 
 	@[ -f ./gas/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11726,7 +11703,7 @@ maybe-dvi-gas:
 maybe-dvi-gas: dvi-gas
 
 dvi-gas: \
-    configure-gas
+    configure-gas 
 	@[ -f ./gas/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11751,7 +11728,7 @@ maybe-pdf-gas:
 maybe-pdf-gas: pdf-gas
 
 pdf-gas: \
-    configure-gas
+    configure-gas 
 	@[ -f ./gas/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11776,7 +11753,7 @@ maybe-html-gas:
 maybe-html-gas: html-gas
 
 html-gas: \
-    configure-gas
+    configure-gas 
 	@[ -f ./gas/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11801,7 +11778,7 @@ maybe-TAGS-gas:
 maybe-TAGS-gas: TAGS-gas
 
 TAGS-gas: \
-    configure-gas
+    configure-gas 
 	@[ -f ./gas/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11827,7 +11804,7 @@ maybe-install-info-gas: install-info-gas
 
 install-info-gas: \
     configure-gas \
-    info-gas
+    info-gas 
 	@[ -f ./gas/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11853,7 +11830,7 @@ maybe-install-dvi-gas: install-dvi-gas
 
 install-dvi-gas: \
     configure-gas \
-    dvi-gas
+    dvi-gas 
 	@[ -f ./gas/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11879,7 +11856,7 @@ maybe-install-pdf-gas: install-pdf-gas
 
 install-pdf-gas: \
     configure-gas \
-    pdf-gas
+    pdf-gas 
 	@[ -f ./gas/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11905,7 +11882,7 @@ maybe-install-html-gas: install-html-gas
 
 install-html-gas: \
     configure-gas \
-    html-gas
+    html-gas 
 	@[ -f ./gas/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11930,7 +11907,7 @@ maybe-installcheck-gas:
 maybe-installcheck-gas: installcheck-gas
 
 installcheck-gas: \
-    configure-gas
+    configure-gas 
 	@[ -f ./gas/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11954,7 +11931,7 @@ maybe-mostlyclean-gas:
 @if gas
 maybe-mostlyclean-gas: mostlyclean-gas
 
-mostlyclean-gas:
+mostlyclean-gas: 
 	@[ -f ./gas/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11978,7 +11955,7 @@ maybe-clean-gas:
 @if gas
 maybe-clean-gas: clean-gas
 
-clean-gas:
+clean-gas: 
 	@[ -f ./gas/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12002,7 +11979,7 @@ maybe-distclean-gas:
 @if gas
 maybe-distclean-gas: distclean-gas
 
-distclean-gas:
+distclean-gas: 
 	@[ -f ./gas/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12026,7 +12003,7 @@ maybe-maintainer-clean-gas:
 @if gas
 maybe-maintainer-clean-gas: maintainer-clean-gas
 
-maintainer-clean-gas:
+maintainer-clean-gas: 
 	@[ -f ./gas/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12054,7 +12031,7 @@ configure-gcc: stage_current
 @endif gcc-bootstrap
 @if gcc
 maybe-configure-gcc: configure-gcc
-configure-gcc:
+configure-gcc: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
@@ -12841,7 +12818,7 @@ maybe-info-gcc:
 maybe-info-gcc: info-gcc
 
 info-gcc: \
-    configure-gcc
+    configure-gcc 
 	@[ -f ./gcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12866,7 +12843,7 @@ maybe-dvi-gcc:
 maybe-dvi-gcc: dvi-gcc
 
 dvi-gcc: \
-    configure-gcc
+    configure-gcc 
 	@[ -f ./gcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12891,7 +12868,7 @@ maybe-pdf-gcc:
 maybe-pdf-gcc: pdf-gcc
 
 pdf-gcc: \
-    configure-gcc
+    configure-gcc 
 	@[ -f ./gcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12916,7 +12893,7 @@ maybe-html-gcc:
 maybe-html-gcc: html-gcc
 
 html-gcc: \
-    configure-gcc
+    configure-gcc 
 	@[ -f ./gcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12941,7 +12918,7 @@ maybe-TAGS-gcc:
 maybe-TAGS-gcc: TAGS-gcc
 
 TAGS-gcc: \
-    configure-gcc
+    configure-gcc 
 	@[ -f ./gcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12967,7 +12944,7 @@ maybe-install-info-gcc: install-info-gcc
 
 install-info-gcc: \
     configure-gcc \
-    info-gcc
+    info-gcc 
 	@[ -f ./gcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12993,7 +12970,7 @@ maybe-install-dvi-gcc: install-dvi-gcc
 
 install-dvi-gcc: \
     configure-gcc \
-    dvi-gcc
+    dvi-gcc 
 	@[ -f ./gcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13019,7 +12996,7 @@ maybe-install-pdf-gcc: install-pdf-gcc
 
 install-pdf-gcc: \
     configure-gcc \
-    pdf-gcc
+    pdf-gcc 
 	@[ -f ./gcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13045,7 +13022,7 @@ maybe-install-html-gcc: install-html-gcc
 
 install-html-gcc: \
     configure-gcc \
-    html-gcc
+    html-gcc 
 	@[ -f ./gcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13070,7 +13047,7 @@ maybe-installcheck-gcc:
 maybe-installcheck-gcc: installcheck-gcc
 
 installcheck-gcc: \
-    configure-gcc
+    configure-gcc 
 	@[ -f ./gcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13094,7 +13071,7 @@ maybe-mostlyclean-gcc:
 @if gcc
 maybe-mostlyclean-gcc: mostlyclean-gcc
 
-mostlyclean-gcc:
+mostlyclean-gcc: 
 	@[ -f ./gcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13118,7 +13095,7 @@ maybe-clean-gcc:
 @if gcc
 maybe-clean-gcc: clean-gcc
 
-clean-gcc:
+clean-gcc: 
 	@[ -f ./gcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13142,7 +13119,7 @@ maybe-distclean-gcc:
 @if gcc
 maybe-distclean-gcc: distclean-gcc
 
-distclean-gcc:
+distclean-gcc: 
 	@[ -f ./gcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13166,7 +13143,7 @@ maybe-maintainer-clean-gcc:
 @if gcc
 maybe-maintainer-clean-gcc: maintainer-clean-gcc
 
-maintainer-clean-gcc:
+maintainer-clean-gcc: 
 	@[ -f ./gcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13194,7 +13171,7 @@ configure-gmp: stage_current
 @endif gcc-bootstrap
 @if gmp
 maybe-configure-gmp: configure-gmp
-configure-gmp:
+configure-gmp: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
@@ -13978,7 +13955,7 @@ maybe-info-gmp:
 maybe-info-gmp: info-gmp
 
 info-gmp: \
-    configure-gmp
+    configure-gmp 
 	@[ -f ./gmp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14003,7 +13980,7 @@ maybe-dvi-gmp:
 maybe-dvi-gmp: dvi-gmp
 
 dvi-gmp: \
-    configure-gmp
+    configure-gmp 
 	@[ -f ./gmp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14028,7 +14005,7 @@ maybe-pdf-gmp:
 maybe-pdf-gmp: pdf-gmp
 
 pdf-gmp: \
-    configure-gmp
+    configure-gmp 
 	@[ -f ./gmp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14053,7 +14030,7 @@ maybe-html-gmp:
 maybe-html-gmp: html-gmp
 
 html-gmp: \
-    configure-gmp
+    configure-gmp 
 	@[ -f ./gmp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14078,7 +14055,7 @@ maybe-TAGS-gmp:
 maybe-TAGS-gmp: TAGS-gmp
 
 TAGS-gmp: \
-    configure-gmp
+    configure-gmp 
 	@[ -f ./gmp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14104,7 +14081,7 @@ maybe-install-info-gmp: install-info-gmp
 
 install-info-gmp: \
     configure-gmp \
-    info-gmp
+    info-gmp 
 	@[ -f ./gmp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14130,7 +14107,7 @@ maybe-install-dvi-gmp: install-dvi-gmp
 
 install-dvi-gmp: \
     configure-gmp \
-    dvi-gmp
+    dvi-gmp 
 	@[ -f ./gmp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14156,7 +14133,7 @@ maybe-install-pdf-gmp: install-pdf-gmp
 
 install-pdf-gmp: \
     configure-gmp \
-    pdf-gmp
+    pdf-gmp 
 	@[ -f ./gmp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14182,7 +14159,7 @@ maybe-install-html-gmp: install-html-gmp
 
 install-html-gmp: \
     configure-gmp \
-    html-gmp
+    html-gmp 
 	@[ -f ./gmp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14207,7 +14184,7 @@ maybe-installcheck-gmp:
 maybe-installcheck-gmp: installcheck-gmp
 
 installcheck-gmp: \
-    configure-gmp
+    configure-gmp 
 	@[ -f ./gmp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14231,7 +14208,7 @@ maybe-mostlyclean-gmp:
 @if gmp
 maybe-mostlyclean-gmp: mostlyclean-gmp
 
-mostlyclean-gmp:
+mostlyclean-gmp: 
 	@[ -f ./gmp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14255,7 +14232,7 @@ maybe-clean-gmp:
 @if gmp
 maybe-clean-gmp: clean-gmp
 
-clean-gmp:
+clean-gmp: 
 	@[ -f ./gmp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14279,7 +14256,7 @@ maybe-distclean-gmp:
 @if gmp
 maybe-distclean-gmp: distclean-gmp
 
-distclean-gmp:
+distclean-gmp: 
 	@[ -f ./gmp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14303,7 +14280,7 @@ maybe-maintainer-clean-gmp:
 @if gmp
 maybe-maintainer-clean-gmp: maintainer-clean-gmp
 
-maintainer-clean-gmp:
+maintainer-clean-gmp: 
 	@[ -f ./gmp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14331,7 +14308,7 @@ configure-mpfr: stage_current
 @endif gcc-bootstrap
 @if mpfr
 maybe-configure-mpfr: configure-mpfr
-configure-mpfr:
+configure-mpfr: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
@@ -15115,7 +15092,7 @@ maybe-info-mpfr:
 maybe-info-mpfr: info-mpfr
 
 info-mpfr: \
-    configure-mpfr
+    configure-mpfr 
 	@[ -f ./mpfr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15140,7 +15117,7 @@ maybe-dvi-mpfr:
 maybe-dvi-mpfr: dvi-mpfr
 
 dvi-mpfr: \
-    configure-mpfr
+    configure-mpfr 
 	@[ -f ./mpfr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15165,7 +15142,7 @@ maybe-pdf-mpfr:
 maybe-pdf-mpfr: pdf-mpfr
 
 pdf-mpfr: \
-    configure-mpfr
+    configure-mpfr 
 	@[ -f ./mpfr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15190,7 +15167,7 @@ maybe-html-mpfr:
 maybe-html-mpfr: html-mpfr
 
 html-mpfr: \
-    configure-mpfr
+    configure-mpfr 
 	@[ -f ./mpfr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15215,7 +15192,7 @@ maybe-TAGS-mpfr:
 maybe-TAGS-mpfr: TAGS-mpfr
 
 TAGS-mpfr: \
-    configure-mpfr
+    configure-mpfr 
 	@[ -f ./mpfr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15241,7 +15218,7 @@ maybe-install-info-mpfr: install-info-mpfr
 
 install-info-mpfr: \
     configure-mpfr \
-    info-mpfr
+    info-mpfr 
 	@[ -f ./mpfr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15267,7 +15244,7 @@ maybe-install-dvi-mpfr: install-dvi-mpfr
 
 install-dvi-mpfr: \
     configure-mpfr \
-    dvi-mpfr
+    dvi-mpfr 
 	@[ -f ./mpfr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15293,7 +15270,7 @@ maybe-install-pdf-mpfr: install-pdf-mpfr
 
 install-pdf-mpfr: \
     configure-mpfr \
-    pdf-mpfr
+    pdf-mpfr 
 	@[ -f ./mpfr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15319,7 +15296,7 @@ maybe-install-html-mpfr: install-html-mpfr
 
 install-html-mpfr: \
     configure-mpfr \
-    html-mpfr
+    html-mpfr 
 	@[ -f ./mpfr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15344,7 +15321,7 @@ maybe-installcheck-mpfr:
 maybe-installcheck-mpfr: installcheck-mpfr
 
 installcheck-mpfr: \
-    configure-mpfr
+    configure-mpfr 
 	@[ -f ./mpfr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15368,7 +15345,7 @@ maybe-mostlyclean-mpfr:
 @if mpfr
 maybe-mostlyclean-mpfr: mostlyclean-mpfr
 
-mostlyclean-mpfr:
+mostlyclean-mpfr: 
 	@[ -f ./mpfr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15392,7 +15369,7 @@ maybe-clean-mpfr:
 @if mpfr
 maybe-clean-mpfr: clean-mpfr
 
-clean-mpfr:
+clean-mpfr: 
 	@[ -f ./mpfr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15416,7 +15393,7 @@ maybe-distclean-mpfr:
 @if mpfr
 maybe-distclean-mpfr: distclean-mpfr
 
-distclean-mpfr:
+distclean-mpfr: 
 	@[ -f ./mpfr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15440,7 +15417,7 @@ maybe-maintainer-clean-mpfr:
 @if mpfr
 maybe-maintainer-clean-mpfr: maintainer-clean-mpfr
 
-maintainer-clean-mpfr:
+maintainer-clean-mpfr: 
 	@[ -f ./mpfr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15468,7 +15445,7 @@ configure-mpc: stage_current
 @endif gcc-bootstrap
 @if mpc
 maybe-configure-mpc: configure-mpc
-configure-mpc:
+configure-mpc: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
@@ -16252,7 +16229,7 @@ maybe-info-mpc:
 maybe-info-mpc: info-mpc
 
 info-mpc: \
-    configure-mpc
+    configure-mpc 
 	@[ -f ./mpc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16277,7 +16254,7 @@ maybe-dvi-mpc:
 maybe-dvi-mpc: dvi-mpc
 
 dvi-mpc: \
-    configure-mpc
+    configure-mpc 
 	@[ -f ./mpc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16302,7 +16279,7 @@ maybe-pdf-mpc:
 maybe-pdf-mpc: pdf-mpc
 
 pdf-mpc: \
-    configure-mpc
+    configure-mpc 
 	@[ -f ./mpc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16327,7 +16304,7 @@ maybe-html-mpc:
 maybe-html-mpc: html-mpc
 
 html-mpc: \
-    configure-mpc
+    configure-mpc 
 	@[ -f ./mpc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16352,7 +16329,7 @@ maybe-TAGS-mpc:
 maybe-TAGS-mpc: TAGS-mpc
 
 TAGS-mpc: \
-    configure-mpc
+    configure-mpc 
 	@[ -f ./mpc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16378,7 +16355,7 @@ maybe-install-info-mpc: install-info-mpc
 
 install-info-mpc: \
     configure-mpc \
-    info-mpc
+    info-mpc 
 	@[ -f ./mpc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16404,7 +16381,7 @@ maybe-install-dvi-mpc: install-dvi-mpc
 
 install-dvi-mpc: \
     configure-mpc \
-    dvi-mpc
+    dvi-mpc 
 	@[ -f ./mpc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16430,7 +16407,7 @@ maybe-install-pdf-mpc: install-pdf-mpc
 
 install-pdf-mpc: \
     configure-mpc \
-    pdf-mpc
+    pdf-mpc 
 	@[ -f ./mpc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16456,7 +16433,7 @@ maybe-install-html-mpc: install-html-mpc
 
 install-html-mpc: \
     configure-mpc \
-    html-mpc
+    html-mpc 
 	@[ -f ./mpc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16481,7 +16458,7 @@ maybe-installcheck-mpc:
 maybe-installcheck-mpc: installcheck-mpc
 
 installcheck-mpc: \
-    configure-mpc
+    configure-mpc 
 	@[ -f ./mpc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16505,7 +16482,7 @@ maybe-mostlyclean-mpc:
 @if mpc
 maybe-mostlyclean-mpc: mostlyclean-mpc
 
-mostlyclean-mpc:
+mostlyclean-mpc: 
 	@[ -f ./mpc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16529,7 +16506,7 @@ maybe-clean-mpc:
 @if mpc
 maybe-clean-mpc: clean-mpc
 
-clean-mpc:
+clean-mpc: 
 	@[ -f ./mpc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16553,7 +16530,7 @@ maybe-distclean-mpc:
 @if mpc
 maybe-distclean-mpc: distclean-mpc
 
-distclean-mpc:
+distclean-mpc: 
 	@[ -f ./mpc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16577,7 +16554,7 @@ maybe-maintainer-clean-mpc:
 @if mpc
 maybe-maintainer-clean-mpc: maintainer-clean-mpc
 
-maintainer-clean-mpc:
+maintainer-clean-mpc: 
 	@[ -f ./mpc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -16605,7 +16582,7 @@ configure-isl: stage_current
 @endif gcc-bootstrap
 @if isl
 maybe-configure-isl: configure-isl
-configure-isl:
+configure-isl: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/isl/Makefile || exit 0; \
@@ -17389,7 +17366,7 @@ maybe-info-isl:
 maybe-info-isl: info-isl
 
 info-isl: \
-    configure-isl
+    configure-isl 
 	@[ -f ./isl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17414,7 +17391,7 @@ maybe-dvi-isl:
 maybe-dvi-isl: dvi-isl
 
 dvi-isl: \
-    configure-isl
+    configure-isl 
 	@[ -f ./isl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17439,7 +17416,7 @@ maybe-pdf-isl:
 maybe-pdf-isl: pdf-isl
 
 pdf-isl: \
-    configure-isl
+    configure-isl 
 	@[ -f ./isl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17464,7 +17441,7 @@ maybe-html-isl:
 maybe-html-isl: html-isl
 
 html-isl: \
-    configure-isl
+    configure-isl 
 	@[ -f ./isl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17489,7 +17466,7 @@ maybe-TAGS-isl:
 maybe-TAGS-isl: TAGS-isl
 
 TAGS-isl: \
-    configure-isl
+    configure-isl 
 	@[ -f ./isl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17515,7 +17492,7 @@ maybe-install-info-isl: install-info-isl
 
 install-info-isl: \
     configure-isl \
-    info-isl
+    info-isl 
 	@[ -f ./isl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17541,7 +17518,7 @@ maybe-install-dvi-isl: install-dvi-isl
 
 install-dvi-isl: \
     configure-isl \
-    dvi-isl
+    dvi-isl 
 	@[ -f ./isl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17567,7 +17544,7 @@ maybe-install-pdf-isl: install-pdf-isl
 
 install-pdf-isl: \
     configure-isl \
-    pdf-isl
+    pdf-isl 
 	@[ -f ./isl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17593,7 +17570,7 @@ maybe-install-html-isl: install-html-isl
 
 install-html-isl: \
     configure-isl \
-    html-isl
+    html-isl 
 	@[ -f ./isl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17618,7 +17595,7 @@ maybe-installcheck-isl:
 maybe-installcheck-isl: installcheck-isl
 
 installcheck-isl: \
-    configure-isl
+    configure-isl 
 	@[ -f ./isl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17642,7 +17619,7 @@ maybe-mostlyclean-isl:
 @if isl
 maybe-mostlyclean-isl: mostlyclean-isl
 
-mostlyclean-isl:
+mostlyclean-isl: 
 	@[ -f ./isl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17666,7 +17643,7 @@ maybe-clean-isl:
 @if isl
 maybe-clean-isl: clean-isl
 
-clean-isl:
+clean-isl: 
 	@[ -f ./isl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17690,7 +17667,7 @@ maybe-distclean-isl:
 @if isl
 maybe-distclean-isl: distclean-isl
 
-distclean-isl:
+distclean-isl: 
 	@[ -f ./isl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17714,7 +17691,7 @@ maybe-maintainer-clean-isl:
 @if isl
 maybe-maintainer-clean-isl: maintainer-clean-isl
 
-maintainer-clean-isl:
+maintainer-clean-isl: 
 	@[ -f ./isl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17742,7 +17719,7 @@ configure-libelf: stage_current
 @endif gcc-bootstrap
 @if libelf
 maybe-configure-libelf: configure-libelf
-configure-libelf:
+configure-libelf: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
@@ -18526,7 +18503,7 @@ maybe-info-libelf:
 maybe-info-libelf: info-libelf
 
 info-libelf: \
-    configure-libelf
+    configure-libelf 
 	@[ -f ./libelf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18551,7 +18528,7 @@ maybe-dvi-libelf:
 maybe-dvi-libelf: dvi-libelf
 
 dvi-libelf: \
-    configure-libelf
+    configure-libelf 
 	@[ -f ./libelf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18576,7 +18553,7 @@ maybe-pdf-libelf:
 maybe-pdf-libelf: pdf-libelf
 
 pdf-libelf: \
-    configure-libelf
+    configure-libelf 
 	@[ -f ./libelf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18601,7 +18578,7 @@ maybe-html-libelf:
 maybe-html-libelf: html-libelf
 
 html-libelf: \
-    configure-libelf
+    configure-libelf 
 	@[ -f ./libelf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18626,7 +18603,7 @@ maybe-TAGS-libelf:
 maybe-TAGS-libelf: TAGS-libelf
 
 TAGS-libelf: \
-    configure-libelf
+    configure-libelf 
 	@[ -f ./libelf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18652,7 +18629,7 @@ maybe-install-info-libelf: install-info-libelf
 
 install-info-libelf: \
     configure-libelf \
-    info-libelf
+    info-libelf 
 	@[ -f ./libelf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18678,7 +18655,7 @@ maybe-install-dvi-libelf: install-dvi-libelf
 
 install-dvi-libelf: \
     configure-libelf \
-    dvi-libelf
+    dvi-libelf 
 	@[ -f ./libelf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18704,7 +18681,7 @@ maybe-install-pdf-libelf: install-pdf-libelf
 
 install-pdf-libelf: \
     configure-libelf \
-    pdf-libelf
+    pdf-libelf 
 	@[ -f ./libelf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18730,7 +18707,7 @@ maybe-install-html-libelf: install-html-libelf
 
 install-html-libelf: \
     configure-libelf \
-    html-libelf
+    html-libelf 
 	@[ -f ./libelf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18755,7 +18732,7 @@ maybe-installcheck-libelf:
 maybe-installcheck-libelf: installcheck-libelf
 
 installcheck-libelf: \
-    configure-libelf
+    configure-libelf 
 	@[ -f ./libelf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18779,7 +18756,7 @@ maybe-mostlyclean-libelf:
 @if libelf
 maybe-mostlyclean-libelf: mostlyclean-libelf
 
-mostlyclean-libelf:
+mostlyclean-libelf: 
 	@[ -f ./libelf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18803,7 +18780,7 @@ maybe-clean-libelf:
 @if libelf
 maybe-clean-libelf: clean-libelf
 
-clean-libelf:
+clean-libelf: 
 	@[ -f ./libelf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18827,7 +18804,7 @@ maybe-distclean-libelf:
 @if libelf
 maybe-distclean-libelf: distclean-libelf
 
-distclean-libelf:
+distclean-libelf: 
 	@[ -f ./libelf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18851,7 +18828,7 @@ maybe-maintainer-clean-libelf:
 @if libelf
 maybe-maintainer-clean-libelf: maintainer-clean-libelf
 
-maintainer-clean-libelf:
+maintainer-clean-libelf: 
 	@[ -f ./libelf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18879,7 +18856,7 @@ configure-gold: stage_current
 @endif gcc-bootstrap
 @if gold
 maybe-configure-gold: configure-gold
-configure-gold:
+configure-gold: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
@@ -19666,7 +19643,7 @@ maybe-info-gold:
 maybe-info-gold: info-gold
 
 info-gold: \
-    configure-gold
+    configure-gold 
 	@[ -f ./gold/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19691,7 +19668,7 @@ maybe-dvi-gold:
 maybe-dvi-gold: dvi-gold
 
 dvi-gold: \
-    configure-gold
+    configure-gold 
 	@[ -f ./gold/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19716,7 +19693,7 @@ maybe-pdf-gold:
 maybe-pdf-gold: pdf-gold
 
 pdf-gold: \
-    configure-gold
+    configure-gold 
 	@[ -f ./gold/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19741,7 +19718,7 @@ maybe-html-gold:
 maybe-html-gold: html-gold
 
 html-gold: \
-    configure-gold
+    configure-gold 
 	@[ -f ./gold/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19766,7 +19743,7 @@ maybe-TAGS-gold:
 maybe-TAGS-gold: TAGS-gold
 
 TAGS-gold: \
-    configure-gold
+    configure-gold 
 	@[ -f ./gold/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19792,7 +19769,7 @@ maybe-install-info-gold: install-info-gold
 
 install-info-gold: \
     configure-gold \
-    info-gold
+    info-gold 
 	@[ -f ./gold/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19818,7 +19795,7 @@ maybe-install-dvi-gold: install-dvi-gold
 
 install-dvi-gold: \
     configure-gold \
-    dvi-gold
+    dvi-gold 
 	@[ -f ./gold/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19844,7 +19821,7 @@ maybe-install-pdf-gold: install-pdf-gold
 
 install-pdf-gold: \
     configure-gold \
-    pdf-gold
+    pdf-gold 
 	@[ -f ./gold/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19870,7 +19847,7 @@ maybe-install-html-gold: install-html-gold
 
 install-html-gold: \
     configure-gold \
-    html-gold
+    html-gold 
 	@[ -f ./gold/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19895,7 +19872,7 @@ maybe-installcheck-gold:
 maybe-installcheck-gold: installcheck-gold
 
 installcheck-gold: \
-    configure-gold
+    configure-gold 
 	@[ -f ./gold/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19919,7 +19896,7 @@ maybe-mostlyclean-gold:
 @if gold
 maybe-mostlyclean-gold: mostlyclean-gold
 
-mostlyclean-gold:
+mostlyclean-gold: 
 	@[ -f ./gold/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19943,7 +19920,7 @@ maybe-clean-gold:
 @if gold
 maybe-clean-gold: clean-gold
 
-clean-gold:
+clean-gold: 
 	@[ -f ./gold/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19967,7 +19944,7 @@ maybe-distclean-gold:
 @if gold
 maybe-distclean-gold: distclean-gold
 
-distclean-gold:
+distclean-gold: 
 	@[ -f ./gold/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19991,7 +19968,7 @@ maybe-maintainer-clean-gold:
 @if gold
 maybe-maintainer-clean-gold: maintainer-clean-gold
 
-maintainer-clean-gold:
+maintainer-clean-gold: 
 	@[ -f ./gold/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20019,7 +19996,7 @@ configure-gprof: stage_current
 @endif gcc-bootstrap
 @if gprof
 maybe-configure-gprof: configure-gprof
-configure-gprof:
+configure-gprof: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20120,7 +20097,7 @@ maybe-info-gprof:
 maybe-info-gprof: info-gprof
 
 info-gprof: \
-    configure-gprof
+    configure-gprof 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -20146,7 +20123,7 @@ maybe-dvi-gprof:
 maybe-dvi-gprof: dvi-gprof
 
 dvi-gprof: \
-    configure-gprof
+    configure-gprof 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -20172,7 +20149,7 @@ maybe-pdf-gprof:
 maybe-pdf-gprof: pdf-gprof
 
 pdf-gprof: \
-    configure-gprof
+    configure-gprof 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -20198,7 +20175,7 @@ maybe-html-gprof:
 maybe-html-gprof: html-gprof
 
 html-gprof: \
-    configure-gprof
+    configure-gprof 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -20224,7 +20201,7 @@ maybe-TAGS-gprof:
 maybe-TAGS-gprof: TAGS-gprof
 
 TAGS-gprof: \
-    configure-gprof
+    configure-gprof 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -20251,7 +20228,7 @@ maybe-install-info-gprof: install-info-gprof
 
 install-info-gprof: \
     configure-gprof \
-    info-gprof
+    info-gprof 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -20278,7 +20255,7 @@ maybe-install-dvi-gprof: install-dvi-gprof
 
 install-dvi-gprof: \
     configure-gprof \
-    dvi-gprof
+    dvi-gprof 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -20305,7 +20282,7 @@ maybe-install-pdf-gprof: install-pdf-gprof
 
 install-pdf-gprof: \
     configure-gprof \
-    pdf-gprof
+    pdf-gprof 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -20332,7 +20309,7 @@ maybe-install-html-gprof: install-html-gprof
 
 install-html-gprof: \
     configure-gprof \
-    html-gprof
+    html-gprof 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -20358,7 +20335,7 @@ maybe-installcheck-gprof:
 maybe-installcheck-gprof: installcheck-gprof
 
 installcheck-gprof: \
-    configure-gprof
+    configure-gprof 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -20383,7 +20360,7 @@ maybe-mostlyclean-gprof:
 @if gprof
 maybe-mostlyclean-gprof: mostlyclean-gprof
 
-mostlyclean-gprof:
+mostlyclean-gprof: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -20408,7 +20385,7 @@ maybe-clean-gprof:
 @if gprof
 maybe-clean-gprof: clean-gprof
 
-clean-gprof:
+clean-gprof: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -20433,7 +20410,7 @@ maybe-distclean-gprof:
 @if gprof
 maybe-distclean-gprof: distclean-gprof
 
-distclean-gprof:
+distclean-gprof: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -20458,7 +20435,7 @@ maybe-maintainer-clean-gprof:
 @if gprof
 maybe-maintainer-clean-gprof: maintainer-clean-gprof
 
-maintainer-clean-gprof:
+maintainer-clean-gprof: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -20487,7 +20464,7 @@ configure-intl: stage_current
 @endif gcc-bootstrap
 @if intl
 maybe-configure-intl: configure-intl
-configure-intl:
+configure-intl: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
@@ -21274,7 +21251,7 @@ maybe-info-intl:
 maybe-info-intl: info-intl
 
 info-intl: \
-    configure-intl
+    configure-intl 
 	@[ -f ./intl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21299,7 +21276,7 @@ maybe-dvi-intl:
 maybe-dvi-intl: dvi-intl
 
 dvi-intl: \
-    configure-intl
+    configure-intl 
 	@[ -f ./intl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21324,7 +21301,7 @@ maybe-pdf-intl:
 maybe-pdf-intl: pdf-intl
 
 pdf-intl: \
-    configure-intl
+    configure-intl 
 	@[ -f ./intl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21349,7 +21326,7 @@ maybe-html-intl:
 maybe-html-intl: html-intl
 
 html-intl: \
-    configure-intl
+    configure-intl 
 	@[ -f ./intl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21374,7 +21351,7 @@ maybe-TAGS-intl:
 maybe-TAGS-intl: TAGS-intl
 
 TAGS-intl: \
-    configure-intl
+    configure-intl 
 	@[ -f ./intl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21400,7 +21377,7 @@ maybe-install-info-intl: install-info-intl
 
 install-info-intl: \
     configure-intl \
-    info-intl
+    info-intl 
 	@[ -f ./intl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21426,7 +21403,7 @@ maybe-install-dvi-intl: install-dvi-intl
 
 install-dvi-intl: \
     configure-intl \
-    dvi-intl
+    dvi-intl 
 	@[ -f ./intl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21452,7 +21429,7 @@ maybe-install-pdf-intl: install-pdf-intl
 
 install-pdf-intl: \
     configure-intl \
-    pdf-intl
+    pdf-intl 
 	@[ -f ./intl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21478,7 +21455,7 @@ maybe-install-html-intl: install-html-intl
 
 install-html-intl: \
     configure-intl \
-    html-intl
+    html-intl 
 	@[ -f ./intl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21503,7 +21480,7 @@ maybe-installcheck-intl:
 maybe-installcheck-intl: installcheck-intl
 
 installcheck-intl: \
-    configure-intl
+    configure-intl 
 	@[ -f ./intl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21527,7 +21504,7 @@ maybe-mostlyclean-intl:
 @if intl
 maybe-mostlyclean-intl: mostlyclean-intl
 
-mostlyclean-intl:
+mostlyclean-intl: 
 	@[ -f ./intl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21551,7 +21528,7 @@ maybe-clean-intl:
 @if intl
 maybe-clean-intl: clean-intl
 
-clean-intl:
+clean-intl: 
 	@[ -f ./intl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21575,7 +21552,7 @@ maybe-distclean-intl:
 @if intl
 maybe-distclean-intl: distclean-intl
 
-distclean-intl:
+distclean-intl: 
 	@[ -f ./intl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21599,7 +21576,7 @@ maybe-maintainer-clean-intl:
 @if intl
 maybe-maintainer-clean-intl: maintainer-clean-intl
 
-maintainer-clean-intl:
+maintainer-clean-intl: 
 	@[ -f ./intl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21627,7 +21604,7 @@ configure-tcl: stage_current
 @endif gcc-bootstrap
 @if tcl
 maybe-configure-tcl: configure-tcl
-configure-tcl:
+configure-tcl: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21728,7 +21705,7 @@ maybe-info-tcl:
 maybe-info-tcl: info-tcl
 
 info-tcl: \
-    configure-tcl
+    configure-tcl 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -21754,7 +21731,7 @@ maybe-dvi-tcl:
 maybe-dvi-tcl: dvi-tcl
 
 dvi-tcl: \
-    configure-tcl
+    configure-tcl 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -21780,7 +21757,7 @@ maybe-pdf-tcl:
 maybe-pdf-tcl: pdf-tcl
 
 pdf-tcl: \
-    configure-tcl
+    configure-tcl 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -21806,7 +21783,7 @@ maybe-html-tcl:
 maybe-html-tcl: html-tcl
 
 html-tcl: \
-    configure-tcl
+    configure-tcl 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -21832,7 +21809,7 @@ maybe-TAGS-tcl:
 maybe-TAGS-tcl: TAGS-tcl
 
 TAGS-tcl: \
-    configure-tcl
+    configure-tcl 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -21859,7 +21836,7 @@ maybe-install-info-tcl: install-info-tcl
 
 install-info-tcl: \
     configure-tcl \
-    info-tcl
+    info-tcl 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -21886,7 +21863,7 @@ maybe-install-dvi-tcl: install-dvi-tcl
 
 install-dvi-tcl: \
     configure-tcl \
-    dvi-tcl
+    dvi-tcl 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -21913,7 +21890,7 @@ maybe-install-pdf-tcl: install-pdf-tcl
 
 install-pdf-tcl: \
     configure-tcl \
-    pdf-tcl
+    pdf-tcl 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -21940,7 +21917,7 @@ maybe-install-html-tcl: install-html-tcl
 
 install-html-tcl: \
     configure-tcl \
-    html-tcl
+    html-tcl 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -21966,7 +21943,7 @@ maybe-installcheck-tcl:
 maybe-installcheck-tcl: installcheck-tcl
 
 installcheck-tcl: \
-    configure-tcl
+    configure-tcl 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -22001,7 +21978,7 @@ maybe-clean-tcl:
 @if tcl
 maybe-clean-tcl: clean-tcl
 
-clean-tcl:
+clean-tcl: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -22026,7 +22003,7 @@ maybe-distclean-tcl:
 @if tcl
 maybe-distclean-tcl: distclean-tcl
 
-distclean-tcl:
+distclean-tcl: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -22051,7 +22028,7 @@ maybe-maintainer-clean-tcl:
 @if tcl
 maybe-maintainer-clean-tcl: maintainer-clean-tcl
 
-maintainer-clean-tcl:
+maintainer-clean-tcl: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -22080,7 +22057,7 @@ configure-itcl: stage_current
 @endif gcc-bootstrap
 @if itcl
 maybe-configure-itcl: configure-itcl
-configure-itcl:
+configure-itcl: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22181,7 +22158,7 @@ maybe-info-itcl:
 maybe-info-itcl: info-itcl
 
 info-itcl: \
-    configure-itcl
+    configure-itcl 
 	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -22207,7 +22184,7 @@ maybe-dvi-itcl:
 maybe-dvi-itcl: dvi-itcl
 
 dvi-itcl: \
-    configure-itcl
+    configure-itcl 
 	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -22233,7 +22210,7 @@ maybe-pdf-itcl:
 maybe-pdf-itcl: pdf-itcl
 
 pdf-itcl: \
-    configure-itcl
+    configure-itcl 
 	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -22259,7 +22236,7 @@ maybe-html-itcl:
 maybe-html-itcl: html-itcl
 
 html-itcl: \
-    configure-itcl
+    configure-itcl 
 	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -22285,7 +22262,7 @@ maybe-TAGS-itcl:
 maybe-TAGS-itcl: TAGS-itcl
 
 TAGS-itcl: \
-    configure-itcl
+    configure-itcl 
 	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -22312,7 +22289,7 @@ maybe-install-info-itcl: install-info-itcl
 
 install-info-itcl: \
     configure-itcl \
-    info-itcl
+    info-itcl 
 	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -22339,7 +22316,7 @@ maybe-install-dvi-itcl: install-dvi-itcl
 
 install-dvi-itcl: \
     configure-itcl \
-    dvi-itcl
+    dvi-itcl 
 	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -22366,7 +22343,7 @@ maybe-install-pdf-itcl: install-pdf-itcl
 
 install-pdf-itcl: \
     configure-itcl \
-    pdf-itcl
+    pdf-itcl 
 	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -22393,7 +22370,7 @@ maybe-install-html-itcl: install-html-itcl
 
 install-html-itcl: \
     configure-itcl \
-    html-itcl
+    html-itcl 
 	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -22419,7 +22396,7 @@ maybe-installcheck-itcl:
 maybe-installcheck-itcl: installcheck-itcl
 
 installcheck-itcl: \
-    configure-itcl
+    configure-itcl 
 	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -22444,7 +22421,7 @@ maybe-mostlyclean-itcl:
 @if itcl
 maybe-mostlyclean-itcl: mostlyclean-itcl
 
-mostlyclean-itcl:
+mostlyclean-itcl: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -22469,7 +22446,7 @@ maybe-clean-itcl:
 @if itcl
 maybe-clean-itcl: clean-itcl
 
-clean-itcl:
+clean-itcl: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -22494,7 +22471,7 @@ maybe-distclean-itcl:
 @if itcl
 maybe-distclean-itcl: distclean-itcl
 
-distclean-itcl:
+distclean-itcl: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -22519,7 +22496,7 @@ maybe-maintainer-clean-itcl:
 @if itcl
 maybe-maintainer-clean-itcl: maintainer-clean-itcl
 
-maintainer-clean-itcl:
+maintainer-clean-itcl: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -22548,7 +22525,7 @@ configure-ld: stage_current
 @endif gcc-bootstrap
 @if ld
 maybe-configure-ld: configure-ld
-configure-ld:
+configure-ld: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
@@ -23335,7 +23312,7 @@ maybe-info-ld:
 maybe-info-ld: info-ld
 
 info-ld: \
-    configure-ld
+    configure-ld 
 	@[ -f ./ld/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23360,7 +23337,7 @@ maybe-dvi-ld:
 maybe-dvi-ld: dvi-ld
 
 dvi-ld: \
-    configure-ld
+    configure-ld 
 	@[ -f ./ld/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23385,7 +23362,7 @@ maybe-pdf-ld:
 maybe-pdf-ld: pdf-ld
 
 pdf-ld: \
-    configure-ld
+    configure-ld 
 	@[ -f ./ld/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23410,7 +23387,7 @@ maybe-html-ld:
 maybe-html-ld: html-ld
 
 html-ld: \
-    configure-ld
+    configure-ld 
 	@[ -f ./ld/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23435,7 +23412,7 @@ maybe-TAGS-ld:
 maybe-TAGS-ld: TAGS-ld
 
 TAGS-ld: \
-    configure-ld
+    configure-ld 
 	@[ -f ./ld/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23461,7 +23438,7 @@ maybe-install-info-ld: install-info-ld
 
 install-info-ld: \
     configure-ld \
-    info-ld
+    info-ld 
 	@[ -f ./ld/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23487,7 +23464,7 @@ maybe-install-dvi-ld: install-dvi-ld
 
 install-dvi-ld: \
     configure-ld \
-    dvi-ld
+    dvi-ld 
 	@[ -f ./ld/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23513,7 +23490,7 @@ maybe-install-pdf-ld: install-pdf-ld
 
 install-pdf-ld: \
     configure-ld \
-    pdf-ld
+    pdf-ld 
 	@[ -f ./ld/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23539,7 +23516,7 @@ maybe-install-html-ld: install-html-ld
 
 install-html-ld: \
     configure-ld \
-    html-ld
+    html-ld 
 	@[ -f ./ld/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23564,7 +23541,7 @@ maybe-installcheck-ld:
 maybe-installcheck-ld: installcheck-ld
 
 installcheck-ld: \
-    configure-ld
+    configure-ld 
 	@[ -f ./ld/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23588,7 +23565,7 @@ maybe-mostlyclean-ld:
 @if ld
 maybe-mostlyclean-ld: mostlyclean-ld
 
-mostlyclean-ld:
+mostlyclean-ld: 
 	@[ -f ./ld/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23612,7 +23589,7 @@ maybe-clean-ld:
 @if ld
 maybe-clean-ld: clean-ld
 
-clean-ld:
+clean-ld: 
 	@[ -f ./ld/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23636,7 +23613,7 @@ maybe-distclean-ld:
 @if ld
 maybe-distclean-ld: distclean-ld
 
-distclean-ld:
+distclean-ld: 
 	@[ -f ./ld/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23660,7 +23637,7 @@ maybe-maintainer-clean-ld:
 @if ld
 maybe-maintainer-clean-ld: maintainer-clean-ld
 
-maintainer-clean-ld:
+maintainer-clean-ld: 
 	@[ -f ./ld/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23688,7 +23665,7 @@ configure-libbacktrace: stage_current
 @endif gcc-bootstrap
 @if libbacktrace
 maybe-configure-libbacktrace: configure-libbacktrace
-configure-libbacktrace:
+configure-libbacktrace: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libbacktrace/Makefile || exit 0; \
@@ -24475,7 +24452,7 @@ maybe-info-libbacktrace:
 maybe-info-libbacktrace: info-libbacktrace
 
 info-libbacktrace: \
-    configure-libbacktrace
+    configure-libbacktrace 
 	@[ -f ./libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24500,7 +24477,7 @@ maybe-dvi-libbacktrace:
 maybe-dvi-libbacktrace: dvi-libbacktrace
 
 dvi-libbacktrace: \
-    configure-libbacktrace
+    configure-libbacktrace 
 	@[ -f ./libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24525,7 +24502,7 @@ maybe-pdf-libbacktrace:
 maybe-pdf-libbacktrace: pdf-libbacktrace
 
 pdf-libbacktrace: \
-    configure-libbacktrace
+    configure-libbacktrace 
 	@[ -f ./libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24550,7 +24527,7 @@ maybe-html-libbacktrace:
 maybe-html-libbacktrace: html-libbacktrace
 
 html-libbacktrace: \
-    configure-libbacktrace
+    configure-libbacktrace 
 	@[ -f ./libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24575,7 +24552,7 @@ maybe-TAGS-libbacktrace:
 maybe-TAGS-libbacktrace: TAGS-libbacktrace
 
 TAGS-libbacktrace: \
-    configure-libbacktrace
+    configure-libbacktrace 
 	@[ -f ./libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24601,7 +24578,7 @@ maybe-install-info-libbacktrace: install-info-libbacktrace
 
 install-info-libbacktrace: \
     configure-libbacktrace \
-    info-libbacktrace
+    info-libbacktrace 
 	@[ -f ./libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24627,7 +24604,7 @@ maybe-install-dvi-libbacktrace: install-dvi-libbacktrace
 
 install-dvi-libbacktrace: \
     configure-libbacktrace \
-    dvi-libbacktrace
+    dvi-libbacktrace 
 	@[ -f ./libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24653,7 +24630,7 @@ maybe-install-pdf-libbacktrace: install-pdf-libbacktrace
 
 install-pdf-libbacktrace: \
     configure-libbacktrace \
-    pdf-libbacktrace
+    pdf-libbacktrace 
 	@[ -f ./libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24679,7 +24656,7 @@ maybe-install-html-libbacktrace: install-html-libbacktrace
 
 install-html-libbacktrace: \
     configure-libbacktrace \
-    html-libbacktrace
+    html-libbacktrace 
 	@[ -f ./libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24704,7 +24681,7 @@ maybe-installcheck-libbacktrace:
 maybe-installcheck-libbacktrace: installcheck-libbacktrace
 
 installcheck-libbacktrace: \
-    configure-libbacktrace
+    configure-libbacktrace 
 	@[ -f ./libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24728,7 +24705,7 @@ maybe-mostlyclean-libbacktrace:
 @if libbacktrace
 maybe-mostlyclean-libbacktrace: mostlyclean-libbacktrace
 
-mostlyclean-libbacktrace:
+mostlyclean-libbacktrace: 
 	@[ -f ./libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24752,7 +24729,7 @@ maybe-clean-libbacktrace:
 @if libbacktrace
 maybe-clean-libbacktrace: clean-libbacktrace
 
-clean-libbacktrace:
+clean-libbacktrace: 
 	@[ -f ./libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24776,7 +24753,7 @@ maybe-distclean-libbacktrace:
 @if libbacktrace
 maybe-distclean-libbacktrace: distclean-libbacktrace
 
-distclean-libbacktrace:
+distclean-libbacktrace: 
 	@[ -f ./libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24800,7 +24777,7 @@ maybe-maintainer-clean-libbacktrace:
 @if libbacktrace
 maybe-maintainer-clean-libbacktrace: maintainer-clean-libbacktrace
 
-maintainer-clean-libbacktrace:
+maintainer-clean-libbacktrace: 
 	@[ -f ./libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24828,7 +24805,7 @@ configure-libcpp: stage_current
 @endif gcc-bootstrap
 @if libcpp
 maybe-configure-libcpp: configure-libcpp
-configure-libcpp:
+configure-libcpp: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
@@ -25615,7 +25592,7 @@ maybe-info-libcpp:
 maybe-info-libcpp: info-libcpp
 
 info-libcpp: \
-    configure-libcpp
+    configure-libcpp 
 	@[ -f ./libcpp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25640,7 +25617,7 @@ maybe-dvi-libcpp:
 maybe-dvi-libcpp: dvi-libcpp
 
 dvi-libcpp: \
-    configure-libcpp
+    configure-libcpp 
 	@[ -f ./libcpp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25665,7 +25642,7 @@ maybe-pdf-libcpp:
 maybe-pdf-libcpp: pdf-libcpp
 
 pdf-libcpp: \
-    configure-libcpp
+    configure-libcpp 
 	@[ -f ./libcpp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25690,7 +25667,7 @@ maybe-html-libcpp:
 maybe-html-libcpp: html-libcpp
 
 html-libcpp: \
-    configure-libcpp
+    configure-libcpp 
 	@[ -f ./libcpp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25715,7 +25692,7 @@ maybe-TAGS-libcpp:
 maybe-TAGS-libcpp: TAGS-libcpp
 
 TAGS-libcpp: \
-    configure-libcpp
+    configure-libcpp 
 	@[ -f ./libcpp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25741,7 +25718,7 @@ maybe-install-info-libcpp: install-info-libcpp
 
 install-info-libcpp: \
     configure-libcpp \
-    info-libcpp
+    info-libcpp 
 	@[ -f ./libcpp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25767,7 +25744,7 @@ maybe-install-dvi-libcpp: install-dvi-libcpp
 
 install-dvi-libcpp: \
     configure-libcpp \
-    dvi-libcpp
+    dvi-libcpp 
 	@[ -f ./libcpp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25793,7 +25770,7 @@ maybe-install-pdf-libcpp: install-pdf-libcpp
 
 install-pdf-libcpp: \
     configure-libcpp \
-    pdf-libcpp
+    pdf-libcpp 
 	@[ -f ./libcpp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25819,7 +25796,7 @@ maybe-install-html-libcpp: install-html-libcpp
 
 install-html-libcpp: \
     configure-libcpp \
-    html-libcpp
+    html-libcpp 
 	@[ -f ./libcpp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25844,7 +25821,7 @@ maybe-installcheck-libcpp:
 maybe-installcheck-libcpp: installcheck-libcpp
 
 installcheck-libcpp: \
-    configure-libcpp
+    configure-libcpp 
 	@[ -f ./libcpp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25868,7 +25845,7 @@ maybe-mostlyclean-libcpp:
 @if libcpp
 maybe-mostlyclean-libcpp: mostlyclean-libcpp
 
-mostlyclean-libcpp:
+mostlyclean-libcpp: 
 	@[ -f ./libcpp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25892,7 +25869,7 @@ maybe-clean-libcpp:
 @if libcpp
 maybe-clean-libcpp: clean-libcpp
 
-clean-libcpp:
+clean-libcpp: 
 	@[ -f ./libcpp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25916,7 +25893,7 @@ maybe-distclean-libcpp:
 @if libcpp
 maybe-distclean-libcpp: distclean-libcpp
 
-distclean-libcpp:
+distclean-libcpp: 
 	@[ -f ./libcpp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25940,7 +25917,7 @@ maybe-maintainer-clean-libcpp:
 @if libcpp
 maybe-maintainer-clean-libcpp: maintainer-clean-libcpp
 
-maintainer-clean-libcpp:
+maintainer-clean-libcpp: 
 	@[ -f ./libcpp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25968,7 +25945,7 @@ configure-libcody: stage_current
 @endif gcc-bootstrap
 @if libcody
 maybe-configure-libcody: configure-libcody
-configure-libcody:
+configure-libcody: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libcody/Makefile || exit 0; \
@@ -26833,7 +26810,7 @@ maybe-installcheck-libcody:
 maybe-installcheck-libcody: installcheck-libcody
 
 installcheck-libcody: \
-    configure-libcody
+    configure-libcody 
 	@[ -f ./libcody/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26857,7 +26834,7 @@ maybe-mostlyclean-libcody:
 @if libcody
 maybe-mostlyclean-libcody: mostlyclean-libcody
 
-mostlyclean-libcody:
+mostlyclean-libcody: 
 	@[ -f ./libcody/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26881,7 +26858,7 @@ maybe-clean-libcody:
 @if libcody
 maybe-clean-libcody: clean-libcody
 
-clean-libcody:
+clean-libcody: 
 	@[ -f ./libcody/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26905,7 +26882,7 @@ maybe-distclean-libcody:
 @if libcody
 maybe-distclean-libcody: distclean-libcody
 
-distclean-libcody:
+distclean-libcody: 
 	@[ -f ./libcody/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26929,7 +26906,7 @@ maybe-maintainer-clean-libcody:
 @if libcody
 maybe-maintainer-clean-libcody: maintainer-clean-libcody
 
-maintainer-clean-libcody:
+maintainer-clean-libcody: 
 	@[ -f ./libcody/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26957,7 +26934,7 @@ configure-libdecnumber: stage_current
 @endif gcc-bootstrap
 @if libdecnumber
 maybe-configure-libdecnumber: configure-libdecnumber
-configure-libdecnumber:
+configure-libdecnumber: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
@@ -27744,7 +27721,7 @@ maybe-info-libdecnumber:
 maybe-info-libdecnumber: info-libdecnumber
 
 info-libdecnumber: \
-    configure-libdecnumber
+    configure-libdecnumber 
 	@[ -f ./libdecnumber/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27769,7 +27746,7 @@ maybe-dvi-libdecnumber:
 maybe-dvi-libdecnumber: dvi-libdecnumber
 
 dvi-libdecnumber: \
-    configure-libdecnumber
+    configure-libdecnumber 
 	@[ -f ./libdecnumber/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27794,7 +27771,7 @@ maybe-pdf-libdecnumber:
 maybe-pdf-libdecnumber: pdf-libdecnumber
 
 pdf-libdecnumber: \
-    configure-libdecnumber
+    configure-libdecnumber 
 	@[ -f ./libdecnumber/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27819,7 +27796,7 @@ maybe-html-libdecnumber:
 maybe-html-libdecnumber: html-libdecnumber
 
 html-libdecnumber: \
-    configure-libdecnumber
+    configure-libdecnumber 
 	@[ -f ./libdecnumber/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27855,7 +27832,7 @@ maybe-install-info-libdecnumber: install-info-libdecnumber
 
 install-info-libdecnumber: \
     configure-libdecnumber \
-    info-libdecnumber
+    info-libdecnumber 
 	@[ -f ./libdecnumber/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27881,7 +27858,7 @@ maybe-install-dvi-libdecnumber: install-dvi-libdecnumber
 
 install-dvi-libdecnumber: \
     configure-libdecnumber \
-    dvi-libdecnumber
+    dvi-libdecnumber 
 	@[ -f ./libdecnumber/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27907,7 +27884,7 @@ maybe-install-pdf-libdecnumber: install-pdf-libdecnumber
 
 install-pdf-libdecnumber: \
     configure-libdecnumber \
-    pdf-libdecnumber
+    pdf-libdecnumber 
 	@[ -f ./libdecnumber/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27933,7 +27910,7 @@ maybe-install-html-libdecnumber: install-html-libdecnumber
 
 install-html-libdecnumber: \
     configure-libdecnumber \
-    html-libdecnumber
+    html-libdecnumber 
 	@[ -f ./libdecnumber/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27958,7 +27935,7 @@ maybe-installcheck-libdecnumber:
 maybe-installcheck-libdecnumber: installcheck-libdecnumber
 
 installcheck-libdecnumber: \
-    configure-libdecnumber
+    configure-libdecnumber 
 	@[ -f ./libdecnumber/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27982,7 +27959,7 @@ maybe-mostlyclean-libdecnumber:
 @if libdecnumber
 maybe-mostlyclean-libdecnumber: mostlyclean-libdecnumber
 
-mostlyclean-libdecnumber:
+mostlyclean-libdecnumber: 
 	@[ -f ./libdecnumber/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28006,7 +27983,7 @@ maybe-clean-libdecnumber:
 @if libdecnumber
 maybe-clean-libdecnumber: clean-libdecnumber
 
-clean-libdecnumber:
+clean-libdecnumber: 
 	@[ -f ./libdecnumber/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28030,7 +28007,7 @@ maybe-distclean-libdecnumber:
 @if libdecnumber
 maybe-distclean-libdecnumber: distclean-libdecnumber
 
-distclean-libdecnumber:
+distclean-libdecnumber: 
 	@[ -f ./libdecnumber/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28054,7 +28031,7 @@ maybe-maintainer-clean-libdecnumber:
 @if libdecnumber
 maybe-maintainer-clean-libdecnumber: maintainer-clean-libdecnumber
 
-maintainer-clean-libdecnumber:
+maintainer-clean-libdecnumber: 
 	@[ -f ./libdecnumber/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28082,7 +28059,7 @@ configure-libgui: stage_current
 @endif gcc-bootstrap
 @if libgui
 maybe-configure-libgui: configure-libgui
-configure-libgui:
+configure-libgui: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28183,7 +28160,7 @@ maybe-info-libgui:
 maybe-info-libgui: info-libgui
 
 info-libgui: \
-    configure-libgui
+    configure-libgui 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -28209,7 +28186,7 @@ maybe-dvi-libgui:
 maybe-dvi-libgui: dvi-libgui
 
 dvi-libgui: \
-    configure-libgui
+    configure-libgui 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -28235,7 +28212,7 @@ maybe-pdf-libgui:
 maybe-pdf-libgui: pdf-libgui
 
 pdf-libgui: \
-    configure-libgui
+    configure-libgui 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -28261,7 +28238,7 @@ maybe-html-libgui:
 maybe-html-libgui: html-libgui
 
 html-libgui: \
-    configure-libgui
+    configure-libgui 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -28287,7 +28264,7 @@ maybe-TAGS-libgui:
 maybe-TAGS-libgui: TAGS-libgui
 
 TAGS-libgui: \
-    configure-libgui
+    configure-libgui 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -28314,7 +28291,7 @@ maybe-install-info-libgui: install-info-libgui
 
 install-info-libgui: \
     configure-libgui \
-    info-libgui
+    info-libgui 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -28341,7 +28318,7 @@ maybe-install-dvi-libgui: install-dvi-libgui
 
 install-dvi-libgui: \
     configure-libgui \
-    dvi-libgui
+    dvi-libgui 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -28368,7 +28345,7 @@ maybe-install-pdf-libgui: install-pdf-libgui
 
 install-pdf-libgui: \
     configure-libgui \
-    pdf-libgui
+    pdf-libgui 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -28395,7 +28372,7 @@ maybe-install-html-libgui: install-html-libgui
 
 install-html-libgui: \
     configure-libgui \
-    html-libgui
+    html-libgui 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -28421,7 +28398,7 @@ maybe-installcheck-libgui:
 maybe-installcheck-libgui: installcheck-libgui
 
 installcheck-libgui: \
-    configure-libgui
+    configure-libgui 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -28446,7 +28423,7 @@ maybe-mostlyclean-libgui:
 @if libgui
 maybe-mostlyclean-libgui: mostlyclean-libgui
 
-mostlyclean-libgui:
+mostlyclean-libgui: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -28471,7 +28448,7 @@ maybe-clean-libgui:
 @if libgui
 maybe-clean-libgui: clean-libgui
 
-clean-libgui:
+clean-libgui: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -28496,7 +28473,7 @@ maybe-distclean-libgui:
 @if libgui
 maybe-distclean-libgui: distclean-libgui
 
-distclean-libgui:
+distclean-libgui: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -28521,7 +28498,7 @@ maybe-maintainer-clean-libgui:
 @if libgui
 maybe-maintainer-clean-libgui: maintainer-clean-libgui
 
-maintainer-clean-libgui:
+maintainer-clean-libgui: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -28550,7 +28527,7 @@ configure-libiberty: stage_current
 @endif gcc-bootstrap
 @if libiberty
 maybe-configure-libiberty: configure-libiberty
-configure-libiberty:
+configure-libiberty: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
@@ -29346,7 +29323,7 @@ maybe-info-libiberty:
 maybe-info-libiberty: info-libiberty
 
 info-libiberty: \
-    configure-libiberty
+    configure-libiberty 
 	@[ -f ./libiberty/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29371,7 +29348,7 @@ maybe-dvi-libiberty:
 maybe-dvi-libiberty: dvi-libiberty
 
 dvi-libiberty: \
-    configure-libiberty
+    configure-libiberty 
 	@[ -f ./libiberty/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29396,7 +29373,7 @@ maybe-pdf-libiberty:
 maybe-pdf-libiberty: pdf-libiberty
 
 pdf-libiberty: \
-    configure-libiberty
+    configure-libiberty 
 	@[ -f ./libiberty/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29421,7 +29398,7 @@ maybe-html-libiberty:
 maybe-html-libiberty: html-libiberty
 
 html-libiberty: \
-    configure-libiberty
+    configure-libiberty 
 	@[ -f ./libiberty/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29446,7 +29423,7 @@ maybe-TAGS-libiberty:
 maybe-TAGS-libiberty: TAGS-libiberty
 
 TAGS-libiberty: \
-    configure-libiberty
+    configure-libiberty 
 	@[ -f ./libiberty/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29472,7 +29449,7 @@ maybe-install-info-libiberty: install-info-libiberty
 
 install-info-libiberty: \
     configure-libiberty \
-    info-libiberty
+    info-libiberty 
 	@[ -f ./libiberty/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29498,7 +29475,7 @@ maybe-install-dvi-libiberty: install-dvi-libiberty
 
 install-dvi-libiberty: \
     configure-libiberty \
-    dvi-libiberty
+    dvi-libiberty 
 	@[ -f ./libiberty/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29524,7 +29501,7 @@ maybe-install-pdf-libiberty: install-pdf-libiberty
 
 install-pdf-libiberty: \
     configure-libiberty \
-    pdf-libiberty
+    pdf-libiberty 
 	@[ -f ./libiberty/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29550,7 +29527,7 @@ maybe-install-html-libiberty: install-html-libiberty
 
 install-html-libiberty: \
     configure-libiberty \
-    html-libiberty
+    html-libiberty 
 	@[ -f ./libiberty/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29575,7 +29552,7 @@ maybe-installcheck-libiberty:
 maybe-installcheck-libiberty: installcheck-libiberty
 
 installcheck-libiberty: \
-    configure-libiberty
+    configure-libiberty 
 	@[ -f ./libiberty/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29599,7 +29576,7 @@ maybe-mostlyclean-libiberty:
 @if libiberty
 maybe-mostlyclean-libiberty: mostlyclean-libiberty
 
-mostlyclean-libiberty:
+mostlyclean-libiberty: 
 	@[ -f ./libiberty/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29623,7 +29600,7 @@ maybe-clean-libiberty:
 @if libiberty
 maybe-clean-libiberty: clean-libiberty
 
-clean-libiberty:
+clean-libiberty: 
 	@[ -f ./libiberty/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29647,7 +29624,7 @@ maybe-distclean-libiberty:
 @if libiberty
 maybe-distclean-libiberty: distclean-libiberty
 
-distclean-libiberty:
+distclean-libiberty: 
 	@[ -f ./libiberty/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29671,7 +29648,7 @@ maybe-maintainer-clean-libiberty:
 @if libiberty
 maybe-maintainer-clean-libiberty: maintainer-clean-libiberty
 
-maintainer-clean-libiberty:
+maintainer-clean-libiberty: 
 	@[ -f ./libiberty/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29699,7 +29676,7 @@ configure-libiberty-linker-plugin: stage_current
 @endif gcc-bootstrap
 @if libiberty-linker-plugin
 maybe-configure-libiberty-linker-plugin: configure-libiberty-linker-plugin
-configure-libiberty-linker-plugin:
+configure-libiberty-linker-plugin: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \
@@ -30495,7 +30472,7 @@ maybe-info-libiberty-linker-plugin:
 maybe-info-libiberty-linker-plugin: info-libiberty-linker-plugin
 
 info-libiberty-linker-plugin: \
-    configure-libiberty-linker-plugin
+    configure-libiberty-linker-plugin 
 	@[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30520,7 +30497,7 @@ maybe-dvi-libiberty-linker-plugin:
 maybe-dvi-libiberty-linker-plugin: dvi-libiberty-linker-plugin
 
 dvi-libiberty-linker-plugin: \
-    configure-libiberty-linker-plugin
+    configure-libiberty-linker-plugin 
 	@[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30545,7 +30522,7 @@ maybe-pdf-libiberty-linker-plugin:
 maybe-pdf-libiberty-linker-plugin: pdf-libiberty-linker-plugin
 
 pdf-libiberty-linker-plugin: \
-    configure-libiberty-linker-plugin
+    configure-libiberty-linker-plugin 
 	@[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30570,7 +30547,7 @@ maybe-html-libiberty-linker-plugin:
 maybe-html-libiberty-linker-plugin: html-libiberty-linker-plugin
 
 html-libiberty-linker-plugin: \
-    configure-libiberty-linker-plugin
+    configure-libiberty-linker-plugin 
 	@[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30595,7 +30572,7 @@ maybe-TAGS-libiberty-linker-plugin:
 maybe-TAGS-libiberty-linker-plugin: TAGS-libiberty-linker-plugin
 
 TAGS-libiberty-linker-plugin: \
-    configure-libiberty-linker-plugin
+    configure-libiberty-linker-plugin 
 	@[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30621,7 +30598,7 @@ maybe-install-info-libiberty-linker-plugin: install-info-libiberty-linker-plugin
 
 install-info-libiberty-linker-plugin: \
     configure-libiberty-linker-plugin \
-    info-libiberty-linker-plugin
+    info-libiberty-linker-plugin 
 	@[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30647,7 +30624,7 @@ maybe-install-dvi-libiberty-linker-plugin: install-dvi-libiberty-linker-plugin
 
 install-dvi-libiberty-linker-plugin: \
     configure-libiberty-linker-plugin \
-    dvi-libiberty-linker-plugin
+    dvi-libiberty-linker-plugin 
 	@[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30673,7 +30650,7 @@ maybe-install-pdf-libiberty-linker-plugin: install-pdf-libiberty-linker-plugin
 
 install-pdf-libiberty-linker-plugin: \
     configure-libiberty-linker-plugin \
-    pdf-libiberty-linker-plugin
+    pdf-libiberty-linker-plugin 
 	@[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30699,7 +30676,7 @@ maybe-install-html-libiberty-linker-plugin: install-html-libiberty-linker-plugin
 
 install-html-libiberty-linker-plugin: \
     configure-libiberty-linker-plugin \
-    html-libiberty-linker-plugin
+    html-libiberty-linker-plugin 
 	@[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30724,7 +30701,7 @@ maybe-installcheck-libiberty-linker-plugin:
 maybe-installcheck-libiberty-linker-plugin: installcheck-libiberty-linker-plugin
 
 installcheck-libiberty-linker-plugin: \
-    configure-libiberty-linker-plugin
+    configure-libiberty-linker-plugin 
 	@[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30748,7 +30725,7 @@ maybe-mostlyclean-libiberty-linker-plugin:
 @if libiberty-linker-plugin
 maybe-mostlyclean-libiberty-linker-plugin: mostlyclean-libiberty-linker-plugin
 
-mostlyclean-libiberty-linker-plugin:
+mostlyclean-libiberty-linker-plugin: 
 	@[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30772,7 +30749,7 @@ maybe-clean-libiberty-linker-plugin:
 @if libiberty-linker-plugin
 maybe-clean-libiberty-linker-plugin: clean-libiberty-linker-plugin
 
-clean-libiberty-linker-plugin:
+clean-libiberty-linker-plugin: 
 	@[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30796,7 +30773,7 @@ maybe-distclean-libiberty-linker-plugin:
 @if libiberty-linker-plugin
 maybe-distclean-libiberty-linker-plugin: distclean-libiberty-linker-plugin
 
-distclean-libiberty-linker-plugin:
+distclean-libiberty-linker-plugin: 
 	@[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30820,7 +30797,7 @@ maybe-maintainer-clean-libiberty-linker-plugin:
 @if libiberty-linker-plugin
 maybe-maintainer-clean-libiberty-linker-plugin: maintainer-clean-libiberty-linker-plugin
 
-maintainer-clean-libiberty-linker-plugin:
+maintainer-clean-libiberty-linker-plugin: 
 	@[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30848,7 +30825,7 @@ configure-libiconv: stage_current
 @endif gcc-bootstrap
 @if libiconv
 maybe-configure-libiconv: configure-libiconv
-configure-libiconv:
+configure-libiconv: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libiconv/Makefile || exit 0; \
@@ -31642,7 +31619,7 @@ maybe-dvi-libiconv:
 maybe-dvi-libiconv: dvi-libiconv
 
 dvi-libiconv: \
-    configure-libiconv
+    configure-libiconv 
 	@[ -f ./libiconv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31687,7 +31664,7 @@ maybe-TAGS-libiconv:
 maybe-TAGS-libiconv: TAGS-libiconv
 
 TAGS-libiconv: \
-    configure-libiconv
+    configure-libiconv 
 	@[ -f ./libiconv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31723,7 +31700,7 @@ maybe-install-dvi-libiconv: install-dvi-libiconv
 
 install-dvi-libiconv: \
     configure-libiconv \
-    dvi-libiconv
+    dvi-libiconv 
 	@[ -f ./libiconv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31768,7 +31745,7 @@ maybe-installcheck-libiconv:
 maybe-installcheck-libiconv: installcheck-libiconv
 
 installcheck-libiconv: \
-    configure-libiconv
+    configure-libiconv 
 	@[ -f ./libiconv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31792,7 +31769,7 @@ maybe-mostlyclean-libiconv:
 @if libiconv
 maybe-mostlyclean-libiconv: mostlyclean-libiconv
 
-mostlyclean-libiconv:
+mostlyclean-libiconv: 
 	@[ -f ./libiconv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31816,7 +31793,7 @@ maybe-clean-libiconv:
 @if libiconv
 maybe-clean-libiconv: clean-libiconv
 
-clean-libiconv:
+clean-libiconv: 
 	@[ -f ./libiconv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31840,7 +31817,7 @@ maybe-distclean-libiconv:
 @if libiconv
 maybe-distclean-libiconv: distclean-libiconv
 
-distclean-libiconv:
+distclean-libiconv: 
 	@[ -f ./libiconv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31864,7 +31841,7 @@ maybe-maintainer-clean-libiconv:
 @if libiconv
 maybe-maintainer-clean-libiconv: maintainer-clean-libiconv
 
-maintainer-clean-libiconv:
+maintainer-clean-libiconv: 
 	@[ -f ./libiconv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31892,7 +31869,7 @@ configure-m4: stage_current
 @endif gcc-bootstrap
 @if m4
 maybe-configure-m4: configure-m4
-configure-m4:
+configure-m4: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31993,7 +31970,7 @@ maybe-info-m4:
 maybe-info-m4: info-m4
 
 info-m4: \
-    configure-m4
+    configure-m4 
 	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32019,7 +31996,7 @@ maybe-dvi-m4:
 maybe-dvi-m4: dvi-m4
 
 dvi-m4: \
-    configure-m4
+    configure-m4 
 	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32045,7 +32022,7 @@ maybe-pdf-m4:
 maybe-pdf-m4: pdf-m4
 
 pdf-m4: \
-    configure-m4
+    configure-m4 
 	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32071,7 +32048,7 @@ maybe-html-m4:
 maybe-html-m4: html-m4
 
 html-m4: \
-    configure-m4
+    configure-m4 
 	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32097,7 +32074,7 @@ maybe-TAGS-m4:
 maybe-TAGS-m4: TAGS-m4
 
 TAGS-m4: \
-    configure-m4
+    configure-m4 
 	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32124,7 +32101,7 @@ maybe-install-info-m4: install-info-m4
 
 install-info-m4: \
     configure-m4 \
-    info-m4
+    info-m4 
 	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32151,7 +32128,7 @@ maybe-install-dvi-m4: install-dvi-m4
 
 install-dvi-m4: \
     configure-m4 \
-    dvi-m4
+    dvi-m4 
 	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32178,7 +32155,7 @@ maybe-install-pdf-m4: install-pdf-m4
 
 install-pdf-m4: \
     configure-m4 \
-    pdf-m4
+    pdf-m4 
 	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32205,7 +32182,7 @@ maybe-install-html-m4: install-html-m4
 
 install-html-m4: \
     configure-m4 \
-    html-m4
+    html-m4 
 	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32231,7 +32208,7 @@ maybe-installcheck-m4:
 maybe-installcheck-m4: installcheck-m4
 
 installcheck-m4: \
-    configure-m4
+    configure-m4 
 	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32256,7 +32233,7 @@ maybe-mostlyclean-m4:
 @if m4
 maybe-mostlyclean-m4: mostlyclean-m4
 
-mostlyclean-m4:
+mostlyclean-m4: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32281,7 +32258,7 @@ maybe-clean-m4:
 @if m4
 maybe-clean-m4: clean-m4
 
-clean-m4:
+clean-m4: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32306,7 +32283,7 @@ maybe-distclean-m4:
 @if m4
 maybe-distclean-m4: distclean-m4
 
-distclean-m4:
+distclean-m4: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32331,7 +32308,7 @@ maybe-maintainer-clean-m4:
 @if m4
 maybe-maintainer-clean-m4: maintainer-clean-m4
 
-maintainer-clean-m4:
+maintainer-clean-m4: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32360,7 +32337,7 @@ configure-readline: stage_current
 @endif gcc-bootstrap
 @if readline
 maybe-configure-readline: configure-readline
-configure-readline:
+configure-readline: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32461,7 +32438,7 @@ maybe-info-readline:
 maybe-info-readline: info-readline
 
 info-readline: \
-    configure-readline
+    configure-readline 
 	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32487,7 +32464,7 @@ maybe-dvi-readline:
 maybe-dvi-readline: dvi-readline
 
 dvi-readline: \
-    configure-readline
+    configure-readline 
 	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32513,7 +32490,7 @@ maybe-pdf-readline:
 maybe-pdf-readline: pdf-readline
 
 pdf-readline: \
-    configure-readline
+    configure-readline 
 	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32539,7 +32516,7 @@ maybe-html-readline:
 maybe-html-readline: html-readline
 
 html-readline: \
-    configure-readline
+    configure-readline 
 	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32565,7 +32542,7 @@ maybe-TAGS-readline:
 maybe-TAGS-readline: TAGS-readline
 
 TAGS-readline: \
-    configure-readline
+    configure-readline 
 	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32592,7 +32569,7 @@ maybe-install-info-readline: install-info-readline
 
 install-info-readline: \
     configure-readline \
-    info-readline
+    info-readline 
 	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32619,7 +32596,7 @@ maybe-install-dvi-readline: install-dvi-readline
 
 install-dvi-readline: \
     configure-readline \
-    dvi-readline
+    dvi-readline 
 	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32646,7 +32623,7 @@ maybe-install-pdf-readline: install-pdf-readline
 
 install-pdf-readline: \
     configure-readline \
-    pdf-readline
+    pdf-readline 
 	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32673,7 +32650,7 @@ maybe-install-html-readline: install-html-readline
 
 install-html-readline: \
     configure-readline \
-    html-readline
+    html-readline 
 	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32699,7 +32676,7 @@ maybe-installcheck-readline:
 maybe-installcheck-readline: installcheck-readline
 
 installcheck-readline: \
-    configure-readline
+    configure-readline 
 	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32724,7 +32701,7 @@ maybe-mostlyclean-readline:
 @if readline
 maybe-mostlyclean-readline: mostlyclean-readline
 
-mostlyclean-readline:
+mostlyclean-readline: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32749,7 +32726,7 @@ maybe-clean-readline:
 @if readline
 maybe-clean-readline: clean-readline
 
-clean-readline:
+clean-readline: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32774,7 +32751,7 @@ maybe-distclean-readline:
 @if readline
 maybe-distclean-readline: distclean-readline
 
-distclean-readline:
+distclean-readline: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32799,7 +32776,7 @@ maybe-maintainer-clean-readline:
 @if readline
 maybe-maintainer-clean-readline: maintainer-clean-readline
 
-maintainer-clean-readline:
+maintainer-clean-readline: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32828,7 +32805,7 @@ configure-sid: stage_current
 @endif gcc-bootstrap
 @if sid
 maybe-configure-sid: configure-sid
-configure-sid:
+configure-sid: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32929,7 +32906,7 @@ maybe-info-sid:
 maybe-info-sid: info-sid
 
 info-sid: \
-    configure-sid
+    configure-sid 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32955,7 +32932,7 @@ maybe-dvi-sid:
 maybe-dvi-sid: dvi-sid
 
 dvi-sid: \
-    configure-sid
+    configure-sid 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -32981,7 +32958,7 @@ maybe-pdf-sid:
 maybe-pdf-sid: pdf-sid
 
 pdf-sid: \
-    configure-sid
+    configure-sid 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33007,7 +32984,7 @@ maybe-html-sid:
 maybe-html-sid: html-sid
 
 html-sid: \
-    configure-sid
+    configure-sid 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33033,7 +33010,7 @@ maybe-TAGS-sid:
 maybe-TAGS-sid: TAGS-sid
 
 TAGS-sid: \
-    configure-sid
+    configure-sid 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33060,7 +33037,7 @@ maybe-install-info-sid: install-info-sid
 
 install-info-sid: \
     configure-sid \
-    info-sid
+    info-sid 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33087,7 +33064,7 @@ maybe-install-dvi-sid: install-dvi-sid
 
 install-dvi-sid: \
     configure-sid \
-    dvi-sid
+    dvi-sid 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33114,7 +33091,7 @@ maybe-install-pdf-sid: install-pdf-sid
 
 install-pdf-sid: \
     configure-sid \
-    pdf-sid
+    pdf-sid 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33141,7 +33118,7 @@ maybe-install-html-sid: install-html-sid
 
 install-html-sid: \
     configure-sid \
-    html-sid
+    html-sid 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33167,7 +33144,7 @@ maybe-installcheck-sid:
 maybe-installcheck-sid: installcheck-sid
 
 installcheck-sid: \
-    configure-sid
+    configure-sid 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33192,7 +33169,7 @@ maybe-mostlyclean-sid:
 @if sid
 maybe-mostlyclean-sid: mostlyclean-sid
 
-mostlyclean-sid:
+mostlyclean-sid: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33217,7 +33194,7 @@ maybe-clean-sid:
 @if sid
 maybe-clean-sid: clean-sid
 
-clean-sid:
+clean-sid: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33242,7 +33219,7 @@ maybe-distclean-sid:
 @if sid
 maybe-distclean-sid: distclean-sid
 
-distclean-sid:
+distclean-sid: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33267,7 +33244,7 @@ maybe-maintainer-clean-sid:
 @if sid
 maybe-maintainer-clean-sid: maintainer-clean-sid
 
-maintainer-clean-sid:
+maintainer-clean-sid: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33296,7 +33273,7 @@ configure-sim: stage_current
 @endif gcc-bootstrap
 @if sim
 maybe-configure-sim: configure-sim
-configure-sim:
+configure-sim: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33397,7 +33374,7 @@ maybe-info-sim:
 maybe-info-sim: info-sim
 
 info-sim: \
-    configure-sim
+    configure-sim 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33423,7 +33400,7 @@ maybe-dvi-sim:
 maybe-dvi-sim: dvi-sim
 
 dvi-sim: \
-    configure-sim
+    configure-sim 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33449,7 +33426,7 @@ maybe-pdf-sim:
 maybe-pdf-sim: pdf-sim
 
 pdf-sim: \
-    configure-sim
+    configure-sim 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33475,7 +33452,7 @@ maybe-html-sim:
 maybe-html-sim: html-sim
 
 html-sim: \
-    configure-sim
+    configure-sim 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33501,7 +33478,7 @@ maybe-TAGS-sim:
 maybe-TAGS-sim: TAGS-sim
 
 TAGS-sim: \
-    configure-sim
+    configure-sim 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33528,7 +33505,7 @@ maybe-install-info-sim: install-info-sim
 
 install-info-sim: \
     configure-sim \
-    info-sim
+    info-sim 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33555,7 +33532,7 @@ maybe-install-dvi-sim: install-dvi-sim
 
 install-dvi-sim: \
     configure-sim \
-    dvi-sim
+    dvi-sim 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33582,7 +33559,7 @@ maybe-install-pdf-sim: install-pdf-sim
 
 install-pdf-sim: \
     configure-sim \
-    pdf-sim
+    pdf-sim 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33609,7 +33586,7 @@ maybe-install-html-sim: install-html-sim
 
 install-html-sim: \
     configure-sim \
-    html-sim
+    html-sim 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33635,7 +33612,7 @@ maybe-installcheck-sim:
 maybe-installcheck-sim: installcheck-sim
 
 installcheck-sim: \
-    configure-sim
+    configure-sim 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33660,7 +33637,7 @@ maybe-mostlyclean-sim:
 @if sim
 maybe-mostlyclean-sim: mostlyclean-sim
 
-mostlyclean-sim:
+mostlyclean-sim: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33685,7 +33662,7 @@ maybe-clean-sim:
 @if sim
 maybe-clean-sim: clean-sim
 
-clean-sim:
+clean-sim: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33710,7 +33687,7 @@ maybe-distclean-sim:
 @if sim
 maybe-distclean-sim: distclean-sim
 
-distclean-sim:
+distclean-sim: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33735,7 +33712,7 @@ maybe-maintainer-clean-sim:
 @if sim
 maybe-maintainer-clean-sim: maintainer-clean-sim
 
-maintainer-clean-sim:
+maintainer-clean-sim: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33764,7 +33741,7 @@ configure-texinfo: stage_current
 @endif gcc-bootstrap
 @if texinfo
 maybe-configure-texinfo: configure-texinfo
-configure-texinfo:
+configure-texinfo: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33853,7 +33830,7 @@ maybe-info-texinfo:
 maybe-info-texinfo: info-texinfo
 
 info-texinfo: \
-    configure-texinfo
+    configure-texinfo 
 	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33879,7 +33856,7 @@ maybe-dvi-texinfo:
 maybe-dvi-texinfo: dvi-texinfo
 
 dvi-texinfo: \
-    configure-texinfo
+    configure-texinfo 
 	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33905,7 +33882,7 @@ maybe-pdf-texinfo:
 maybe-pdf-texinfo: pdf-texinfo
 
 pdf-texinfo: \
-    configure-texinfo
+    configure-texinfo 
 	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33931,7 +33908,7 @@ maybe-html-texinfo:
 maybe-html-texinfo: html-texinfo
 
 html-texinfo: \
-    configure-texinfo
+    configure-texinfo 
 	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33957,7 +33934,7 @@ maybe-TAGS-texinfo:
 maybe-TAGS-texinfo: TAGS-texinfo
 
 TAGS-texinfo: \
-    configure-texinfo
+    configure-texinfo 
 	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -33984,7 +33961,7 @@ maybe-install-info-texinfo: install-info-texinfo
 
 install-info-texinfo: \
     configure-texinfo \
-    info-texinfo
+    info-texinfo 
 	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -34011,7 +33988,7 @@ maybe-install-dvi-texinfo: install-dvi-texinfo
 
 install-dvi-texinfo: \
     configure-texinfo \
-    dvi-texinfo
+    dvi-texinfo 
 	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -34038,7 +34015,7 @@ maybe-install-pdf-texinfo: install-pdf-texinfo
 
 install-pdf-texinfo: \
     configure-texinfo \
-    pdf-texinfo
+    pdf-texinfo 
 	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -34065,7 +34042,7 @@ maybe-install-html-texinfo: install-html-texinfo
 
 install-html-texinfo: \
     configure-texinfo \
-    html-texinfo
+    html-texinfo 
 	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -34091,7 +34068,7 @@ maybe-installcheck-texinfo:
 maybe-installcheck-texinfo: installcheck-texinfo
 
 installcheck-texinfo: \
-    configure-texinfo
+    configure-texinfo 
 	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -34116,7 +34093,7 @@ maybe-mostlyclean-texinfo:
 @if texinfo
 maybe-mostlyclean-texinfo: mostlyclean-texinfo
 
-mostlyclean-texinfo:
+mostlyclean-texinfo: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -34141,7 +34118,7 @@ maybe-clean-texinfo:
 @if texinfo
 maybe-clean-texinfo: clean-texinfo
 
-clean-texinfo:
+clean-texinfo: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -34166,7 +34143,7 @@ maybe-distclean-texinfo:
 @if texinfo
 maybe-distclean-texinfo: distclean-texinfo
 
-distclean-texinfo:
+distclean-texinfo: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -34191,7 +34168,7 @@ maybe-maintainer-clean-texinfo:
 @if texinfo
 maybe-maintainer-clean-texinfo: maintainer-clean-texinfo
 
-maintainer-clean-texinfo:
+maintainer-clean-texinfo: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -34220,7 +34197,7 @@ configure-zlib: stage_current
 @endif gcc-bootstrap
 @if zlib
 maybe-configure-zlib: configure-zlib
-configure-zlib:
+configure-zlib: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
@@ -34998,7 +34975,7 @@ maybe-info-zlib:
 maybe-info-zlib: info-zlib
 
 info-zlib: \
-    configure-zlib
+    configure-zlib 
 	@[ -f ./zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35023,7 +35000,7 @@ maybe-dvi-zlib:
 maybe-dvi-zlib: dvi-zlib
 
 dvi-zlib: \
-    configure-zlib
+    configure-zlib 
 	@[ -f ./zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35048,7 +35025,7 @@ maybe-pdf-zlib:
 maybe-pdf-zlib: pdf-zlib
 
 pdf-zlib: \
-    configure-zlib
+    configure-zlib 
 	@[ -f ./zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35073,7 +35050,7 @@ maybe-html-zlib:
 maybe-html-zlib: html-zlib
 
 html-zlib: \
-    configure-zlib
+    configure-zlib 
 	@[ -f ./zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35098,7 +35075,7 @@ maybe-TAGS-zlib:
 maybe-TAGS-zlib: TAGS-zlib
 
 TAGS-zlib: \
-    configure-zlib
+    configure-zlib 
 	@[ -f ./zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35124,7 +35101,7 @@ maybe-install-info-zlib: install-info-zlib
 
 install-info-zlib: \
     configure-zlib \
-    info-zlib
+    info-zlib 
 	@[ -f ./zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35150,7 +35127,7 @@ maybe-install-dvi-zlib: install-dvi-zlib
 
 install-dvi-zlib: \
     configure-zlib \
-    dvi-zlib
+    dvi-zlib 
 	@[ -f ./zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35176,7 +35153,7 @@ maybe-install-pdf-zlib: install-pdf-zlib
 
 install-pdf-zlib: \
     configure-zlib \
-    pdf-zlib
+    pdf-zlib 
 	@[ -f ./zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35202,7 +35179,7 @@ maybe-install-html-zlib: install-html-zlib
 
 install-html-zlib: \
     configure-zlib \
-    html-zlib
+    html-zlib 
 	@[ -f ./zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35227,7 +35204,7 @@ maybe-installcheck-zlib:
 maybe-installcheck-zlib: installcheck-zlib
 
 installcheck-zlib: \
-    configure-zlib
+    configure-zlib 
 	@[ -f ./zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35251,7 +35228,7 @@ maybe-mostlyclean-zlib:
 @if zlib
 maybe-mostlyclean-zlib: mostlyclean-zlib
 
-mostlyclean-zlib:
+mostlyclean-zlib: 
 	@[ -f ./zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35275,7 +35252,7 @@ maybe-clean-zlib:
 @if zlib
 maybe-clean-zlib: clean-zlib
 
-clean-zlib:
+clean-zlib: 
 	@[ -f ./zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35299,7 +35276,7 @@ maybe-distclean-zlib:
 @if zlib
 maybe-distclean-zlib: distclean-zlib
 
-distclean-zlib:
+distclean-zlib: 
 	@[ -f ./zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35323,7 +35300,7 @@ maybe-maintainer-clean-zlib:
 @if zlib
 maybe-maintainer-clean-zlib: maintainer-clean-zlib
 
-maintainer-clean-zlib:
+maintainer-clean-zlib: 
 	@[ -f ./zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35351,7 +35328,7 @@ configure-gnulib: stage_current
 @endif gcc-bootstrap
 @if gnulib
 maybe-configure-gnulib: configure-gnulib
-configure-gnulib:
+configure-gnulib: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35452,7 +35429,7 @@ maybe-info-gnulib:
 maybe-info-gnulib: info-gnulib
 
 info-gnulib: \
-    configure-gnulib
+    configure-gnulib 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnulib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -35478,7 +35455,7 @@ maybe-dvi-gnulib:
 maybe-dvi-gnulib: dvi-gnulib
 
 dvi-gnulib: \
-    configure-gnulib
+    configure-gnulib 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnulib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -35504,7 +35481,7 @@ maybe-pdf-gnulib:
 maybe-pdf-gnulib: pdf-gnulib
 
 pdf-gnulib: \
-    configure-gnulib
+    configure-gnulib 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnulib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -35530,7 +35507,7 @@ maybe-html-gnulib:
 maybe-html-gnulib: html-gnulib
 
 html-gnulib: \
-    configure-gnulib
+    configure-gnulib 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnulib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -35556,7 +35533,7 @@ maybe-TAGS-gnulib:
 maybe-TAGS-gnulib: TAGS-gnulib
 
 TAGS-gnulib: \
-    configure-gnulib
+    configure-gnulib 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnulib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -35583,7 +35560,7 @@ maybe-install-info-gnulib: install-info-gnulib
 
 install-info-gnulib: \
     configure-gnulib \
-    info-gnulib
+    info-gnulib 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnulib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -35610,7 +35587,7 @@ maybe-install-dvi-gnulib: install-dvi-gnulib
 
 install-dvi-gnulib: \
     configure-gnulib \
-    dvi-gnulib
+    dvi-gnulib 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnulib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -35637,7 +35614,7 @@ maybe-install-pdf-gnulib: install-pdf-gnulib
 
 install-pdf-gnulib: \
     configure-gnulib \
-    pdf-gnulib
+    pdf-gnulib 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnulib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -35664,7 +35641,7 @@ maybe-install-html-gnulib: install-html-gnulib
 
 install-html-gnulib: \
     configure-gnulib \
-    html-gnulib
+    html-gnulib 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnulib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -35690,7 +35667,7 @@ maybe-installcheck-gnulib:
 maybe-installcheck-gnulib: installcheck-gnulib
 
 installcheck-gnulib: \
-    configure-gnulib
+    configure-gnulib 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnulib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -35715,7 +35692,7 @@ maybe-mostlyclean-gnulib:
 @if gnulib
 maybe-mostlyclean-gnulib: mostlyclean-gnulib
 
-mostlyclean-gnulib:
+mostlyclean-gnulib: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnulib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -35740,7 +35717,7 @@ maybe-clean-gnulib:
 @if gnulib
 maybe-clean-gnulib: clean-gnulib
 
-clean-gnulib:
+clean-gnulib: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnulib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -35765,7 +35742,7 @@ maybe-distclean-gnulib:
 @if gnulib
 maybe-distclean-gnulib: distclean-gnulib
 
-distclean-gnulib:
+distclean-gnulib: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnulib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -35790,7 +35767,7 @@ maybe-maintainer-clean-gnulib:
 @if gnulib
 maybe-maintainer-clean-gnulib: maintainer-clean-gnulib
 
-maintainer-clean-gnulib:
+maintainer-clean-gnulib: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnulib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -35819,7 +35796,7 @@ configure-gdbsupport: stage_current
 @endif gcc-bootstrap
 @if gdbsupport
 maybe-configure-gdbsupport: configure-gdbsupport
-configure-gdbsupport:
+configure-gdbsupport: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35920,7 +35897,7 @@ maybe-info-gdbsupport:
 maybe-info-gdbsupport: info-gdbsupport
 
 info-gdbsupport: \
-    configure-gdbsupport
+    configure-gdbsupport 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbsupport/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -35946,7 +35923,7 @@ maybe-dvi-gdbsupport:
 maybe-dvi-gdbsupport: dvi-gdbsupport
 
 dvi-gdbsupport: \
-    configure-gdbsupport
+    configure-gdbsupport 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbsupport/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -35972,7 +35949,7 @@ maybe-pdf-gdbsupport:
 maybe-pdf-gdbsupport: pdf-gdbsupport
 
 pdf-gdbsupport: \
-    configure-gdbsupport
+    configure-gdbsupport 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbsupport/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -35998,7 +35975,7 @@ maybe-html-gdbsupport:
 maybe-html-gdbsupport: html-gdbsupport
 
 html-gdbsupport: \
-    configure-gdbsupport
+    configure-gdbsupport 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbsupport/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36024,7 +36001,7 @@ maybe-TAGS-gdbsupport:
 maybe-TAGS-gdbsupport: TAGS-gdbsupport
 
 TAGS-gdbsupport: \
-    configure-gdbsupport
+    configure-gdbsupport 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbsupport/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36051,7 +36028,7 @@ maybe-install-info-gdbsupport: install-info-gdbsupport
 
 install-info-gdbsupport: \
     configure-gdbsupport \
-    info-gdbsupport
+    info-gdbsupport 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbsupport/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36078,7 +36055,7 @@ maybe-install-dvi-gdbsupport: install-dvi-gdbsupport
 
 install-dvi-gdbsupport: \
     configure-gdbsupport \
-    dvi-gdbsupport
+    dvi-gdbsupport 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbsupport/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36105,7 +36082,7 @@ maybe-install-pdf-gdbsupport: install-pdf-gdbsupport
 
 install-pdf-gdbsupport: \
     configure-gdbsupport \
-    pdf-gdbsupport
+    pdf-gdbsupport 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbsupport/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36132,7 +36109,7 @@ maybe-install-html-gdbsupport: install-html-gdbsupport
 
 install-html-gdbsupport: \
     configure-gdbsupport \
-    html-gdbsupport
+    html-gdbsupport 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbsupport/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36158,7 +36135,7 @@ maybe-installcheck-gdbsupport:
 maybe-installcheck-gdbsupport: installcheck-gdbsupport
 
 installcheck-gdbsupport: \
-    configure-gdbsupport
+    configure-gdbsupport 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbsupport/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36183,7 +36160,7 @@ maybe-mostlyclean-gdbsupport:
 @if gdbsupport
 maybe-mostlyclean-gdbsupport: mostlyclean-gdbsupport
 
-mostlyclean-gdbsupport:
+mostlyclean-gdbsupport: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbsupport/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36208,7 +36185,7 @@ maybe-clean-gdbsupport:
 @if gdbsupport
 maybe-clean-gdbsupport: clean-gdbsupport
 
-clean-gdbsupport:
+clean-gdbsupport: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbsupport/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36233,7 +36210,7 @@ maybe-distclean-gdbsupport:
 @if gdbsupport
 maybe-distclean-gdbsupport: distclean-gdbsupport
 
-distclean-gdbsupport:
+distclean-gdbsupport: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbsupport/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36258,7 +36235,7 @@ maybe-maintainer-clean-gdbsupport:
 @if gdbsupport
 maybe-maintainer-clean-gdbsupport: maintainer-clean-gdbsupport
 
-maintainer-clean-gdbsupport:
+maintainer-clean-gdbsupport: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbsupport/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36287,7 +36264,7 @@ configure-gdbserver: stage_current
 @endif gcc-bootstrap
 @if gdbserver
 maybe-configure-gdbserver: configure-gdbserver
-configure-gdbserver:
+configure-gdbserver: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -36388,7 +36365,7 @@ maybe-info-gdbserver:
 maybe-info-gdbserver: info-gdbserver
 
 info-gdbserver: \
-    configure-gdbserver
+    configure-gdbserver 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbserver/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36414,7 +36391,7 @@ maybe-dvi-gdbserver:
 maybe-dvi-gdbserver: dvi-gdbserver
 
 dvi-gdbserver: \
-    configure-gdbserver
+    configure-gdbserver 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbserver/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36440,7 +36417,7 @@ maybe-pdf-gdbserver:
 maybe-pdf-gdbserver: pdf-gdbserver
 
 pdf-gdbserver: \
-    configure-gdbserver
+    configure-gdbserver 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbserver/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36466,7 +36443,7 @@ maybe-html-gdbserver:
 maybe-html-gdbserver: html-gdbserver
 
 html-gdbserver: \
-    configure-gdbserver
+    configure-gdbserver 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbserver/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36492,7 +36469,7 @@ maybe-TAGS-gdbserver:
 maybe-TAGS-gdbserver: TAGS-gdbserver
 
 TAGS-gdbserver: \
-    configure-gdbserver
+    configure-gdbserver 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbserver/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36519,7 +36496,7 @@ maybe-install-info-gdbserver: install-info-gdbserver
 
 install-info-gdbserver: \
     configure-gdbserver \
-    info-gdbserver
+    info-gdbserver 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbserver/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36546,7 +36523,7 @@ maybe-install-dvi-gdbserver: install-dvi-gdbserver
 
 install-dvi-gdbserver: \
     configure-gdbserver \
-    dvi-gdbserver
+    dvi-gdbserver 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbserver/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36573,7 +36550,7 @@ maybe-install-pdf-gdbserver: install-pdf-gdbserver
 
 install-pdf-gdbserver: \
     configure-gdbserver \
-    pdf-gdbserver
+    pdf-gdbserver 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbserver/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36600,7 +36577,7 @@ maybe-install-html-gdbserver: install-html-gdbserver
 
 install-html-gdbserver: \
     configure-gdbserver \
-    html-gdbserver
+    html-gdbserver 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbserver/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36626,7 +36603,7 @@ maybe-installcheck-gdbserver:
 maybe-installcheck-gdbserver: installcheck-gdbserver
 
 installcheck-gdbserver: \
-    configure-gdbserver
+    configure-gdbserver 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbserver/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36651,7 +36628,7 @@ maybe-mostlyclean-gdbserver:
 @if gdbserver
 maybe-mostlyclean-gdbserver: mostlyclean-gdbserver
 
-mostlyclean-gdbserver:
+mostlyclean-gdbserver: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbserver/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36676,7 +36653,7 @@ maybe-clean-gdbserver:
 @if gdbserver
 maybe-clean-gdbserver: clean-gdbserver
 
-clean-gdbserver:
+clean-gdbserver: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbserver/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36701,7 +36678,7 @@ maybe-distclean-gdbserver:
 @if gdbserver
 maybe-distclean-gdbserver: distclean-gdbserver
 
-distclean-gdbserver:
+distclean-gdbserver: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbserver/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36726,7 +36703,7 @@ maybe-maintainer-clean-gdbserver:
 @if gdbserver
 maybe-maintainer-clean-gdbserver: maintainer-clean-gdbserver
 
-maintainer-clean-gdbserver:
+maintainer-clean-gdbserver: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdbserver/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36755,7 +36732,7 @@ configure-gdb: stage_current
 @endif gcc-bootstrap
 @if gdb
 maybe-configure-gdb: configure-gdb
-configure-gdb:
+configure-gdb: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -36856,7 +36833,7 @@ maybe-info-gdb:
 maybe-info-gdb: info-gdb
 
 info-gdb: \
-    configure-gdb
+    configure-gdb 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36882,7 +36859,7 @@ maybe-dvi-gdb:
 maybe-dvi-gdb: dvi-gdb
 
 dvi-gdb: \
-    configure-gdb
+    configure-gdb 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36908,7 +36885,7 @@ maybe-pdf-gdb:
 maybe-pdf-gdb: pdf-gdb
 
 pdf-gdb: \
-    configure-gdb
+    configure-gdb 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36934,7 +36911,7 @@ maybe-html-gdb:
 maybe-html-gdb: html-gdb
 
 html-gdb: \
-    configure-gdb
+    configure-gdb 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36960,7 +36937,7 @@ maybe-TAGS-gdb:
 maybe-TAGS-gdb: TAGS-gdb
 
 TAGS-gdb: \
-    configure-gdb
+    configure-gdb 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -36987,7 +36964,7 @@ maybe-install-info-gdb: install-info-gdb
 
 install-info-gdb: \
     configure-gdb \
-    info-gdb
+    info-gdb 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37014,7 +36991,7 @@ maybe-install-dvi-gdb: install-dvi-gdb
 
 install-dvi-gdb: \
     configure-gdb \
-    dvi-gdb
+    dvi-gdb 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37041,7 +37018,7 @@ maybe-install-pdf-gdb: install-pdf-gdb
 
 install-pdf-gdb: \
     configure-gdb \
-    pdf-gdb
+    pdf-gdb 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37068,7 +37045,7 @@ maybe-install-html-gdb: install-html-gdb
 
 install-html-gdb: \
     configure-gdb \
-    html-gdb
+    html-gdb 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37094,7 +37071,7 @@ maybe-installcheck-gdb:
 maybe-installcheck-gdb: installcheck-gdb
 
 installcheck-gdb: \
-    configure-gdb
+    configure-gdb 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37119,7 +37096,7 @@ maybe-mostlyclean-gdb:
 @if gdb
 maybe-mostlyclean-gdb: mostlyclean-gdb
 
-mostlyclean-gdb:
+mostlyclean-gdb: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37144,7 +37121,7 @@ maybe-clean-gdb:
 @if gdb
 maybe-clean-gdb: clean-gdb
 
-clean-gdb:
+clean-gdb: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37169,7 +37146,7 @@ maybe-distclean-gdb:
 @if gdb
 maybe-distclean-gdb: distclean-gdb
 
-distclean-gdb:
+distclean-gdb: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37194,7 +37171,7 @@ maybe-maintainer-clean-gdb:
 @if gdb
 maybe-maintainer-clean-gdb: maintainer-clean-gdb
 
-maintainer-clean-gdb:
+maintainer-clean-gdb: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37223,7 +37200,7 @@ configure-expect: stage_current
 @endif gcc-bootstrap
 @if expect
 maybe-configure-expect: configure-expect
-configure-expect:
+configure-expect: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -37324,7 +37301,7 @@ maybe-info-expect:
 maybe-info-expect: info-expect
 
 info-expect: \
-    configure-expect
+    configure-expect 
 	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37350,7 +37327,7 @@ maybe-dvi-expect:
 maybe-dvi-expect: dvi-expect
 
 dvi-expect: \
-    configure-expect
+    configure-expect 
 	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37376,7 +37353,7 @@ maybe-pdf-expect:
 maybe-pdf-expect: pdf-expect
 
 pdf-expect: \
-    configure-expect
+    configure-expect 
 	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37402,7 +37379,7 @@ maybe-html-expect:
 maybe-html-expect: html-expect
 
 html-expect: \
-    configure-expect
+    configure-expect 
 	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37428,7 +37405,7 @@ maybe-TAGS-expect:
 maybe-TAGS-expect: TAGS-expect
 
 TAGS-expect: \
-    configure-expect
+    configure-expect 
 	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37455,7 +37432,7 @@ maybe-install-info-expect: install-info-expect
 
 install-info-expect: \
     configure-expect \
-    info-expect
+    info-expect 
 	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37482,7 +37459,7 @@ maybe-install-dvi-expect: install-dvi-expect
 
 install-dvi-expect: \
     configure-expect \
-    dvi-expect
+    dvi-expect 
 	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37509,7 +37486,7 @@ maybe-install-pdf-expect: install-pdf-expect
 
 install-pdf-expect: \
     configure-expect \
-    pdf-expect
+    pdf-expect 
 	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37536,7 +37513,7 @@ maybe-install-html-expect: install-html-expect
 
 install-html-expect: \
     configure-expect \
-    html-expect
+    html-expect 
 	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37562,7 +37539,7 @@ maybe-installcheck-expect:
 maybe-installcheck-expect: installcheck-expect
 
 installcheck-expect: \
-    configure-expect
+    configure-expect 
 	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37587,7 +37564,7 @@ maybe-mostlyclean-expect:
 @if expect
 maybe-mostlyclean-expect: mostlyclean-expect
 
-mostlyclean-expect:
+mostlyclean-expect: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37612,7 +37589,7 @@ maybe-clean-expect:
 @if expect
 maybe-clean-expect: clean-expect
 
-clean-expect:
+clean-expect: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37637,7 +37614,7 @@ maybe-distclean-expect:
 @if expect
 maybe-distclean-expect: distclean-expect
 
-distclean-expect:
+distclean-expect: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37662,7 +37639,7 @@ maybe-maintainer-clean-expect:
 @if expect
 maybe-maintainer-clean-expect: maintainer-clean-expect
 
-maintainer-clean-expect:
+maintainer-clean-expect: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37691,7 +37668,7 @@ configure-guile: stage_current
 @endif gcc-bootstrap
 @if guile
 maybe-configure-guile: configure-guile
-configure-guile:
+configure-guile: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -37792,7 +37769,7 @@ maybe-info-guile:
 maybe-info-guile: info-guile
 
 info-guile: \
-    configure-guile
+    configure-guile 
 	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37818,7 +37795,7 @@ maybe-dvi-guile:
 maybe-dvi-guile: dvi-guile
 
 dvi-guile: \
-    configure-guile
+    configure-guile 
 	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37844,7 +37821,7 @@ maybe-pdf-guile:
 maybe-pdf-guile: pdf-guile
 
 pdf-guile: \
-    configure-guile
+    configure-guile 
 	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37870,7 +37847,7 @@ maybe-html-guile:
 maybe-html-guile: html-guile
 
 html-guile: \
-    configure-guile
+    configure-guile 
 	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37896,7 +37873,7 @@ maybe-TAGS-guile:
 maybe-TAGS-guile: TAGS-guile
 
 TAGS-guile: \
-    configure-guile
+    configure-guile 
 	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37923,7 +37900,7 @@ maybe-install-info-guile: install-info-guile
 
 install-info-guile: \
     configure-guile \
-    info-guile
+    info-guile 
 	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37950,7 +37927,7 @@ maybe-install-dvi-guile: install-dvi-guile
 
 install-dvi-guile: \
     configure-guile \
-    dvi-guile
+    dvi-guile 
 	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -37977,7 +37954,7 @@ maybe-install-pdf-guile: install-pdf-guile
 
 install-pdf-guile: \
     configure-guile \
-    pdf-guile
+    pdf-guile 
 	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38004,7 +37981,7 @@ maybe-install-html-guile: install-html-guile
 
 install-html-guile: \
     configure-guile \
-    html-guile
+    html-guile 
 	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38030,7 +38007,7 @@ maybe-installcheck-guile:
 maybe-installcheck-guile: installcheck-guile
 
 installcheck-guile: \
-    configure-guile
+    configure-guile 
 	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38055,7 +38032,7 @@ maybe-mostlyclean-guile:
 @if guile
 maybe-mostlyclean-guile: mostlyclean-guile
 
-mostlyclean-guile:
+mostlyclean-guile: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38080,7 +38057,7 @@ maybe-clean-guile:
 @if guile
 maybe-clean-guile: clean-guile
 
-clean-guile:
+clean-guile: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38105,7 +38082,7 @@ maybe-distclean-guile:
 @if guile
 maybe-distclean-guile: distclean-guile
 
-distclean-guile:
+distclean-guile: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38130,7 +38107,7 @@ maybe-maintainer-clean-guile:
 @if guile
 maybe-maintainer-clean-guile: maintainer-clean-guile
 
-maintainer-clean-guile:
+maintainer-clean-guile: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38159,7 +38136,7 @@ configure-tk: stage_current
 @endif gcc-bootstrap
 @if tk
 maybe-configure-tk: configure-tk
-configure-tk:
+configure-tk: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -38260,7 +38237,7 @@ maybe-info-tk:
 maybe-info-tk: info-tk
 
 info-tk: \
-    configure-tk
+    configure-tk 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38286,7 +38263,7 @@ maybe-dvi-tk:
 maybe-dvi-tk: dvi-tk
 
 dvi-tk: \
-    configure-tk
+    configure-tk 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38312,7 +38289,7 @@ maybe-pdf-tk:
 maybe-pdf-tk: pdf-tk
 
 pdf-tk: \
-    configure-tk
+    configure-tk 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38338,7 +38315,7 @@ maybe-html-tk:
 maybe-html-tk: html-tk
 
 html-tk: \
-    configure-tk
+    configure-tk 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38364,7 +38341,7 @@ maybe-TAGS-tk:
 maybe-TAGS-tk: TAGS-tk
 
 TAGS-tk: \
-    configure-tk
+    configure-tk 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38391,7 +38368,7 @@ maybe-install-info-tk: install-info-tk
 
 install-info-tk: \
     configure-tk \
-    info-tk
+    info-tk 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38418,7 +38395,7 @@ maybe-install-dvi-tk: install-dvi-tk
 
 install-dvi-tk: \
     configure-tk \
-    dvi-tk
+    dvi-tk 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38445,7 +38422,7 @@ maybe-install-pdf-tk: install-pdf-tk
 
 install-pdf-tk: \
     configure-tk \
-    pdf-tk
+    pdf-tk 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38472,7 +38449,7 @@ maybe-install-html-tk: install-html-tk
 
 install-html-tk: \
     configure-tk \
-    html-tk
+    html-tk 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38498,7 +38475,7 @@ maybe-installcheck-tk:
 maybe-installcheck-tk: installcheck-tk
 
 installcheck-tk: \
-    configure-tk
+    configure-tk 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38523,7 +38500,7 @@ maybe-mostlyclean-tk:
 @if tk
 maybe-mostlyclean-tk: mostlyclean-tk
 
-mostlyclean-tk:
+mostlyclean-tk: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38548,7 +38525,7 @@ maybe-clean-tk:
 @if tk
 maybe-clean-tk: clean-tk
 
-clean-tk:
+clean-tk: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38573,7 +38550,7 @@ maybe-distclean-tk:
 @if tk
 maybe-distclean-tk: distclean-tk
 
-distclean-tk:
+distclean-tk: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38598,7 +38575,7 @@ maybe-maintainer-clean-tk:
 @if tk
 maybe-maintainer-clean-tk: maintainer-clean-tk
 
-maintainer-clean-tk:
+maintainer-clean-tk: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38627,7 +38604,7 @@ configure-libtermcap: stage_current
 @endif gcc-bootstrap
 @if libtermcap
 maybe-configure-libtermcap: configure-libtermcap
-configure-libtermcap:
+configure-libtermcap: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -38722,7 +38699,7 @@ maybe-info-libtermcap:
 maybe-info-libtermcap: info-libtermcap
 
 info-libtermcap: \
-    configure-libtermcap
+    configure-libtermcap 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38748,7 +38725,7 @@ maybe-dvi-libtermcap:
 maybe-dvi-libtermcap: dvi-libtermcap
 
 dvi-libtermcap: \
-    configure-libtermcap
+    configure-libtermcap 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38774,7 +38751,7 @@ maybe-pdf-libtermcap:
 maybe-pdf-libtermcap: pdf-libtermcap
 
 pdf-libtermcap: \
-    configure-libtermcap
+    configure-libtermcap 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38800,7 +38777,7 @@ maybe-html-libtermcap:
 maybe-html-libtermcap: html-libtermcap
 
 html-libtermcap: \
-    configure-libtermcap
+    configure-libtermcap 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38826,7 +38803,7 @@ maybe-TAGS-libtermcap:
 maybe-TAGS-libtermcap: TAGS-libtermcap
 
 TAGS-libtermcap: \
-    configure-libtermcap
+    configure-libtermcap 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38853,7 +38830,7 @@ maybe-install-info-libtermcap: install-info-libtermcap
 
 install-info-libtermcap: \
     configure-libtermcap \
-    info-libtermcap
+    info-libtermcap 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38880,7 +38857,7 @@ maybe-install-dvi-libtermcap: install-dvi-libtermcap
 
 install-dvi-libtermcap: \
     configure-libtermcap \
-    dvi-libtermcap
+    dvi-libtermcap 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38907,7 +38884,7 @@ maybe-install-pdf-libtermcap: install-pdf-libtermcap
 
 install-pdf-libtermcap: \
     configure-libtermcap \
-    pdf-libtermcap
+    pdf-libtermcap 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38934,7 +38911,7 @@ maybe-install-html-libtermcap: install-html-libtermcap
 
 install-html-libtermcap: \
     configure-libtermcap \
-    html-libtermcap
+    html-libtermcap 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38960,7 +38937,7 @@ maybe-installcheck-libtermcap:
 maybe-installcheck-libtermcap: installcheck-libtermcap
 
 installcheck-libtermcap: \
-    configure-libtermcap
+    configure-libtermcap 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39029,7 +39006,7 @@ configure-utils: stage_current
 @endif gcc-bootstrap
 @if utils
 maybe-configure-utils: configure-utils
-configure-utils:
+configure-utils: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -39124,7 +39101,7 @@ maybe-info-utils:
 maybe-info-utils: info-utils
 
 info-utils: \
-    configure-utils
+    configure-utils 
 	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39150,7 +39127,7 @@ maybe-dvi-utils:
 maybe-dvi-utils: dvi-utils
 
 dvi-utils: \
-    configure-utils
+    configure-utils 
 	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39176,7 +39153,7 @@ maybe-pdf-utils:
 maybe-pdf-utils: pdf-utils
 
 pdf-utils: \
-    configure-utils
+    configure-utils 
 	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39202,7 +39179,7 @@ maybe-html-utils:
 maybe-html-utils: html-utils
 
 html-utils: \
-    configure-utils
+    configure-utils 
 	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39228,7 +39205,7 @@ maybe-TAGS-utils:
 maybe-TAGS-utils: TAGS-utils
 
 TAGS-utils: \
-    configure-utils
+    configure-utils 
 	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39255,7 +39232,7 @@ maybe-install-info-utils: install-info-utils
 
 install-info-utils: \
     configure-utils \
-    info-utils
+    info-utils 
 	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39282,7 +39259,7 @@ maybe-install-dvi-utils: install-dvi-utils
 
 install-dvi-utils: \
     configure-utils \
-    dvi-utils
+    dvi-utils 
 	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39309,7 +39286,7 @@ maybe-install-pdf-utils: install-pdf-utils
 
 install-pdf-utils: \
     configure-utils \
-    pdf-utils
+    pdf-utils 
 	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39336,7 +39313,7 @@ maybe-install-html-utils: install-html-utils
 
 install-html-utils: \
     configure-utils \
-    html-utils
+    html-utils 
 	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39362,7 +39339,7 @@ maybe-installcheck-utils:
 maybe-installcheck-utils: installcheck-utils
 
 installcheck-utils: \
-    configure-utils
+    configure-utils 
 	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39387,7 +39364,7 @@ maybe-mostlyclean-utils:
 @if utils
 maybe-mostlyclean-utils: mostlyclean-utils
 
-mostlyclean-utils:
+mostlyclean-utils: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39412,7 +39389,7 @@ maybe-clean-utils:
 @if utils
 maybe-clean-utils: clean-utils
 
-clean-utils:
+clean-utils: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39437,7 +39414,7 @@ maybe-distclean-utils:
 @if utils
 maybe-distclean-utils: distclean-utils
 
-distclean-utils:
+distclean-utils: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39462,7 +39439,7 @@ maybe-maintainer-clean-utils:
 @if utils
 maybe-maintainer-clean-utils: maintainer-clean-utils
 
-maintainer-clean-utils:
+maintainer-clean-utils: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39491,7 +39468,7 @@ configure-c++tools: stage_current
 @endif gcc-bootstrap
 @if c++tools
 maybe-configure-c++tools: configure-c++tools
-configure-c++tools:
+configure-c++tools: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -39592,7 +39569,7 @@ maybe-info-c++tools:
 maybe-info-c++tools: info-c++tools
 
 info-c++tools: \
-    configure-c++tools
+    configure-c++tools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./c++tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39618,7 +39595,7 @@ maybe-dvi-c++tools:
 maybe-dvi-c++tools: dvi-c++tools
 
 dvi-c++tools: \
-    configure-c++tools
+    configure-c++tools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./c++tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39644,7 +39621,7 @@ maybe-pdf-c++tools:
 maybe-pdf-c++tools: pdf-c++tools
 
 pdf-c++tools: \
-    configure-c++tools
+    configure-c++tools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./c++tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39670,7 +39647,7 @@ maybe-html-c++tools:
 maybe-html-c++tools: html-c++tools
 
 html-c++tools: \
-    configure-c++tools
+    configure-c++tools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./c++tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39707,7 +39684,7 @@ maybe-install-info-c++tools: install-info-c++tools
 
 install-info-c++tools: \
     configure-c++tools \
-    info-c++tools
+    info-c++tools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./c++tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39734,7 +39711,7 @@ maybe-install-dvi-c++tools: install-dvi-c++tools
 
 install-dvi-c++tools: \
     configure-c++tools \
-    dvi-c++tools
+    dvi-c++tools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./c++tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39761,7 +39738,7 @@ maybe-install-pdf-c++tools: install-pdf-c++tools
 
 install-pdf-c++tools: \
     configure-c++tools \
-    pdf-c++tools
+    pdf-c++tools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./c++tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39788,7 +39765,7 @@ maybe-install-html-c++tools: install-html-c++tools
 
 install-html-c++tools: \
     configure-c++tools \
-    html-c++tools
+    html-c++tools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./c++tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39814,7 +39791,7 @@ maybe-installcheck-c++tools:
 maybe-installcheck-c++tools: installcheck-c++tools
 
 installcheck-c++tools: \
-    configure-c++tools
+    configure-c++tools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./c++tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39839,7 +39816,7 @@ maybe-mostlyclean-c++tools:
 @if c++tools
 maybe-mostlyclean-c++tools: mostlyclean-c++tools
 
-mostlyclean-c++tools:
+mostlyclean-c++tools: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./c++tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39864,7 +39841,7 @@ maybe-clean-c++tools:
 @if c++tools
 maybe-clean-c++tools: clean-c++tools
 
-clean-c++tools:
+clean-c++tools: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./c++tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39889,7 +39866,7 @@ maybe-distclean-c++tools:
 @if c++tools
 maybe-distclean-c++tools: distclean-c++tools
 
-distclean-c++tools:
+distclean-c++tools: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./c++tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39914,7 +39891,7 @@ maybe-maintainer-clean-c++tools:
 @if c++tools
 maybe-maintainer-clean-c++tools: maintainer-clean-c++tools
 
-maintainer-clean-c++tools:
+maintainer-clean-c++tools: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./c++tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -39943,7 +39920,7 @@ configure-gnattools: stage_current
 @endif gcc-bootstrap
 @if gnattools
 maybe-configure-gnattools: configure-gnattools
-configure-gnattools:
+configure-gnattools: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -40044,7 +40021,7 @@ maybe-info-gnattools:
 maybe-info-gnattools: info-gnattools
 
 info-gnattools: \
-    configure-gnattools
+    configure-gnattools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40070,7 +40047,7 @@ maybe-dvi-gnattools:
 maybe-dvi-gnattools: dvi-gnattools
 
 dvi-gnattools: \
-    configure-gnattools
+    configure-gnattools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40096,7 +40073,7 @@ maybe-pdf-gnattools:
 maybe-pdf-gnattools: pdf-gnattools
 
 pdf-gnattools: \
-    configure-gnattools
+    configure-gnattools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40122,7 +40099,7 @@ maybe-html-gnattools:
 maybe-html-gnattools: html-gnattools
 
 html-gnattools: \
-    configure-gnattools
+    configure-gnattools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40148,7 +40125,7 @@ maybe-TAGS-gnattools:
 maybe-TAGS-gnattools: TAGS-gnattools
 
 TAGS-gnattools: \
-    configure-gnattools
+    configure-gnattools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40175,7 +40152,7 @@ maybe-install-info-gnattools: install-info-gnattools
 
 install-info-gnattools: \
     configure-gnattools \
-    info-gnattools
+    info-gnattools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40202,7 +40179,7 @@ maybe-install-dvi-gnattools: install-dvi-gnattools
 
 install-dvi-gnattools: \
     configure-gnattools \
-    dvi-gnattools
+    dvi-gnattools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40229,7 +40206,7 @@ maybe-install-pdf-gnattools: install-pdf-gnattools
 
 install-pdf-gnattools: \
     configure-gnattools \
-    pdf-gnattools
+    pdf-gnattools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40256,7 +40233,7 @@ maybe-install-html-gnattools: install-html-gnattools
 
 install-html-gnattools: \
     configure-gnattools \
-    html-gnattools
+    html-gnattools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40282,7 +40259,7 @@ maybe-installcheck-gnattools:
 maybe-installcheck-gnattools: installcheck-gnattools
 
 installcheck-gnattools: \
-    configure-gnattools
+    configure-gnattools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40307,7 +40284,7 @@ maybe-mostlyclean-gnattools:
 @if gnattools
 maybe-mostlyclean-gnattools: mostlyclean-gnattools
 
-mostlyclean-gnattools:
+mostlyclean-gnattools: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40332,7 +40309,7 @@ maybe-clean-gnattools:
 @if gnattools
 maybe-clean-gnattools: clean-gnattools
 
-clean-gnattools:
+clean-gnattools: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40357,7 +40334,7 @@ maybe-distclean-gnattools:
 @if gnattools
 maybe-distclean-gnattools: distclean-gnattools
 
-distclean-gnattools:
+distclean-gnattools: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40382,7 +40359,7 @@ maybe-maintainer-clean-gnattools:
 @if gnattools
 maybe-maintainer-clean-gnattools: maintainer-clean-gnattools
 
-maintainer-clean-gnattools:
+maintainer-clean-gnattools: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40411,7 +40388,7 @@ configure-lto-plugin: stage_current
 @endif gcc-bootstrap
 @if lto-plugin
 maybe-configure-lto-plugin: configure-lto-plugin
-configure-lto-plugin:
+configure-lto-plugin: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \
@@ -41207,7 +41184,7 @@ maybe-info-lto-plugin:
 maybe-info-lto-plugin: info-lto-plugin
 
 info-lto-plugin: \
-    configure-lto-plugin
+    configure-lto-plugin 
 	@[ -f ./lto-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -41232,7 +41209,7 @@ maybe-dvi-lto-plugin:
 maybe-dvi-lto-plugin: dvi-lto-plugin
 
 dvi-lto-plugin: \
-    configure-lto-plugin
+    configure-lto-plugin 
 	@[ -f ./lto-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -41257,7 +41234,7 @@ maybe-pdf-lto-plugin:
 maybe-pdf-lto-plugin: pdf-lto-plugin
 
 pdf-lto-plugin: \
-    configure-lto-plugin
+    configure-lto-plugin 
 	@[ -f ./lto-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -41282,7 +41259,7 @@ maybe-html-lto-plugin:
 maybe-html-lto-plugin: html-lto-plugin
 
 html-lto-plugin: \
-    configure-lto-plugin
+    configure-lto-plugin 
 	@[ -f ./lto-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -41307,7 +41284,7 @@ maybe-TAGS-lto-plugin:
 maybe-TAGS-lto-plugin: TAGS-lto-plugin
 
 TAGS-lto-plugin: \
-    configure-lto-plugin
+    configure-lto-plugin 
 	@[ -f ./lto-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -41333,7 +41310,7 @@ maybe-install-info-lto-plugin: install-info-lto-plugin
 
 install-info-lto-plugin: \
     configure-lto-plugin \
-    info-lto-plugin
+    info-lto-plugin 
 	@[ -f ./lto-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -41359,7 +41336,7 @@ maybe-install-dvi-lto-plugin: install-dvi-lto-plugin
 
 install-dvi-lto-plugin: \
     configure-lto-plugin \
-    dvi-lto-plugin
+    dvi-lto-plugin 
 	@[ -f ./lto-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -41385,7 +41362,7 @@ maybe-install-pdf-lto-plugin: install-pdf-lto-plugin
 
 install-pdf-lto-plugin: \
     configure-lto-plugin \
-    pdf-lto-plugin
+    pdf-lto-plugin 
 	@[ -f ./lto-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -41411,7 +41388,7 @@ maybe-install-html-lto-plugin: install-html-lto-plugin
 
 install-html-lto-plugin: \
     configure-lto-plugin \
-    html-lto-plugin
+    html-lto-plugin 
 	@[ -f ./lto-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -41436,7 +41413,7 @@ maybe-installcheck-lto-plugin:
 maybe-installcheck-lto-plugin: installcheck-lto-plugin
 
 installcheck-lto-plugin: \
-    configure-lto-plugin
+    configure-lto-plugin 
 	@[ -f ./lto-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -41460,7 +41437,7 @@ maybe-mostlyclean-lto-plugin:
 @if lto-plugin
 maybe-mostlyclean-lto-plugin: mostlyclean-lto-plugin
 
-mostlyclean-lto-plugin:
+mostlyclean-lto-plugin: 
 	@[ -f ./lto-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -41484,7 +41461,7 @@ maybe-clean-lto-plugin:
 @if lto-plugin
 maybe-clean-lto-plugin: clean-lto-plugin
 
-clean-lto-plugin:
+clean-lto-plugin: 
 	@[ -f ./lto-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -41508,7 +41485,7 @@ maybe-distclean-lto-plugin:
 @if lto-plugin
 maybe-distclean-lto-plugin: distclean-lto-plugin
 
-distclean-lto-plugin:
+distclean-lto-plugin: 
 	@[ -f ./lto-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -41532,7 +41509,7 @@ maybe-maintainer-clean-lto-plugin:
 @if lto-plugin
 maybe-maintainer-clean-lto-plugin: maintainer-clean-lto-plugin
 
-maintainer-clean-lto-plugin:
+maintainer-clean-lto-plugin: 
 	@[ -f ./lto-plugin/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -41560,7 +41537,7 @@ configure-libcc1: stage_current
 @endif gcc-bootstrap
 @if libcc1
 maybe-configure-libcc1: configure-libcc1
-configure-libcc1:
+configure-libcc1: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -41661,7 +41638,7 @@ maybe-info-libcc1:
 maybe-info-libcc1: info-libcc1
 
 info-libcc1: \
-    configure-libcc1
+    configure-libcc1 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -41687,7 +41664,7 @@ maybe-dvi-libcc1:
 maybe-dvi-libcc1: dvi-libcc1
 
 dvi-libcc1: \
-    configure-libcc1
+    configure-libcc1 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -41713,7 +41690,7 @@ maybe-pdf-libcc1:
 maybe-pdf-libcc1: pdf-libcc1
 
 pdf-libcc1: \
-    configure-libcc1
+    configure-libcc1 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -41739,7 +41716,7 @@ maybe-html-libcc1:
 maybe-html-libcc1: html-libcc1
 
 html-libcc1: \
-    configure-libcc1
+    configure-libcc1 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -41765,7 +41742,7 @@ maybe-TAGS-libcc1:
 maybe-TAGS-libcc1: TAGS-libcc1
 
 TAGS-libcc1: \
-    configure-libcc1
+    configure-libcc1 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -41792,7 +41769,7 @@ maybe-install-info-libcc1: install-info-libcc1
 
 install-info-libcc1: \
     configure-libcc1 \
-    info-libcc1
+    info-libcc1 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -41819,7 +41796,7 @@ maybe-install-dvi-libcc1: install-dvi-libcc1
 
 install-dvi-libcc1: \
     configure-libcc1 \
-    dvi-libcc1
+    dvi-libcc1 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -41846,7 +41823,7 @@ maybe-install-pdf-libcc1: install-pdf-libcc1
 
 install-pdf-libcc1: \
     configure-libcc1 \
-    pdf-libcc1
+    pdf-libcc1 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -41873,7 +41850,7 @@ maybe-install-html-libcc1: install-html-libcc1
 
 install-html-libcc1: \
     configure-libcc1 \
-    html-libcc1
+    html-libcc1 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -41899,7 +41876,7 @@ maybe-installcheck-libcc1:
 maybe-installcheck-libcc1: installcheck-libcc1
 
 installcheck-libcc1: \
-    configure-libcc1
+    configure-libcc1 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -41924,7 +41901,7 @@ maybe-mostlyclean-libcc1:
 @if libcc1
 maybe-mostlyclean-libcc1: mostlyclean-libcc1
 
-mostlyclean-libcc1:
+mostlyclean-libcc1: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -41949,7 +41926,7 @@ maybe-clean-libcc1:
 @if libcc1
 maybe-clean-libcc1: clean-libcc1
 
-clean-libcc1:
+clean-libcc1: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -41974,7 +41951,7 @@ maybe-distclean-libcc1:
 @if libcc1
 maybe-distclean-libcc1: distclean-libcc1
 
-distclean-libcc1:
+distclean-libcc1: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -41999,7 +41976,7 @@ maybe-maintainer-clean-libcc1:
 @if libcc1
 maybe-maintainer-clean-libcc1: maintainer-clean-libcc1
 
-maintainer-clean-libcc1:
+maintainer-clean-libcc1: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./libcc1/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -42021,474 +41998,6 @@ maintainer-clean-libcc1:
 
 
 
-.PHONY: configure-gm2tools maybe-configure-gm2tools
-maybe-configure-gm2tools:
-@if gcc-bootstrap
-configure-gm2tools: stage_current
-@endif gcc-bootstrap
-@if gm2tools
-maybe-configure-gm2tools: configure-gm2tools
-configure-gm2tools:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gm2tools/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gm2tools; \
-	$(HOST_EXPORTS)  \
-	echo Configuring in $(HOST_SUBDIR)/gm2tools; \
-	cd "$(HOST_SUBDIR)/gm2tools" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gm2tools/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=gm2tools; \
-	$(SHELL) \
-	  $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias}  \
-	  || exit 1
-@endif gm2tools
-
-
-
-
-
-.PHONY: all-gm2tools maybe-all-gm2tools
-maybe-all-gm2tools:
-@if gcc-bootstrap
-all-gm2tools: stage_current
-@endif gcc-bootstrap
-@if gm2tools
-TARGET-gm2tools=all
-maybe-all-gm2tools: all-gm2tools
-all-gm2tools: configure-gm2tools
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS)  \
-	(cd $(HOST_SUBDIR)/gm2tools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
-		$(TARGET-gm2tools))
-@endif gm2tools
-
-
-
-
-.PHONY: check-gm2tools maybe-check-gm2tools
-maybe-check-gm2tools:
-@if gm2tools
-maybe-check-gm2tools: check-gm2tools
-
-check-gm2tools:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS)  \
-	(cd $(HOST_SUBDIR)/gm2tools && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif gm2tools
-
-.PHONY: install-gm2tools maybe-install-gm2tools
-maybe-install-gm2tools:
-@if gm2tools
-maybe-install-gm2tools: install-gm2tools
-
-install-gm2tools: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gm2tools && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif gm2tools
-
-.PHONY: install-strip-gm2tools maybe-install-strip-gm2tools
-maybe-install-strip-gm2tools:
-@if gm2tools
-maybe-install-strip-gm2tools: install-strip-gm2tools
-
-install-strip-gm2tools: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gm2tools && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install-strip)
-
-@endif gm2tools
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-gm2tools info-gm2tools
-maybe-info-gm2tools:
-@if gm2tools
-maybe-info-gm2tools: info-gm2tools
-
-info-gm2tools: \
-    configure-gm2tools
-	@: $(MAKE); $(unstage)
-	@[ -f ./gm2tools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in gm2tools"; \
-	(cd $(HOST_SUBDIR)/gm2tools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          info) \
-	  || exit 1
-
-@endif gm2tools
-
-.PHONY: maybe-dvi-gm2tools dvi-gm2tools
-maybe-dvi-gm2tools:
-@if gm2tools
-maybe-dvi-gm2tools: dvi-gm2tools
-
-dvi-gm2tools: \
-    configure-gm2tools
-	@: $(MAKE); $(unstage)
-	@[ -f ./gm2tools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in gm2tools"; \
-	(cd $(HOST_SUBDIR)/gm2tools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          dvi) \
-	  || exit 1
-
-@endif gm2tools
-
-.PHONY: maybe-pdf-gm2tools pdf-gm2tools
-maybe-pdf-gm2tools:
-@if gm2tools
-maybe-pdf-gm2tools: pdf-gm2tools
-
-pdf-gm2tools: \
-    configure-gm2tools
-	@: $(MAKE); $(unstage)
-	@[ -f ./gm2tools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing pdf in gm2tools"; \
-	(cd $(HOST_SUBDIR)/gm2tools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          pdf) \
-	  || exit 1
-
-@endif gm2tools
-
-.PHONY: maybe-html-gm2tools html-gm2tools
-maybe-html-gm2tools:
-@if gm2tools
-maybe-html-gm2tools: html-gm2tools
-
-html-gm2tools: \
-    configure-gm2tools
-	@: $(MAKE); $(unstage)
-	@[ -f ./gm2tools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in gm2tools"; \
-	(cd $(HOST_SUBDIR)/gm2tools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          html) \
-	  || exit 1
-
-@endif gm2tools
-
-.PHONY: maybe-TAGS-gm2tools TAGS-gm2tools
-maybe-TAGS-gm2tools:
-@if gm2tools
-maybe-TAGS-gm2tools: TAGS-gm2tools
-
-TAGS-gm2tools: \
-    configure-gm2tools
-	@: $(MAKE); $(unstage)
-	@[ -f ./gm2tools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in gm2tools"; \
-	(cd $(HOST_SUBDIR)/gm2tools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          TAGS) \
-	  || exit 1
-
-@endif gm2tools
-
-.PHONY: maybe-install-info-gm2tools install-info-gm2tools
-maybe-install-info-gm2tools:
-@if gm2tools
-maybe-install-info-gm2tools: install-info-gm2tools
-
-install-info-gm2tools: \
-    configure-gm2tools \
-    info-gm2tools
-	@: $(MAKE); $(unstage)
-	@[ -f ./gm2tools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in gm2tools"; \
-	(cd $(HOST_SUBDIR)/gm2tools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          install-info) \
-	  || exit 1
-
-@endif gm2tools
-
-.PHONY: maybe-install-dvi-gm2tools install-dvi-gm2tools
-maybe-install-dvi-gm2tools:
-@if gm2tools
-maybe-install-dvi-gm2tools: install-dvi-gm2tools
-
-install-dvi-gm2tools: \
-    configure-gm2tools \
-    dvi-gm2tools
-	@: $(MAKE); $(unstage)
-	@[ -f ./gm2tools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-dvi in gm2tools"; \
-	(cd $(HOST_SUBDIR)/gm2tools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          install-dvi) \
-	  || exit 1
-
-@endif gm2tools
-
-.PHONY: maybe-install-pdf-gm2tools install-pdf-gm2tools
-maybe-install-pdf-gm2tools:
-@if gm2tools
-maybe-install-pdf-gm2tools: install-pdf-gm2tools
-
-install-pdf-gm2tools: \
-    configure-gm2tools \
-    pdf-gm2tools
-	@: $(MAKE); $(unstage)
-	@[ -f ./gm2tools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-pdf in gm2tools"; \
-	(cd $(HOST_SUBDIR)/gm2tools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          install-pdf) \
-	  || exit 1
-
-@endif gm2tools
-
-.PHONY: maybe-install-html-gm2tools install-html-gm2tools
-maybe-install-html-gm2tools:
-@if gm2tools
-maybe-install-html-gm2tools: install-html-gm2tools
-
-install-html-gm2tools: \
-    configure-gm2tools \
-    html-gm2tools
-	@: $(MAKE); $(unstage)
-	@[ -f ./gm2tools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-html in gm2tools"; \
-	(cd $(HOST_SUBDIR)/gm2tools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          install-html) \
-	  || exit 1
-
-@endif gm2tools
-
-.PHONY: maybe-installcheck-gm2tools installcheck-gm2tools
-maybe-installcheck-gm2tools:
-@if gm2tools
-maybe-installcheck-gm2tools: installcheck-gm2tools
-
-installcheck-gm2tools: \
-    configure-gm2tools
-	@: $(MAKE); $(unstage)
-	@[ -f ./gm2tools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in gm2tools"; \
-	(cd $(HOST_SUBDIR)/gm2tools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          installcheck) \
-	  || exit 1
-
-@endif gm2tools
-
-.PHONY: maybe-mostlyclean-gm2tools mostlyclean-gm2tools
-maybe-mostlyclean-gm2tools:
-@if gm2tools
-maybe-mostlyclean-gm2tools: mostlyclean-gm2tools
-
-mostlyclean-gm2tools:
-	@: $(MAKE); $(unstage)
-	@[ -f ./gm2tools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in gm2tools"; \
-	(cd $(HOST_SUBDIR)/gm2tools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif gm2tools
-
-.PHONY: maybe-clean-gm2tools clean-gm2tools
-maybe-clean-gm2tools:
-@if gm2tools
-maybe-clean-gm2tools: clean-gm2tools
-
-clean-gm2tools:
-	@: $(MAKE); $(unstage)
-	@[ -f ./gm2tools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in gm2tools"; \
-	(cd $(HOST_SUBDIR)/gm2tools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          clean) \
-	  || exit 1
-
-@endif gm2tools
-
-.PHONY: maybe-distclean-gm2tools distclean-gm2tools
-maybe-distclean-gm2tools:
-@if gm2tools
-maybe-distclean-gm2tools: distclean-gm2tools
-
-distclean-gm2tools:
-	@: $(MAKE); $(unstage)
-	@[ -f ./gm2tools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in gm2tools"; \
-	(cd $(HOST_SUBDIR)/gm2tools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          distclean) \
-	  || exit 1
-
-@endif gm2tools
-
-.PHONY: maybe-maintainer-clean-gm2tools maintainer-clean-gm2tools
-maybe-maintainer-clean-gm2tools:
-@if gm2tools
-maybe-maintainer-clean-gm2tools: maintainer-clean-gm2tools
-
-maintainer-clean-gm2tools:
-	@: $(MAKE); $(unstage)
-	@[ -f ./gm2tools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in gm2tools"; \
-	(cd $(HOST_SUBDIR)/gm2tools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif gm2tools
-
-
-
 .PHONY: configure-gotools maybe-configure-gotools
 maybe-configure-gotools:
 @if gcc-bootstrap
@@ -42496,7 +42005,7 @@ configure-gotools: stage_current
 @endif gcc-bootstrap
 @if gotools
 maybe-configure-gotools: configure-gotools
-configure-gotools:
+configure-gotools: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -42597,7 +42106,7 @@ maybe-info-gotools:
 maybe-info-gotools: info-gotools
 
 info-gotools: \
-    configure-gotools
+    configure-gotools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gotools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -42623,7 +42132,7 @@ maybe-dvi-gotools:
 maybe-dvi-gotools: dvi-gotools
 
 dvi-gotools: \
-    configure-gotools
+    configure-gotools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gotools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -42649,7 +42158,7 @@ maybe-pdf-gotools:
 maybe-pdf-gotools: pdf-gotools
 
 pdf-gotools: \
-    configure-gotools
+    configure-gotools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gotools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -42675,7 +42184,7 @@ maybe-html-gotools:
 maybe-html-gotools: html-gotools
 
 html-gotools: \
-    configure-gotools
+    configure-gotools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gotools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -42701,7 +42210,7 @@ maybe-TAGS-gotools:
 maybe-TAGS-gotools: TAGS-gotools
 
 TAGS-gotools: \
-    configure-gotools
+    configure-gotools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gotools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -42728,7 +42237,7 @@ maybe-install-info-gotools: install-info-gotools
 
 install-info-gotools: \
     configure-gotools \
-    info-gotools
+    info-gotools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gotools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -42755,7 +42264,7 @@ maybe-install-dvi-gotools: install-dvi-gotools
 
 install-dvi-gotools: \
     configure-gotools \
-    dvi-gotools
+    dvi-gotools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gotools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -42782,7 +42291,7 @@ maybe-install-pdf-gotools: install-pdf-gotools
 
 install-pdf-gotools: \
     configure-gotools \
-    pdf-gotools
+    pdf-gotools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gotools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -42809,7 +42318,7 @@ maybe-install-html-gotools: install-html-gotools
 
 install-html-gotools: \
     configure-gotools \
-    html-gotools
+    html-gotools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gotools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -42835,7 +42344,7 @@ maybe-installcheck-gotools:
 maybe-installcheck-gotools: installcheck-gotools
 
 installcheck-gotools: \
-    configure-gotools
+    configure-gotools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gotools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -42860,7 +42369,7 @@ maybe-mostlyclean-gotools:
 @if gotools
 maybe-mostlyclean-gotools: mostlyclean-gotools
 
-mostlyclean-gotools:
+mostlyclean-gotools: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gotools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -42885,7 +42394,7 @@ maybe-clean-gotools:
 @if gotools
 maybe-clean-gotools: clean-gotools
 
-clean-gotools:
+clean-gotools: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gotools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -42910,7 +42419,7 @@ maybe-distclean-gotools:
 @if gotools
 maybe-distclean-gotools: distclean-gotools
 
-distclean-gotools:
+distclean-gotools: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gotools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -42935,7 +42444,7 @@ maybe-maintainer-clean-gotools:
 @if gotools
 maybe-maintainer-clean-gotools: maintainer-clean-gotools
 
-maintainer-clean-gotools:
+maintainer-clean-gotools: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gotools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -42964,7 +42473,7 @@ configure-libctf: stage_current
 @endif gcc-bootstrap
 @if libctf
 maybe-configure-libctf: configure-libctf
-configure-libctf:
+configure-libctf: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	test ! -f $(HOST_SUBDIR)/libctf/Makefile || exit 0; \
@@ -43751,7 +43260,7 @@ maybe-info-libctf:
 maybe-info-libctf: info-libctf
 
 info-libctf: \
-    configure-libctf
+    configure-libctf 
 	@[ -f ./libctf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -43776,7 +43285,7 @@ maybe-dvi-libctf:
 maybe-dvi-libctf: dvi-libctf
 
 dvi-libctf: \
-    configure-libctf
+    configure-libctf 
 	@[ -f ./libctf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -43801,7 +43310,7 @@ maybe-pdf-libctf:
 maybe-pdf-libctf: pdf-libctf
 
 pdf-libctf: \
-    configure-libctf
+    configure-libctf 
 	@[ -f ./libctf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -43826,7 +43335,7 @@ maybe-html-libctf:
 maybe-html-libctf: html-libctf
 
 html-libctf: \
-    configure-libctf
+    configure-libctf 
 	@[ -f ./libctf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -43851,7 +43360,7 @@ maybe-TAGS-libctf:
 maybe-TAGS-libctf: TAGS-libctf
 
 TAGS-libctf: \
-    configure-libctf
+    configure-libctf 
 	@[ -f ./libctf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -43877,7 +43386,7 @@ maybe-install-info-libctf: install-info-libctf
 
 install-info-libctf: \
     configure-libctf \
-    info-libctf
+    info-libctf 
 	@[ -f ./libctf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -43903,7 +43412,7 @@ maybe-install-dvi-libctf: install-dvi-libctf
 
 install-dvi-libctf: \
     configure-libctf \
-    dvi-libctf
+    dvi-libctf 
 	@[ -f ./libctf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -43929,7 +43438,7 @@ maybe-install-pdf-libctf: install-pdf-libctf
 
 install-pdf-libctf: \
     configure-libctf \
-    pdf-libctf
+    pdf-libctf 
 	@[ -f ./libctf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -43955,7 +43464,7 @@ maybe-install-html-libctf: install-html-libctf
 
 install-html-libctf: \
     configure-libctf \
-    html-libctf
+    html-libctf 
 	@[ -f ./libctf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -43980,7 +43489,7 @@ maybe-installcheck-libctf:
 maybe-installcheck-libctf: installcheck-libctf
 
 installcheck-libctf: \
-    configure-libctf
+    configure-libctf 
 	@[ -f ./libctf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -44004,7 +43513,7 @@ maybe-mostlyclean-libctf:
 @if libctf
 maybe-mostlyclean-libctf: mostlyclean-libctf
 
-mostlyclean-libctf:
+mostlyclean-libctf: 
 	@[ -f ./libctf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -44028,7 +43537,7 @@ maybe-clean-libctf:
 @if libctf
 maybe-clean-libctf: clean-libctf
 
-clean-libctf:
+clean-libctf: 
 	@[ -f ./libctf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -44052,7 +43561,7 @@ maybe-distclean-libctf:
 @if libctf
 maybe-distclean-libctf: distclean-libctf
 
-distclean-libctf:
+distclean-libctf: 
 	@[ -f ./libctf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -44076,7 +43585,7 @@ maybe-maintainer-clean-libctf:
 @if libctf
 maybe-maintainer-clean-libctf: maintainer-clean-libctf
 
-maintainer-clean-libctf:
+maintainer-clean-libctf: 
 	@[ -f ./libctf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -44111,7 +43620,7 @@ configure-target-libstdc++-v3: stage_current
 @endif gcc-bootstrap
 @if target-libstdc++-v3
 maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3
-configure-target-libstdc++-v3:
+configure-target-libstdc++-v3: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	echo "Checking multilib configuration for libstdc++-v3..."; \
@@ -45012,7 +44521,7 @@ maybe-info-target-libstdc++-v3:
 maybe-info-target-libstdc++-v3: info-target-libstdc++-v3
 
 info-target-libstdc++-v3: \
-    configure-target-libstdc++-v3
+    configure-target-libstdc++-v3 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -45038,7 +44547,7 @@ maybe-dvi-target-libstdc++-v3:
 maybe-dvi-target-libstdc++-v3: dvi-target-libstdc++-v3
 
 dvi-target-libstdc++-v3: \
-    configure-target-libstdc++-v3
+    configure-target-libstdc++-v3 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -45064,7 +44573,7 @@ maybe-pdf-target-libstdc++-v3:
 maybe-pdf-target-libstdc++-v3: pdf-target-libstdc++-v3
 
 pdf-target-libstdc++-v3: \
-    configure-target-libstdc++-v3
+    configure-target-libstdc++-v3 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -45090,7 +44599,7 @@ maybe-html-target-libstdc++-v3:
 maybe-html-target-libstdc++-v3: html-target-libstdc++-v3
 
 html-target-libstdc++-v3: \
-    configure-target-libstdc++-v3
+    configure-target-libstdc++-v3 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -45116,7 +44625,7 @@ maybe-TAGS-target-libstdc++-v3:
 maybe-TAGS-target-libstdc++-v3: TAGS-target-libstdc++-v3
 
 TAGS-target-libstdc++-v3: \
-    configure-target-libstdc++-v3
+    configure-target-libstdc++-v3 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -45143,7 +44652,7 @@ maybe-install-info-target-libstdc++-v3: install-info-target-libstdc++-v3
 
 install-info-target-libstdc++-v3: \
     configure-target-libstdc++-v3 \
-    info-target-libstdc++-v3
+    info-target-libstdc++-v3 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -45170,7 +44679,7 @@ maybe-install-dvi-target-libstdc++-v3: install-dvi-target-libstdc++-v3
 
 install-dvi-target-libstdc++-v3: \
     configure-target-libstdc++-v3 \
-    dvi-target-libstdc++-v3
+    dvi-target-libstdc++-v3 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -45197,7 +44706,7 @@ maybe-install-pdf-target-libstdc++-v3: install-pdf-target-libstdc++-v3
 
 install-pdf-target-libstdc++-v3: \
     configure-target-libstdc++-v3 \
-    pdf-target-libstdc++-v3
+    pdf-target-libstdc++-v3 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -45224,7 +44733,7 @@ maybe-install-html-target-libstdc++-v3: install-html-target-libstdc++-v3
 
 install-html-target-libstdc++-v3: \
     configure-target-libstdc++-v3 \
-    html-target-libstdc++-v3
+    html-target-libstdc++-v3 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -45250,7 +44759,7 @@ maybe-installcheck-target-libstdc++-v3:
 maybe-installcheck-target-libstdc++-v3: installcheck-target-libstdc++-v3
 
 installcheck-target-libstdc++-v3: \
-    configure-target-libstdc++-v3
+    configure-target-libstdc++-v3 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -45275,7 +44784,7 @@ maybe-mostlyclean-target-libstdc++-v3:
 @if target-libstdc++-v3
 maybe-mostlyclean-target-libstdc++-v3: mostlyclean-target-libstdc++-v3
 
-mostlyclean-target-libstdc++-v3:
+mostlyclean-target-libstdc++-v3: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -45300,7 +44809,7 @@ maybe-clean-target-libstdc++-v3:
 @if target-libstdc++-v3
 maybe-clean-target-libstdc++-v3: clean-target-libstdc++-v3
 
-clean-target-libstdc++-v3:
+clean-target-libstdc++-v3: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -45325,7 +44834,7 @@ maybe-distclean-target-libstdc++-v3:
 @if target-libstdc++-v3
 maybe-distclean-target-libstdc++-v3: distclean-target-libstdc++-v3
 
-distclean-target-libstdc++-v3:
+distclean-target-libstdc++-v3: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -45350,7 +44859,7 @@ maybe-maintainer-clean-target-libstdc++-v3:
 @if target-libstdc++-v3
 maybe-maintainer-clean-target-libstdc++-v3: maintainer-clean-target-libstdc++-v3
 
-maintainer-clean-target-libstdc++-v3:
+maintainer-clean-target-libstdc++-v3: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -45381,7 +44890,7 @@ configure-target-libsanitizer: stage_current
 @endif gcc-bootstrap
 @if target-libsanitizer
 maybe-configure-target-libsanitizer: configure-target-libsanitizer
-configure-target-libsanitizer:
+configure-target-libsanitizer: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	echo "Checking multilib configuration for libsanitizer..."; \
@@ -46282,7 +45791,7 @@ maybe-info-target-libsanitizer:
 maybe-info-target-libsanitizer: info-target-libsanitizer
 
 info-target-libsanitizer: \
-    configure-target-libsanitizer
+    configure-target-libsanitizer 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -46308,7 +45817,7 @@ maybe-dvi-target-libsanitizer:
 maybe-dvi-target-libsanitizer: dvi-target-libsanitizer
 
 dvi-target-libsanitizer: \
-    configure-target-libsanitizer
+    configure-target-libsanitizer 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -46334,7 +45843,7 @@ maybe-pdf-target-libsanitizer:
 maybe-pdf-target-libsanitizer: pdf-target-libsanitizer
 
 pdf-target-libsanitizer: \
-    configure-target-libsanitizer
+    configure-target-libsanitizer 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -46360,7 +45869,7 @@ maybe-html-target-libsanitizer:
 maybe-html-target-libsanitizer: html-target-libsanitizer
 
 html-target-libsanitizer: \
-    configure-target-libsanitizer
+    configure-target-libsanitizer 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -46386,7 +45895,7 @@ maybe-TAGS-target-libsanitizer:
 maybe-TAGS-target-libsanitizer: TAGS-target-libsanitizer
 
 TAGS-target-libsanitizer: \
-    configure-target-libsanitizer
+    configure-target-libsanitizer 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -46413,7 +45922,7 @@ maybe-install-info-target-libsanitizer: install-info-target-libsanitizer
 
 install-info-target-libsanitizer: \
     configure-target-libsanitizer \
-    info-target-libsanitizer
+    info-target-libsanitizer 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -46440,7 +45949,7 @@ maybe-install-dvi-target-libsanitizer: install-dvi-target-libsanitizer
 
 install-dvi-target-libsanitizer: \
     configure-target-libsanitizer \
-    dvi-target-libsanitizer
+    dvi-target-libsanitizer 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -46467,7 +45976,7 @@ maybe-install-pdf-target-libsanitizer: install-pdf-target-libsanitizer
 
 install-pdf-target-libsanitizer: \
     configure-target-libsanitizer \
-    pdf-target-libsanitizer
+    pdf-target-libsanitizer 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -46494,7 +46003,7 @@ maybe-install-html-target-libsanitizer: install-html-target-libsanitizer
 
 install-html-target-libsanitizer: \
     configure-target-libsanitizer \
-    html-target-libsanitizer
+    html-target-libsanitizer 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -46520,7 +46029,7 @@ maybe-installcheck-target-libsanitizer:
 maybe-installcheck-target-libsanitizer: installcheck-target-libsanitizer
 
 installcheck-target-libsanitizer: \
-    configure-target-libsanitizer
+    configure-target-libsanitizer 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -46545,7 +46054,7 @@ maybe-mostlyclean-target-libsanitizer:
 @if target-libsanitizer
 maybe-mostlyclean-target-libsanitizer: mostlyclean-target-libsanitizer
 
-mostlyclean-target-libsanitizer:
+mostlyclean-target-libsanitizer: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -46570,7 +46079,7 @@ maybe-clean-target-libsanitizer:
 @if target-libsanitizer
 maybe-clean-target-libsanitizer: clean-target-libsanitizer
 
-clean-target-libsanitizer:
+clean-target-libsanitizer: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -46595,7 +46104,7 @@ maybe-distclean-target-libsanitizer:
 @if target-libsanitizer
 maybe-distclean-target-libsanitizer: distclean-target-libsanitizer
 
-distclean-target-libsanitizer:
+distclean-target-libsanitizer: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -46620,7 +46129,7 @@ maybe-maintainer-clean-target-libsanitizer:
 @if target-libsanitizer
 maybe-maintainer-clean-target-libsanitizer: maintainer-clean-target-libsanitizer
 
-maintainer-clean-target-libsanitizer:
+maintainer-clean-target-libsanitizer: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -46651,7 +46160,7 @@ configure-target-libvtv: stage_current
 @endif gcc-bootstrap
 @if target-libvtv
 maybe-configure-target-libvtv: configure-target-libvtv
-configure-target-libvtv:
+configure-target-libvtv: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	echo "Checking multilib configuration for libvtv..."; \
@@ -47552,7 +47061,7 @@ maybe-info-target-libvtv:
 maybe-info-target-libvtv: info-target-libvtv
 
 info-target-libvtv: \
-    configure-target-libvtv
+    configure-target-libvtv 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -47578,7 +47087,7 @@ maybe-dvi-target-libvtv:
 maybe-dvi-target-libvtv: dvi-target-libvtv
 
 dvi-target-libvtv: \
-    configure-target-libvtv
+    configure-target-libvtv 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -47604,7 +47113,7 @@ maybe-pdf-target-libvtv:
 maybe-pdf-target-libvtv: pdf-target-libvtv
 
 pdf-target-libvtv: \
-    configure-target-libvtv
+    configure-target-libvtv 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -47630,7 +47139,7 @@ maybe-html-target-libvtv:
 maybe-html-target-libvtv: html-target-libvtv
 
 html-target-libvtv: \
-    configure-target-libvtv
+    configure-target-libvtv 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -47656,7 +47165,7 @@ maybe-TAGS-target-libvtv:
 maybe-TAGS-target-libvtv: TAGS-target-libvtv
 
 TAGS-target-libvtv: \
-    configure-target-libvtv
+    configure-target-libvtv 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -47683,7 +47192,7 @@ maybe-install-info-target-libvtv: install-info-target-libvtv
 
 install-info-target-libvtv: \
     configure-target-libvtv \
-    info-target-libvtv
+    info-target-libvtv 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -47710,7 +47219,7 @@ maybe-install-dvi-target-libvtv: install-dvi-target-libvtv
 
 install-dvi-target-libvtv: \
     configure-target-libvtv \
-    dvi-target-libvtv
+    dvi-target-libvtv 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -47737,7 +47246,7 @@ maybe-install-pdf-target-libvtv: install-pdf-target-libvtv
 
 install-pdf-target-libvtv: \
     configure-target-libvtv \
-    pdf-target-libvtv
+    pdf-target-libvtv 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -47764,7 +47273,7 @@ maybe-install-html-target-libvtv: install-html-target-libvtv
 
 install-html-target-libvtv: \
     configure-target-libvtv \
-    html-target-libvtv
+    html-target-libvtv 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -47790,7 +47299,7 @@ maybe-installcheck-target-libvtv:
 maybe-installcheck-target-libvtv: installcheck-target-libvtv
 
 installcheck-target-libvtv: \
-    configure-target-libvtv
+    configure-target-libvtv 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -47815,7 +47324,7 @@ maybe-mostlyclean-target-libvtv:
 @if target-libvtv
 maybe-mostlyclean-target-libvtv: mostlyclean-target-libvtv
 
-mostlyclean-target-libvtv:
+mostlyclean-target-libvtv: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -47840,7 +47349,7 @@ maybe-clean-target-libvtv:
 @if target-libvtv
 maybe-clean-target-libvtv: clean-target-libvtv
 
-clean-target-libvtv:
+clean-target-libvtv: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -47865,7 +47374,7 @@ maybe-distclean-target-libvtv:
 @if target-libvtv
 maybe-distclean-target-libvtv: distclean-target-libvtv
 
-distclean-target-libvtv:
+distclean-target-libvtv: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -47890,7 +47399,7 @@ maybe-maintainer-clean-target-libvtv:
 @if target-libvtv
 maybe-maintainer-clean-target-libvtv: maintainer-clean-target-libvtv
 
-maintainer-clean-target-libvtv:
+maintainer-clean-target-libvtv: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -47921,7 +47430,7 @@ configure-target-liboffloadmic: stage_current
 @endif gcc-bootstrap
 @if target-liboffloadmic
 maybe-configure-target-liboffloadmic: configure-target-liboffloadmic
-configure-target-liboffloadmic:
+configure-target-liboffloadmic: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -48037,7 +47546,7 @@ maybe-info-target-liboffloadmic:
 maybe-info-target-liboffloadmic: info-target-liboffloadmic
 
 info-target-liboffloadmic: \
-    configure-target-liboffloadmic
+    configure-target-liboffloadmic 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48063,7 +47572,7 @@ maybe-dvi-target-liboffloadmic:
 maybe-dvi-target-liboffloadmic: dvi-target-liboffloadmic
 
 dvi-target-liboffloadmic: \
-    configure-target-liboffloadmic
+    configure-target-liboffloadmic 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48089,7 +47598,7 @@ maybe-pdf-target-liboffloadmic:
 maybe-pdf-target-liboffloadmic: pdf-target-liboffloadmic
 
 pdf-target-liboffloadmic: \
-    configure-target-liboffloadmic
+    configure-target-liboffloadmic 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48115,7 +47624,7 @@ maybe-html-target-liboffloadmic:
 maybe-html-target-liboffloadmic: html-target-liboffloadmic
 
 html-target-liboffloadmic: \
-    configure-target-liboffloadmic
+    configure-target-liboffloadmic 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48141,7 +47650,7 @@ maybe-TAGS-target-liboffloadmic:
 maybe-TAGS-target-liboffloadmic: TAGS-target-liboffloadmic
 
 TAGS-target-liboffloadmic: \
-    configure-target-liboffloadmic
+    configure-target-liboffloadmic 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48168,7 +47677,7 @@ maybe-install-info-target-liboffloadmic: install-info-target-liboffloadmic
 
 install-info-target-liboffloadmic: \
     configure-target-liboffloadmic \
-    info-target-liboffloadmic
+    info-target-liboffloadmic 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48195,7 +47704,7 @@ maybe-install-dvi-target-liboffloadmic: install-dvi-target-liboffloadmic
 
 install-dvi-target-liboffloadmic: \
     configure-target-liboffloadmic \
-    dvi-target-liboffloadmic
+    dvi-target-liboffloadmic 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48222,7 +47731,7 @@ maybe-install-pdf-target-liboffloadmic: install-pdf-target-liboffloadmic
 
 install-pdf-target-liboffloadmic: \
     configure-target-liboffloadmic \
-    pdf-target-liboffloadmic
+    pdf-target-liboffloadmic 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48249,7 +47758,7 @@ maybe-install-html-target-liboffloadmic: install-html-target-liboffloadmic
 
 install-html-target-liboffloadmic: \
     configure-target-liboffloadmic \
-    html-target-liboffloadmic
+    html-target-liboffloadmic 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48275,7 +47784,7 @@ maybe-installcheck-target-liboffloadmic:
 maybe-installcheck-target-liboffloadmic: installcheck-target-liboffloadmic
 
 installcheck-target-liboffloadmic: \
-    configure-target-liboffloadmic
+    configure-target-liboffloadmic 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48300,7 +47809,7 @@ maybe-mostlyclean-target-liboffloadmic:
 @if target-liboffloadmic
 maybe-mostlyclean-target-liboffloadmic: mostlyclean-target-liboffloadmic
 
-mostlyclean-target-liboffloadmic:
+mostlyclean-target-liboffloadmic: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48325,7 +47834,7 @@ maybe-clean-target-liboffloadmic:
 @if target-liboffloadmic
 maybe-clean-target-liboffloadmic: clean-target-liboffloadmic
 
-clean-target-liboffloadmic:
+clean-target-liboffloadmic: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48350,7 +47859,7 @@ maybe-distclean-target-liboffloadmic:
 @if target-liboffloadmic
 maybe-distclean-target-liboffloadmic: distclean-target-liboffloadmic
 
-distclean-target-liboffloadmic:
+distclean-target-liboffloadmic: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48375,7 +47884,7 @@ maybe-maintainer-clean-target-liboffloadmic:
 @if target-liboffloadmic
 maybe-maintainer-clean-target-liboffloadmic: maintainer-clean-target-liboffloadmic
 
-maintainer-clean-target-liboffloadmic:
+maintainer-clean-target-liboffloadmic: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48406,7 +47915,7 @@ configure-target-libssp: stage_current
 @endif gcc-bootstrap
 @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; \
@@ -48522,7 +48031,7 @@ maybe-info-target-libssp:
 maybe-info-target-libssp: info-target-libssp
 
 info-target-libssp: \
-    configure-target-libssp
+    configure-target-libssp 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48548,7 +48057,7 @@ maybe-dvi-target-libssp:
 maybe-dvi-target-libssp: dvi-target-libssp
 
 dvi-target-libssp: \
-    configure-target-libssp
+    configure-target-libssp 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48574,7 +48083,7 @@ maybe-pdf-target-libssp:
 maybe-pdf-target-libssp: pdf-target-libssp
 
 pdf-target-libssp: \
-    configure-target-libssp
+    configure-target-libssp 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48600,7 +48109,7 @@ maybe-html-target-libssp:
 maybe-html-target-libssp: html-target-libssp
 
 html-target-libssp: \
-    configure-target-libssp
+    configure-target-libssp 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48626,7 +48135,7 @@ maybe-TAGS-target-libssp:
 maybe-TAGS-target-libssp: TAGS-target-libssp
 
 TAGS-target-libssp: \
-    configure-target-libssp
+    configure-target-libssp 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48653,7 +48162,7 @@ maybe-install-info-target-libssp: install-info-target-libssp
 
 install-info-target-libssp: \
     configure-target-libssp \
-    info-target-libssp
+    info-target-libssp 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48680,7 +48189,7 @@ maybe-install-dvi-target-libssp: install-dvi-target-libssp
 
 install-dvi-target-libssp: \
     configure-target-libssp \
-    dvi-target-libssp
+    dvi-target-libssp 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48707,7 +48216,7 @@ maybe-install-pdf-target-libssp: install-pdf-target-libssp
 
 install-pdf-target-libssp: \
     configure-target-libssp \
-    pdf-target-libssp
+    pdf-target-libssp 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48734,7 +48243,7 @@ maybe-install-html-target-libssp: install-html-target-libssp
 
 install-html-target-libssp: \
     configure-target-libssp \
-    html-target-libssp
+    html-target-libssp 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48760,7 +48269,7 @@ maybe-installcheck-target-libssp:
 maybe-installcheck-target-libssp: installcheck-target-libssp
 
 installcheck-target-libssp: \
-    configure-target-libssp
+    configure-target-libssp 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48785,7 +48294,7 @@ maybe-mostlyclean-target-libssp:
 @if target-libssp
 maybe-mostlyclean-target-libssp: mostlyclean-target-libssp
 
-mostlyclean-target-libssp:
+mostlyclean-target-libssp: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48810,7 +48319,7 @@ maybe-clean-target-libssp:
 @if target-libssp
 maybe-clean-target-libssp: clean-target-libssp
 
-clean-target-libssp:
+clean-target-libssp: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48835,7 +48344,7 @@ maybe-distclean-target-libssp:
 @if target-libssp
 maybe-distclean-target-libssp: distclean-target-libssp
 
-distclean-target-libssp:
+distclean-target-libssp: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48860,7 +48369,7 @@ maybe-maintainer-clean-target-libssp:
 @if target-libssp
 maybe-maintainer-clean-target-libssp: maintainer-clean-target-libssp
 
-maintainer-clean-target-libssp:
+maintainer-clean-target-libssp: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48891,7 +48400,7 @@ configure-target-newlib: stage_current
 @endif gcc-bootstrap
 @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; \
@@ -49007,7 +48516,7 @@ maybe-info-target-newlib:
 maybe-info-target-newlib: info-target-newlib
 
 info-target-newlib: \
-    configure-target-newlib
+    configure-target-newlib 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -49033,7 +48542,7 @@ maybe-dvi-target-newlib:
 maybe-dvi-target-newlib: dvi-target-newlib
 
 dvi-target-newlib: \
-    configure-target-newlib
+    configure-target-newlib 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -49059,7 +48568,7 @@ maybe-pdf-target-newlib:
 maybe-pdf-target-newlib: pdf-target-newlib
 
 pdf-target-newlib: \
-    configure-target-newlib
+    configure-target-newlib 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -49085,7 +48594,7 @@ maybe-html-target-newlib:
 maybe-html-target-newlib: html-target-newlib
 
 html-target-newlib: \
-    configure-target-newlib
+    configure-target-newlib 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -49111,7 +48620,7 @@ maybe-TAGS-target-newlib:
 maybe-TAGS-target-newlib: TAGS-target-newlib
 
 TAGS-target-newlib: \
-    configure-target-newlib
+    configure-target-newlib 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -49138,7 +48647,7 @@ maybe-install-info-target-newlib: install-info-target-newlib
 
 install-info-target-newlib: \
     configure-target-newlib \
-    info-target-newlib
+    info-target-newlib 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -49165,7 +48674,7 @@ maybe-install-dvi-target-newlib: install-dvi-target-newlib
 
 install-dvi-target-newlib: \
     configure-target-newlib \
-    dvi-target-newlib
+    dvi-target-newlib 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -49192,7 +48701,7 @@ maybe-install-pdf-target-newlib: install-pdf-target-newlib
 
 install-pdf-target-newlib: \
     configure-target-newlib \
-    pdf-target-newlib
+    pdf-target-newlib 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -49219,7 +48728,7 @@ maybe-install-html-target-newlib: install-html-target-newlib
 
 install-html-target-newlib: \
     configure-target-newlib \
-    html-target-newlib
+    html-target-newlib 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -49245,7 +48754,7 @@ maybe-installcheck-target-newlib:
 maybe-installcheck-target-newlib: installcheck-target-newlib
 
 installcheck-target-newlib: \
-    configure-target-newlib
+    configure-target-newlib 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -49270,7 +48779,7 @@ maybe-mostlyclean-target-newlib:
 @if target-newlib
 maybe-mostlyclean-target-newlib: mostlyclean-target-newlib
 
-mostlyclean-target-newlib:
+mostlyclean-target-newlib: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -49295,7 +48804,7 @@ maybe-clean-target-newlib:
 @if target-newlib
 maybe-clean-target-newlib: clean-target-newlib
 
-clean-target-newlib:
+clean-target-newlib: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -49320,7 +48829,7 @@ maybe-distclean-target-newlib:
 @if target-newlib
 maybe-distclean-target-newlib: distclean-target-newlib
 
-distclean-target-newlib:
+distclean-target-newlib: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -49345,7 +48854,7 @@ maybe-maintainer-clean-target-newlib:
 @if target-newlib
 maybe-maintainer-clean-target-newlib: maintainer-clean-target-newlib
 
-maintainer-clean-target-newlib:
+maintainer-clean-target-newlib: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -49376,7 +48885,7 @@ configure-target-libgcc: stage_current
 @endif gcc-bootstrap
 @if target-libgcc
 maybe-configure-target-libgcc: configure-target-libgcc
-configure-target-libgcc:
+configure-target-libgcc: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	echo "Checking multilib configuration for libgcc..."; \
@@ -50272,7 +49781,7 @@ maybe-info-target-libgcc:
 maybe-info-target-libgcc: info-target-libgcc
 
 info-target-libgcc: \
-    configure-target-libgcc
+    configure-target-libgcc 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -50298,7 +49807,7 @@ maybe-dvi-target-libgcc:
 maybe-dvi-target-libgcc: dvi-target-libgcc
 
 dvi-target-libgcc: \
-    configure-target-libgcc
+    configure-target-libgcc 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -50324,7 +49833,7 @@ maybe-pdf-target-libgcc:
 maybe-pdf-target-libgcc: pdf-target-libgcc
 
 pdf-target-libgcc: \
-    configure-target-libgcc
+    configure-target-libgcc 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -50350,7 +49859,7 @@ maybe-html-target-libgcc:
 maybe-html-target-libgcc: html-target-libgcc
 
 html-target-libgcc: \
-    configure-target-libgcc
+    configure-target-libgcc 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -50387,7 +49896,7 @@ maybe-install-info-target-libgcc: install-info-target-libgcc
 
 install-info-target-libgcc: \
     configure-target-libgcc \
-    info-target-libgcc
+    info-target-libgcc 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -50424,7 +49933,7 @@ maybe-install-pdf-target-libgcc: install-pdf-target-libgcc
 
 install-pdf-target-libgcc: \
     configure-target-libgcc \
-    pdf-target-libgcc
+    pdf-target-libgcc 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -50451,7 +49960,7 @@ maybe-install-html-target-libgcc: install-html-target-libgcc
 
 install-html-target-libgcc: \
     configure-target-libgcc \
-    html-target-libgcc
+    html-target-libgcc 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -50477,7 +49986,7 @@ maybe-installcheck-target-libgcc:
 maybe-installcheck-target-libgcc: installcheck-target-libgcc
 
 installcheck-target-libgcc: \
-    configure-target-libgcc
+    configure-target-libgcc 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -50502,7 +50011,7 @@ maybe-mostlyclean-target-libgcc:
 @if target-libgcc
 maybe-mostlyclean-target-libgcc: mostlyclean-target-libgcc
 
-mostlyclean-target-libgcc:
+mostlyclean-target-libgcc: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -50527,7 +50036,7 @@ maybe-clean-target-libgcc:
 @if target-libgcc
 maybe-clean-target-libgcc: clean-target-libgcc
 
-clean-target-libgcc:
+clean-target-libgcc: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -50552,7 +50061,7 @@ maybe-distclean-target-libgcc:
 @if target-libgcc
 maybe-distclean-target-libgcc: distclean-target-libgcc
 
-distclean-target-libgcc:
+distclean-target-libgcc: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -50577,7 +50086,7 @@ maybe-maintainer-clean-target-libgcc:
 @if target-libgcc
 maybe-maintainer-clean-target-libgcc: maintainer-clean-target-libgcc
 
-maintainer-clean-target-libgcc:
+maintainer-clean-target-libgcc: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -50608,7 +50117,7 @@ configure-target-libbacktrace: stage_current
 @endif gcc-bootstrap
 @if target-libbacktrace
 maybe-configure-target-libbacktrace: configure-target-libbacktrace
-configure-target-libbacktrace:
+configure-target-libbacktrace: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	echo "Checking multilib configuration for libbacktrace..."; \
@@ -51509,7 +51018,7 @@ maybe-info-target-libbacktrace:
 maybe-info-target-libbacktrace: info-target-libbacktrace
 
 info-target-libbacktrace: \
-    configure-target-libbacktrace
+    configure-target-libbacktrace 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -51535,7 +51044,7 @@ maybe-dvi-target-libbacktrace:
 maybe-dvi-target-libbacktrace: dvi-target-libbacktrace
 
 dvi-target-libbacktrace: \
-    configure-target-libbacktrace
+    configure-target-libbacktrace 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -51561,7 +51070,7 @@ maybe-pdf-target-libbacktrace:
 maybe-pdf-target-libbacktrace: pdf-target-libbacktrace
 
 pdf-target-libbacktrace: \
-    configure-target-libbacktrace
+    configure-target-libbacktrace 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -51587,7 +51096,7 @@ maybe-html-target-libbacktrace:
 maybe-html-target-libbacktrace: html-target-libbacktrace
 
 html-target-libbacktrace: \
-    configure-target-libbacktrace
+    configure-target-libbacktrace 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -51613,7 +51122,7 @@ maybe-TAGS-target-libbacktrace:
 maybe-TAGS-target-libbacktrace: TAGS-target-libbacktrace
 
 TAGS-target-libbacktrace: \
-    configure-target-libbacktrace
+    configure-target-libbacktrace 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -51640,7 +51149,7 @@ maybe-install-info-target-libbacktrace: install-info-target-libbacktrace
 
 install-info-target-libbacktrace: \
     configure-target-libbacktrace \
-    info-target-libbacktrace
+    info-target-libbacktrace 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -51667,7 +51176,7 @@ maybe-install-dvi-target-libbacktrace: install-dvi-target-libbacktrace
 
 install-dvi-target-libbacktrace: \
     configure-target-libbacktrace \
-    dvi-target-libbacktrace
+    dvi-target-libbacktrace 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -51694,7 +51203,7 @@ maybe-install-pdf-target-libbacktrace: install-pdf-target-libbacktrace
 
 install-pdf-target-libbacktrace: \
     configure-target-libbacktrace \
-    pdf-target-libbacktrace
+    pdf-target-libbacktrace 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -51721,7 +51230,7 @@ maybe-install-html-target-libbacktrace: install-html-target-libbacktrace
 
 install-html-target-libbacktrace: \
     configure-target-libbacktrace \
-    html-target-libbacktrace
+    html-target-libbacktrace 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -51747,7 +51256,7 @@ maybe-installcheck-target-libbacktrace:
 maybe-installcheck-target-libbacktrace: installcheck-target-libbacktrace
 
 installcheck-target-libbacktrace: \
-    configure-target-libbacktrace
+    configure-target-libbacktrace 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -51772,7 +51281,7 @@ maybe-mostlyclean-target-libbacktrace:
 @if target-libbacktrace
 maybe-mostlyclean-target-libbacktrace: mostlyclean-target-libbacktrace
 
-mostlyclean-target-libbacktrace:
+mostlyclean-target-libbacktrace: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -51797,7 +51306,7 @@ maybe-clean-target-libbacktrace:
 @if target-libbacktrace
 maybe-clean-target-libbacktrace: clean-target-libbacktrace
 
-clean-target-libbacktrace:
+clean-target-libbacktrace: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -51822,7 +51331,7 @@ maybe-distclean-target-libbacktrace:
 @if target-libbacktrace
 maybe-distclean-target-libbacktrace: distclean-target-libbacktrace
 
-distclean-target-libbacktrace:
+distclean-target-libbacktrace: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -51847,7 +51356,7 @@ maybe-maintainer-clean-target-libbacktrace:
 @if target-libbacktrace
 maybe-maintainer-clean-target-libbacktrace: maintainer-clean-target-libbacktrace
 
-maintainer-clean-target-libbacktrace:
+maintainer-clean-target-libbacktrace: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -51878,7 +51387,7 @@ configure-target-libquadmath: stage_current
 @endif gcc-bootstrap
 @if target-libquadmath
 maybe-configure-target-libquadmath: configure-target-libquadmath
-configure-target-libquadmath:
+configure-target-libquadmath: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -51994,7 +51503,7 @@ maybe-info-target-libquadmath:
 maybe-info-target-libquadmath: info-target-libquadmath
 
 info-target-libquadmath: \
-    configure-target-libquadmath
+    configure-target-libquadmath 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52020,7 +51529,7 @@ maybe-dvi-target-libquadmath:
 maybe-dvi-target-libquadmath: dvi-target-libquadmath
 
 dvi-target-libquadmath: \
-    configure-target-libquadmath
+    configure-target-libquadmath 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52046,7 +51555,7 @@ maybe-pdf-target-libquadmath:
 maybe-pdf-target-libquadmath: pdf-target-libquadmath
 
 pdf-target-libquadmath: \
-    configure-target-libquadmath
+    configure-target-libquadmath 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52072,7 +51581,7 @@ maybe-html-target-libquadmath:
 maybe-html-target-libquadmath: html-target-libquadmath
 
 html-target-libquadmath: \
-    configure-target-libquadmath
+    configure-target-libquadmath 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52098,7 +51607,7 @@ maybe-TAGS-target-libquadmath:
 maybe-TAGS-target-libquadmath: TAGS-target-libquadmath
 
 TAGS-target-libquadmath: \
-    configure-target-libquadmath
+    configure-target-libquadmath 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52125,7 +51634,7 @@ maybe-install-info-target-libquadmath: install-info-target-libquadmath
 
 install-info-target-libquadmath: \
     configure-target-libquadmath \
-    info-target-libquadmath
+    info-target-libquadmath 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52152,7 +51661,7 @@ maybe-install-dvi-target-libquadmath: install-dvi-target-libquadmath
 
 install-dvi-target-libquadmath: \
     configure-target-libquadmath \
-    dvi-target-libquadmath
+    dvi-target-libquadmath 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52179,7 +51688,7 @@ maybe-install-pdf-target-libquadmath: install-pdf-target-libquadmath
 
 install-pdf-target-libquadmath: \
     configure-target-libquadmath \
-    pdf-target-libquadmath
+    pdf-target-libquadmath 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52206,7 +51715,7 @@ maybe-install-html-target-libquadmath: install-html-target-libquadmath
 
 install-html-target-libquadmath: \
     configure-target-libquadmath \
-    html-target-libquadmath
+    html-target-libquadmath 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52232,7 +51741,7 @@ maybe-installcheck-target-libquadmath:
 maybe-installcheck-target-libquadmath: installcheck-target-libquadmath
 
 installcheck-target-libquadmath: \
-    configure-target-libquadmath
+    configure-target-libquadmath 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52257,7 +51766,7 @@ maybe-mostlyclean-target-libquadmath:
 @if target-libquadmath
 maybe-mostlyclean-target-libquadmath: mostlyclean-target-libquadmath
 
-mostlyclean-target-libquadmath:
+mostlyclean-target-libquadmath: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52282,7 +51791,7 @@ maybe-clean-target-libquadmath:
 @if target-libquadmath
 maybe-clean-target-libquadmath: clean-target-libquadmath
 
-clean-target-libquadmath:
+clean-target-libquadmath: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52307,7 +51816,7 @@ maybe-distclean-target-libquadmath:
 @if target-libquadmath
 maybe-distclean-target-libquadmath: distclean-target-libquadmath
 
-distclean-target-libquadmath:
+distclean-target-libquadmath: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52332,7 +51841,7 @@ maybe-maintainer-clean-target-libquadmath:
 @if target-libquadmath
 maybe-maintainer-clean-target-libquadmath: maintainer-clean-target-libquadmath
 
-maintainer-clean-target-libquadmath:
+maintainer-clean-target-libquadmath: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52363,7 +51872,7 @@ configure-target-libgfortran: stage_current
 @endif gcc-bootstrap
 @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; \
@@ -52479,7 +51988,7 @@ maybe-info-target-libgfortran:
 maybe-info-target-libgfortran: info-target-libgfortran
 
 info-target-libgfortran: \
-    configure-target-libgfortran
+    configure-target-libgfortran 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52505,7 +52014,7 @@ maybe-dvi-target-libgfortran:
 maybe-dvi-target-libgfortran: dvi-target-libgfortran
 
 dvi-target-libgfortran: \
-    configure-target-libgfortran
+    configure-target-libgfortran 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52531,7 +52040,7 @@ maybe-pdf-target-libgfortran:
 maybe-pdf-target-libgfortran: pdf-target-libgfortran
 
 pdf-target-libgfortran: \
-    configure-target-libgfortran
+    configure-target-libgfortran 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52557,7 +52066,7 @@ maybe-html-target-libgfortran:
 maybe-html-target-libgfortran: html-target-libgfortran
 
 html-target-libgfortran: \
-    configure-target-libgfortran
+    configure-target-libgfortran 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52583,7 +52092,7 @@ maybe-TAGS-target-libgfortran:
 maybe-TAGS-target-libgfortran: TAGS-target-libgfortran
 
 TAGS-target-libgfortran: \
-    configure-target-libgfortran
+    configure-target-libgfortran 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52610,7 +52119,7 @@ maybe-install-info-target-libgfortran: install-info-target-libgfortran
 
 install-info-target-libgfortran: \
     configure-target-libgfortran \
-    info-target-libgfortran
+    info-target-libgfortran 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52637,7 +52146,7 @@ maybe-install-dvi-target-libgfortran: install-dvi-target-libgfortran
 
 install-dvi-target-libgfortran: \
     configure-target-libgfortran \
-    dvi-target-libgfortran
+    dvi-target-libgfortran 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52664,7 +52173,7 @@ maybe-install-pdf-target-libgfortran: install-pdf-target-libgfortran
 
 install-pdf-target-libgfortran: \
     configure-target-libgfortran \
-    pdf-target-libgfortran
+    pdf-target-libgfortran 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52691,7 +52200,7 @@ maybe-install-html-target-libgfortran: install-html-target-libgfortran
 
 install-html-target-libgfortran: \
     configure-target-libgfortran \
-    html-target-libgfortran
+    html-target-libgfortran 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52717,7 +52226,7 @@ maybe-installcheck-target-libgfortran:
 maybe-installcheck-target-libgfortran: installcheck-target-libgfortran
 
 installcheck-target-libgfortran: \
-    configure-target-libgfortran
+    configure-target-libgfortran 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52742,7 +52251,7 @@ maybe-mostlyclean-target-libgfortran:
 @if target-libgfortran
 maybe-mostlyclean-target-libgfortran: mostlyclean-target-libgfortran
 
-mostlyclean-target-libgfortran:
+mostlyclean-target-libgfortran: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52767,7 +52276,7 @@ maybe-clean-target-libgfortran:
 @if target-libgfortran
 maybe-clean-target-libgfortran: clean-target-libgfortran
 
-clean-target-libgfortran:
+clean-target-libgfortran: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52792,7 +52301,7 @@ maybe-distclean-target-libgfortran:
 @if target-libgfortran
 maybe-distclean-target-libgfortran: distclean-target-libgfortran
 
-distclean-target-libgfortran:
+distclean-target-libgfortran: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52817,7 +52326,7 @@ maybe-maintainer-clean-target-libgfortran:
 @if target-libgfortran
 maybe-maintainer-clean-target-libgfortran: maintainer-clean-target-libgfortran
 
-maintainer-clean-target-libgfortran:
+maintainer-clean-target-libgfortran: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52848,7 +52357,7 @@ configure-target-libobjc: stage_current
 @endif gcc-bootstrap
 @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; \
@@ -52964,7 +52473,7 @@ maybe-info-target-libobjc:
 maybe-info-target-libobjc: info-target-libobjc
 
 info-target-libobjc: \
-    configure-target-libobjc
+    configure-target-libobjc 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -52990,7 +52499,7 @@ maybe-dvi-target-libobjc:
 maybe-dvi-target-libobjc: dvi-target-libobjc
 
 dvi-target-libobjc: \
-    configure-target-libobjc
+    configure-target-libobjc 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53016,7 +52525,7 @@ maybe-pdf-target-libobjc:
 maybe-pdf-target-libobjc: pdf-target-libobjc
 
 pdf-target-libobjc: \
-    configure-target-libobjc
+    configure-target-libobjc 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53042,7 +52551,7 @@ maybe-html-target-libobjc:
 maybe-html-target-libobjc: html-target-libobjc
 
 html-target-libobjc: \
-    configure-target-libobjc
+    configure-target-libobjc 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53079,7 +52588,7 @@ maybe-install-info-target-libobjc: install-info-target-libobjc
 
 install-info-target-libobjc: \
     configure-target-libobjc \
-    info-target-libobjc
+    info-target-libobjc 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53116,7 +52625,7 @@ maybe-install-pdf-target-libobjc: install-pdf-target-libobjc
 
 install-pdf-target-libobjc: \
     configure-target-libobjc \
-    pdf-target-libobjc
+    pdf-target-libobjc 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53143,7 +52652,7 @@ maybe-install-html-target-libobjc: install-html-target-libobjc
 
 install-html-target-libobjc: \
     configure-target-libobjc \
-    html-target-libobjc
+    html-target-libobjc 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53169,7 +52678,7 @@ maybe-installcheck-target-libobjc:
 maybe-installcheck-target-libobjc: installcheck-target-libobjc
 
 installcheck-target-libobjc: \
-    configure-target-libobjc
+    configure-target-libobjc 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53194,7 +52703,7 @@ maybe-mostlyclean-target-libobjc:
 @if target-libobjc
 maybe-mostlyclean-target-libobjc: mostlyclean-target-libobjc
 
-mostlyclean-target-libobjc:
+mostlyclean-target-libobjc: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53219,7 +52728,7 @@ maybe-clean-target-libobjc:
 @if target-libobjc
 maybe-clean-target-libobjc: clean-target-libobjc
 
-clean-target-libobjc:
+clean-target-libobjc: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53244,7 +52753,7 @@ maybe-distclean-target-libobjc:
 @if target-libobjc
 maybe-distclean-target-libobjc: distclean-target-libobjc
 
-distclean-target-libobjc:
+distclean-target-libobjc: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53269,7 +52778,7 @@ maybe-maintainer-clean-target-libobjc:
 @if target-libobjc
 maybe-maintainer-clean-target-libobjc: maintainer-clean-target-libobjc
 
-maintainer-clean-target-libobjc:
+maintainer-clean-target-libobjc: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53300,7 +52809,7 @@ configure-target-libgo: stage_current
 @endif gcc-bootstrap
 @if target-libgo
 maybe-configure-target-libgo: configure-target-libgo
-configure-target-libgo:
+configure-target-libgo: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -53416,7 +52925,7 @@ maybe-info-target-libgo:
 maybe-info-target-libgo: info-target-libgo
 
 info-target-libgo: \
-    configure-target-libgo
+    configure-target-libgo 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53442,7 +52951,7 @@ maybe-dvi-target-libgo:
 maybe-dvi-target-libgo: dvi-target-libgo
 
 dvi-target-libgo: \
-    configure-target-libgo
+    configure-target-libgo 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53468,7 +52977,7 @@ maybe-pdf-target-libgo:
 maybe-pdf-target-libgo: pdf-target-libgo
 
 pdf-target-libgo: \
-    configure-target-libgo
+    configure-target-libgo 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53494,7 +53003,7 @@ maybe-html-target-libgo:
 maybe-html-target-libgo: html-target-libgo
 
 html-target-libgo: \
-    configure-target-libgo
+    configure-target-libgo 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53520,7 +53029,7 @@ maybe-TAGS-target-libgo:
 maybe-TAGS-target-libgo: TAGS-target-libgo
 
 TAGS-target-libgo: \
-    configure-target-libgo
+    configure-target-libgo 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53547,7 +53056,7 @@ maybe-install-info-target-libgo: install-info-target-libgo
 
 install-info-target-libgo: \
     configure-target-libgo \
-    info-target-libgo
+    info-target-libgo 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53574,7 +53083,7 @@ maybe-install-dvi-target-libgo: install-dvi-target-libgo
 
 install-dvi-target-libgo: \
     configure-target-libgo \
-    dvi-target-libgo
+    dvi-target-libgo 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53601,7 +53110,7 @@ maybe-install-pdf-target-libgo: install-pdf-target-libgo
 
 install-pdf-target-libgo: \
     configure-target-libgo \
-    pdf-target-libgo
+    pdf-target-libgo 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53628,7 +53137,7 @@ maybe-install-html-target-libgo: install-html-target-libgo
 
 install-html-target-libgo: \
     configure-target-libgo \
-    html-target-libgo
+    html-target-libgo 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53654,7 +53163,7 @@ maybe-installcheck-target-libgo:
 maybe-installcheck-target-libgo: installcheck-target-libgo
 
 installcheck-target-libgo: \
-    configure-target-libgo
+    configure-target-libgo 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53679,7 +53188,7 @@ maybe-mostlyclean-target-libgo:
 @if target-libgo
 maybe-mostlyclean-target-libgo: mostlyclean-target-libgo
 
-mostlyclean-target-libgo:
+mostlyclean-target-libgo: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53704,7 +53213,7 @@ maybe-clean-target-libgo:
 @if target-libgo
 maybe-clean-target-libgo: clean-target-libgo
 
-clean-target-libgo:
+clean-target-libgo: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53729,7 +53238,7 @@ maybe-distclean-target-libgo:
 @if target-libgo
 maybe-distclean-target-libgo: distclean-target-libgo
 
-distclean-target-libgo:
+distclean-target-libgo: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53754,7 +53263,7 @@ maybe-maintainer-clean-target-libgo:
 @if target-libgo
 maybe-maintainer-clean-target-libgo: maintainer-clean-target-libgo
 
-maintainer-clean-target-libgo:
+maintainer-clean-target-libgo: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -53785,7 +53294,7 @@ configure-target-libphobos: stage_current
 @endif gcc-bootstrap
 @if target-libphobos
 maybe-configure-target-libphobos: configure-target-libphobos
-configure-target-libphobos:
+configure-target-libphobos: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	echo "Checking multilib configuration for libphobos..."; \
@@ -54686,7 +54195,7 @@ maybe-info-target-libphobos:
 maybe-info-target-libphobos: info-target-libphobos
 
 info-target-libphobos: \
-    configure-target-libphobos
+    configure-target-libphobos 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -54712,7 +54221,7 @@ maybe-dvi-target-libphobos:
 maybe-dvi-target-libphobos: dvi-target-libphobos
 
 dvi-target-libphobos: \
-    configure-target-libphobos
+    configure-target-libphobos 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -54738,7 +54247,7 @@ maybe-pdf-target-libphobos:
 maybe-pdf-target-libphobos: pdf-target-libphobos
 
 pdf-target-libphobos: \
-    configure-target-libphobos
+    configure-target-libphobos 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -54764,7 +54273,7 @@ maybe-html-target-libphobos:
 maybe-html-target-libphobos: html-target-libphobos
 
 html-target-libphobos: \
-    configure-target-libphobos
+    configure-target-libphobos 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -54790,7 +54299,7 @@ maybe-TAGS-target-libphobos:
 maybe-TAGS-target-libphobos: TAGS-target-libphobos
 
 TAGS-target-libphobos: \
-    configure-target-libphobos
+    configure-target-libphobos 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -54817,7 +54326,7 @@ maybe-install-info-target-libphobos: install-info-target-libphobos
 
 install-info-target-libphobos: \
     configure-target-libphobos \
-    info-target-libphobos
+    info-target-libphobos 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -54844,7 +54353,7 @@ maybe-install-dvi-target-libphobos: install-dvi-target-libphobos
 
 install-dvi-target-libphobos: \
     configure-target-libphobos \
-    dvi-target-libphobos
+    dvi-target-libphobos 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -54871,7 +54380,7 @@ maybe-install-pdf-target-libphobos: install-pdf-target-libphobos
 
 install-pdf-target-libphobos: \
     configure-target-libphobos \
-    pdf-target-libphobos
+    pdf-target-libphobos 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -54898,7 +54407,7 @@ maybe-install-html-target-libphobos: install-html-target-libphobos
 
 install-html-target-libphobos: \
     configure-target-libphobos \
-    html-target-libphobos
+    html-target-libphobos 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -54924,7 +54433,7 @@ maybe-installcheck-target-libphobos:
 maybe-installcheck-target-libphobos: installcheck-target-libphobos
 
 installcheck-target-libphobos: \
-    configure-target-libphobos
+    configure-target-libphobos 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -54949,7 +54458,7 @@ maybe-mostlyclean-target-libphobos:
 @if target-libphobos
 maybe-mostlyclean-target-libphobos: mostlyclean-target-libphobos
 
-mostlyclean-target-libphobos:
+mostlyclean-target-libphobos: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -54974,7 +54483,7 @@ maybe-clean-target-libphobos:
 @if target-libphobos
 maybe-clean-target-libphobos: clean-target-libphobos
 
-clean-target-libphobos:
+clean-target-libphobos: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -54999,7 +54508,7 @@ maybe-distclean-target-libphobos:
 @if target-libphobos
 maybe-distclean-target-libphobos: distclean-target-libphobos
 
-distclean-target-libphobos:
+distclean-target-libphobos: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55024,7 +54533,7 @@ maybe-maintainer-clean-target-libphobos:
 @if target-libphobos
 maybe-maintainer-clean-target-libphobos: maintainer-clean-target-libphobos
 
-maintainer-clean-target-libphobos:
+maintainer-clean-target-libphobos: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55055,7 +54564,7 @@ configure-target-libtermcap: stage_current
 @endif gcc-bootstrap
 @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; \
@@ -55166,7 +54675,7 @@ maybe-info-target-libtermcap:
 maybe-info-target-libtermcap: info-target-libtermcap
 
 info-target-libtermcap: \
-    configure-target-libtermcap
+    configure-target-libtermcap 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55192,7 +54701,7 @@ maybe-dvi-target-libtermcap:
 maybe-dvi-target-libtermcap: dvi-target-libtermcap
 
 dvi-target-libtermcap: \
-    configure-target-libtermcap
+    configure-target-libtermcap 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55218,7 +54727,7 @@ maybe-pdf-target-libtermcap:
 maybe-pdf-target-libtermcap: pdf-target-libtermcap
 
 pdf-target-libtermcap: \
-    configure-target-libtermcap
+    configure-target-libtermcap 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55244,7 +54753,7 @@ maybe-html-target-libtermcap:
 maybe-html-target-libtermcap: html-target-libtermcap
 
 html-target-libtermcap: \
-    configure-target-libtermcap
+    configure-target-libtermcap 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55270,7 +54779,7 @@ maybe-TAGS-target-libtermcap:
 maybe-TAGS-target-libtermcap: TAGS-target-libtermcap
 
 TAGS-target-libtermcap: \
-    configure-target-libtermcap
+    configure-target-libtermcap 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55297,7 +54806,7 @@ maybe-install-info-target-libtermcap: install-info-target-libtermcap
 
 install-info-target-libtermcap: \
     configure-target-libtermcap \
-    info-target-libtermcap
+    info-target-libtermcap 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55324,7 +54833,7 @@ maybe-install-dvi-target-libtermcap: install-dvi-target-libtermcap
 
 install-dvi-target-libtermcap: \
     configure-target-libtermcap \
-    dvi-target-libtermcap
+    dvi-target-libtermcap 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55351,7 +54860,7 @@ maybe-install-pdf-target-libtermcap: install-pdf-target-libtermcap
 
 install-pdf-target-libtermcap: \
     configure-target-libtermcap \
-    pdf-target-libtermcap
+    pdf-target-libtermcap 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55378,7 +54887,7 @@ maybe-install-html-target-libtermcap: install-html-target-libtermcap
 
 install-html-target-libtermcap: \
     configure-target-libtermcap \
-    html-target-libtermcap
+    html-target-libtermcap 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55404,7 +54913,7 @@ maybe-installcheck-target-libtermcap:
 maybe-installcheck-target-libtermcap: installcheck-target-libtermcap
 
 installcheck-target-libtermcap: \
-    configure-target-libtermcap
+    configure-target-libtermcap 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55475,7 +54984,7 @@ configure-target-winsup: stage_current
 @endif gcc-bootstrap
 @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; \
@@ -55591,7 +55100,7 @@ maybe-info-target-winsup:
 maybe-info-target-winsup: info-target-winsup
 
 info-target-winsup: \
-    configure-target-winsup
+    configure-target-winsup 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55617,7 +55126,7 @@ maybe-dvi-target-winsup:
 maybe-dvi-target-winsup: dvi-target-winsup
 
 dvi-target-winsup: \
-    configure-target-winsup
+    configure-target-winsup 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55643,7 +55152,7 @@ maybe-pdf-target-winsup:
 maybe-pdf-target-winsup: pdf-target-winsup
 
 pdf-target-winsup: \
-    configure-target-winsup
+    configure-target-winsup 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55669,7 +55178,7 @@ maybe-html-target-winsup:
 maybe-html-target-winsup: html-target-winsup
 
 html-target-winsup: \
-    configure-target-winsup
+    configure-target-winsup 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55695,7 +55204,7 @@ maybe-TAGS-target-winsup:
 maybe-TAGS-target-winsup: TAGS-target-winsup
 
 TAGS-target-winsup: \
-    configure-target-winsup
+    configure-target-winsup 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55722,7 +55231,7 @@ maybe-install-info-target-winsup: install-info-target-winsup
 
 install-info-target-winsup: \
     configure-target-winsup \
-    info-target-winsup
+    info-target-winsup 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55749,7 +55258,7 @@ maybe-install-dvi-target-winsup: install-dvi-target-winsup
 
 install-dvi-target-winsup: \
     configure-target-winsup \
-    dvi-target-winsup
+    dvi-target-winsup 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55776,7 +55285,7 @@ maybe-install-pdf-target-winsup: install-pdf-target-winsup
 
 install-pdf-target-winsup: \
     configure-target-winsup \
-    pdf-target-winsup
+    pdf-target-winsup 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55803,7 +55312,7 @@ maybe-install-html-target-winsup: install-html-target-winsup
 
 install-html-target-winsup: \
     configure-target-winsup \
-    html-target-winsup
+    html-target-winsup 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55829,7 +55338,7 @@ maybe-installcheck-target-winsup:
 maybe-installcheck-target-winsup: installcheck-target-winsup
 
 installcheck-target-winsup: \
-    configure-target-winsup
+    configure-target-winsup 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55854,7 +55363,7 @@ maybe-mostlyclean-target-winsup:
 @if target-winsup
 maybe-mostlyclean-target-winsup: mostlyclean-target-winsup
 
-mostlyclean-target-winsup:
+mostlyclean-target-winsup: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55879,7 +55388,7 @@ maybe-clean-target-winsup:
 @if target-winsup
 maybe-clean-target-winsup: clean-target-winsup
 
-clean-target-winsup:
+clean-target-winsup: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55904,7 +55413,7 @@ maybe-distclean-target-winsup:
 @if target-winsup
 maybe-distclean-target-winsup: distclean-target-winsup
 
-distclean-target-winsup:
+distclean-target-winsup: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55929,7 +55438,7 @@ maybe-maintainer-clean-target-winsup:
 @if target-winsup
 maybe-maintainer-clean-target-winsup: maintainer-clean-target-winsup
 
-maintainer-clean-target-winsup:
+maintainer-clean-target-winsup: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -55960,7 +55469,7 @@ configure-target-libgloss: stage_current
 @endif gcc-bootstrap
 @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; \
@@ -56071,7 +55580,7 @@ maybe-info-target-libgloss:
 maybe-info-target-libgloss: info-target-libgloss
 
 info-target-libgloss: \
-    configure-target-libgloss
+    configure-target-libgloss 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56097,7 +55606,7 @@ maybe-dvi-target-libgloss:
 maybe-dvi-target-libgloss: dvi-target-libgloss
 
 dvi-target-libgloss: \
-    configure-target-libgloss
+    configure-target-libgloss 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56123,7 +55632,7 @@ maybe-pdf-target-libgloss:
 maybe-pdf-target-libgloss: pdf-target-libgloss
 
 pdf-target-libgloss: \
-    configure-target-libgloss
+    configure-target-libgloss 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56149,7 +55658,7 @@ maybe-html-target-libgloss:
 maybe-html-target-libgloss: html-target-libgloss
 
 html-target-libgloss: \
-    configure-target-libgloss
+    configure-target-libgloss 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56175,7 +55684,7 @@ maybe-TAGS-target-libgloss:
 maybe-TAGS-target-libgloss: TAGS-target-libgloss
 
 TAGS-target-libgloss: \
-    configure-target-libgloss
+    configure-target-libgloss 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56202,7 +55711,7 @@ maybe-install-info-target-libgloss: install-info-target-libgloss
 
 install-info-target-libgloss: \
     configure-target-libgloss \
-    info-target-libgloss
+    info-target-libgloss 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56229,7 +55738,7 @@ maybe-install-dvi-target-libgloss: install-dvi-target-libgloss
 
 install-dvi-target-libgloss: \
     configure-target-libgloss \
-    dvi-target-libgloss
+    dvi-target-libgloss 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56256,7 +55765,7 @@ maybe-install-pdf-target-libgloss: install-pdf-target-libgloss
 
 install-pdf-target-libgloss: \
     configure-target-libgloss \
-    pdf-target-libgloss
+    pdf-target-libgloss 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56283,7 +55792,7 @@ maybe-install-html-target-libgloss: install-html-target-libgloss
 
 install-html-target-libgloss: \
     configure-target-libgloss \
-    html-target-libgloss
+    html-target-libgloss 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56309,7 +55818,7 @@ maybe-installcheck-target-libgloss:
 maybe-installcheck-target-libgloss: installcheck-target-libgloss
 
 installcheck-target-libgloss: \
-    configure-target-libgloss
+    configure-target-libgloss 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56334,7 +55843,7 @@ maybe-mostlyclean-target-libgloss:
 @if target-libgloss
 maybe-mostlyclean-target-libgloss: mostlyclean-target-libgloss
 
-mostlyclean-target-libgloss:
+mostlyclean-target-libgloss: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56359,7 +55868,7 @@ maybe-clean-target-libgloss:
 @if target-libgloss
 maybe-clean-target-libgloss: clean-target-libgloss
 
-clean-target-libgloss:
+clean-target-libgloss: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56384,7 +55893,7 @@ maybe-distclean-target-libgloss:
 @if target-libgloss
 maybe-distclean-target-libgloss: distclean-target-libgloss
 
-distclean-target-libgloss:
+distclean-target-libgloss: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56409,7 +55918,7 @@ maybe-maintainer-clean-target-libgloss:
 @if target-libgloss
 maybe-maintainer-clean-target-libgloss: maintainer-clean-target-libgloss
 
-maintainer-clean-target-libgloss:
+maintainer-clean-target-libgloss: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56440,7 +55949,7 @@ configure-target-libffi: stage_current
 @endif gcc-bootstrap
 @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; \
@@ -56546,7 +56055,7 @@ maybe-info-target-libffi:
 maybe-info-target-libffi: info-target-libffi
 
 info-target-libffi: \
-    configure-target-libffi
+    configure-target-libffi 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56572,7 +56081,7 @@ maybe-dvi-target-libffi:
 maybe-dvi-target-libffi: dvi-target-libffi
 
 dvi-target-libffi: \
-    configure-target-libffi
+    configure-target-libffi 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56598,7 +56107,7 @@ maybe-pdf-target-libffi:
 maybe-pdf-target-libffi: pdf-target-libffi
 
 pdf-target-libffi: \
-    configure-target-libffi
+    configure-target-libffi 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56624,7 +56133,7 @@ maybe-html-target-libffi:
 maybe-html-target-libffi: html-target-libffi
 
 html-target-libffi: \
-    configure-target-libffi
+    configure-target-libffi 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56650,7 +56159,7 @@ maybe-TAGS-target-libffi:
 maybe-TAGS-target-libffi: TAGS-target-libffi
 
 TAGS-target-libffi: \
-    configure-target-libffi
+    configure-target-libffi 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56677,7 +56186,7 @@ maybe-install-info-target-libffi: install-info-target-libffi
 
 install-info-target-libffi: \
     configure-target-libffi \
-    info-target-libffi
+    info-target-libffi 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56704,7 +56213,7 @@ maybe-install-dvi-target-libffi: install-dvi-target-libffi
 
 install-dvi-target-libffi: \
     configure-target-libffi \
-    dvi-target-libffi
+    dvi-target-libffi 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56731,7 +56240,7 @@ maybe-install-pdf-target-libffi: install-pdf-target-libffi
 
 install-pdf-target-libffi: \
     configure-target-libffi \
-    pdf-target-libffi
+    pdf-target-libffi 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56758,7 +56267,7 @@ maybe-install-html-target-libffi: install-html-target-libffi
 
 install-html-target-libffi: \
     configure-target-libffi \
-    html-target-libffi
+    html-target-libffi 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56784,7 +56293,7 @@ maybe-installcheck-target-libffi:
 maybe-installcheck-target-libffi: installcheck-target-libffi
 
 installcheck-target-libffi: \
-    configure-target-libffi
+    configure-target-libffi 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56809,7 +56318,7 @@ maybe-mostlyclean-target-libffi:
 @if target-libffi
 maybe-mostlyclean-target-libffi: mostlyclean-target-libffi
 
-mostlyclean-target-libffi:
+mostlyclean-target-libffi: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56834,7 +56343,7 @@ maybe-clean-target-libffi:
 @if target-libffi
 maybe-clean-target-libffi: clean-target-libffi
 
-clean-target-libffi:
+clean-target-libffi: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56859,7 +56368,7 @@ maybe-distclean-target-libffi:
 @if target-libffi
 maybe-distclean-target-libffi: distclean-target-libffi
 
-distclean-target-libffi:
+distclean-target-libffi: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56884,7 +56393,7 @@ maybe-maintainer-clean-target-libffi:
 @if target-libffi
 maybe-maintainer-clean-target-libffi: maintainer-clean-target-libffi
 
-maintainer-clean-target-libffi:
+maintainer-clean-target-libffi: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -56915,7 +56424,7 @@ configure-target-zlib: stage_current
 @endif gcc-bootstrap
 @if target-zlib
 maybe-configure-target-zlib: configure-target-zlib
-configure-target-zlib:
+configure-target-zlib: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	echo "Checking multilib configuration for zlib..."; \
@@ -57816,7 +57325,7 @@ maybe-info-target-zlib:
 maybe-info-target-zlib: info-target-zlib
 
 info-target-zlib: \
-    configure-target-zlib
+    configure-target-zlib 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -57842,7 +57351,7 @@ maybe-dvi-target-zlib:
 maybe-dvi-target-zlib: dvi-target-zlib
 
 dvi-target-zlib: \
-    configure-target-zlib
+    configure-target-zlib 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -57868,7 +57377,7 @@ maybe-pdf-target-zlib:
 maybe-pdf-target-zlib: pdf-target-zlib
 
 pdf-target-zlib: \
-    configure-target-zlib
+    configure-target-zlib 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -57894,7 +57403,7 @@ maybe-html-target-zlib:
 maybe-html-target-zlib: html-target-zlib
 
 html-target-zlib: \
-    configure-target-zlib
+    configure-target-zlib 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -57920,7 +57429,7 @@ maybe-TAGS-target-zlib:
 maybe-TAGS-target-zlib: TAGS-target-zlib
 
 TAGS-target-zlib: \
-    configure-target-zlib
+    configure-target-zlib 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -57947,7 +57456,7 @@ maybe-install-info-target-zlib: install-info-target-zlib
 
 install-info-target-zlib: \
     configure-target-zlib \
-    info-target-zlib
+    info-target-zlib 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -57974,7 +57483,7 @@ maybe-install-dvi-target-zlib: install-dvi-target-zlib
 
 install-dvi-target-zlib: \
     configure-target-zlib \
-    dvi-target-zlib
+    dvi-target-zlib 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58001,7 +57510,7 @@ maybe-install-pdf-target-zlib: install-pdf-target-zlib
 
 install-pdf-target-zlib: \
     configure-target-zlib \
-    pdf-target-zlib
+    pdf-target-zlib 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58028,7 +57537,7 @@ maybe-install-html-target-zlib: install-html-target-zlib
 
 install-html-target-zlib: \
     configure-target-zlib \
-    html-target-zlib
+    html-target-zlib 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58054,7 +57563,7 @@ maybe-installcheck-target-zlib:
 maybe-installcheck-target-zlib: installcheck-target-zlib
 
 installcheck-target-zlib: \
-    configure-target-zlib
+    configure-target-zlib 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58079,7 +57588,7 @@ maybe-mostlyclean-target-zlib:
 @if target-zlib
 maybe-mostlyclean-target-zlib: mostlyclean-target-zlib
 
-mostlyclean-target-zlib:
+mostlyclean-target-zlib: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58104,7 +57613,7 @@ maybe-clean-target-zlib:
 @if target-zlib
 maybe-clean-target-zlib: clean-target-zlib
 
-clean-target-zlib:
+clean-target-zlib: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58129,7 +57638,7 @@ maybe-distclean-target-zlib:
 @if target-zlib
 maybe-distclean-target-zlib: distclean-target-zlib
 
-distclean-target-zlib:
+distclean-target-zlib: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58154,7 +57663,7 @@ maybe-maintainer-clean-target-zlib:
 @if target-zlib
 maybe-maintainer-clean-target-zlib: maintainer-clean-target-zlib
 
-maintainer-clean-target-zlib:
+maintainer-clean-target-zlib: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58185,7 +57694,7 @@ configure-target-rda: stage_current
 @endif gcc-bootstrap
 @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; \
@@ -58301,7 +57810,7 @@ maybe-info-target-rda:
 maybe-info-target-rda: info-target-rda
 
 info-target-rda: \
-    configure-target-rda
+    configure-target-rda 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58327,7 +57836,7 @@ maybe-dvi-target-rda:
 maybe-dvi-target-rda: dvi-target-rda
 
 dvi-target-rda: \
-    configure-target-rda
+    configure-target-rda 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58353,7 +57862,7 @@ maybe-pdf-target-rda:
 maybe-pdf-target-rda: pdf-target-rda
 
 pdf-target-rda: \
-    configure-target-rda
+    configure-target-rda 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58379,7 +57888,7 @@ maybe-html-target-rda:
 maybe-html-target-rda: html-target-rda
 
 html-target-rda: \
-    configure-target-rda
+    configure-target-rda 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58405,7 +57914,7 @@ maybe-TAGS-target-rda:
 maybe-TAGS-target-rda: TAGS-target-rda
 
 TAGS-target-rda: \
-    configure-target-rda
+    configure-target-rda 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58432,7 +57941,7 @@ maybe-install-info-target-rda: install-info-target-rda
 
 install-info-target-rda: \
     configure-target-rda \
-    info-target-rda
+    info-target-rda 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58459,7 +57968,7 @@ maybe-install-dvi-target-rda: install-dvi-target-rda
 
 install-dvi-target-rda: \
     configure-target-rda \
-    dvi-target-rda
+    dvi-target-rda 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58486,7 +57995,7 @@ maybe-install-pdf-target-rda: install-pdf-target-rda
 
 install-pdf-target-rda: \
     configure-target-rda \
-    pdf-target-rda
+    pdf-target-rda 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58513,7 +58022,7 @@ maybe-install-html-target-rda: install-html-target-rda
 
 install-html-target-rda: \
     configure-target-rda \
-    html-target-rda
+    html-target-rda 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58539,7 +58048,7 @@ maybe-installcheck-target-rda:
 maybe-installcheck-target-rda: installcheck-target-rda
 
 installcheck-target-rda: \
-    configure-target-rda
+    configure-target-rda 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58564,7 +58073,7 @@ maybe-mostlyclean-target-rda:
 @if target-rda
 maybe-mostlyclean-target-rda: mostlyclean-target-rda
 
-mostlyclean-target-rda:
+mostlyclean-target-rda: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58589,7 +58098,7 @@ maybe-clean-target-rda:
 @if target-rda
 maybe-clean-target-rda: clean-target-rda
 
-clean-target-rda:
+clean-target-rda: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58614,7 +58123,7 @@ maybe-distclean-target-rda:
 @if target-rda
 maybe-distclean-target-rda: distclean-target-rda
 
-distclean-target-rda:
+distclean-target-rda: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58639,7 +58148,7 @@ maybe-maintainer-clean-target-rda:
 @if target-rda
 maybe-maintainer-clean-target-rda: maintainer-clean-target-rda
 
-maintainer-clean-target-rda:
+maintainer-clean-target-rda: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58670,7 +58179,7 @@ configure-target-libada: stage_current
 @endif gcc-bootstrap
 @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; \
@@ -58786,7 +58295,7 @@ maybe-info-target-libada:
 maybe-info-target-libada: info-target-libada
 
 info-target-libada: \
-    configure-target-libada
+    configure-target-libada 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58812,7 +58321,7 @@ maybe-dvi-target-libada:
 maybe-dvi-target-libada: dvi-target-libada
 
 dvi-target-libada: \
-    configure-target-libada
+    configure-target-libada 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58838,7 +58347,7 @@ maybe-pdf-target-libada:
 maybe-pdf-target-libada: pdf-target-libada
 
 pdf-target-libada: \
-    configure-target-libada
+    configure-target-libada 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58864,7 +58373,7 @@ maybe-html-target-libada:
 maybe-html-target-libada: html-target-libada
 
 html-target-libada: \
-    configure-target-libada
+    configure-target-libada 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58890,7 +58399,7 @@ maybe-TAGS-target-libada:
 maybe-TAGS-target-libada: TAGS-target-libada
 
 TAGS-target-libada: \
-    configure-target-libada
+    configure-target-libada 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58917,7 +58426,7 @@ maybe-install-info-target-libada: install-info-target-libada
 
 install-info-target-libada: \
     configure-target-libada \
-    info-target-libada
+    info-target-libada 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58944,7 +58453,7 @@ maybe-install-dvi-target-libada: install-dvi-target-libada
 
 install-dvi-target-libada: \
     configure-target-libada \
-    dvi-target-libada
+    dvi-target-libada 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58971,7 +58480,7 @@ maybe-install-pdf-target-libada: install-pdf-target-libada
 
 install-pdf-target-libada: \
     configure-target-libada \
-    pdf-target-libada
+    pdf-target-libada 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -58998,7 +58507,7 @@ maybe-install-html-target-libada: install-html-target-libada
 
 install-html-target-libada: \
     configure-target-libada \
-    html-target-libada
+    html-target-libada 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -59024,7 +58533,7 @@ maybe-installcheck-target-libada:
 maybe-installcheck-target-libada: installcheck-target-libada
 
 installcheck-target-libada: \
-    configure-target-libada
+    configure-target-libada 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -59049,7 +58558,7 @@ maybe-mostlyclean-target-libada:
 @if target-libada
 maybe-mostlyclean-target-libada: mostlyclean-target-libada
 
-mostlyclean-target-libada:
+mostlyclean-target-libada: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -59074,7 +58583,7 @@ maybe-clean-target-libada:
 @if target-libada
 maybe-clean-target-libada: clean-target-libada
 
-clean-target-libada:
+clean-target-libada: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -59099,7 +58608,7 @@ maybe-distclean-target-libada:
 @if target-libada
 maybe-distclean-target-libada: distclean-target-libada
 
-distclean-target-libada:
+distclean-target-libada: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -59124,7 +58633,7 @@ maybe-maintainer-clean-target-libada:
 @if target-libada
 maybe-maintainer-clean-target-libada: maintainer-clean-target-libada
 
-maintainer-clean-target-libada:
+maintainer-clean-target-libada: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -59155,7 +58664,7 @@ configure-target-libgm2: stage_current
 @endif gcc-bootstrap
 @if target-libgm2
 maybe-configure-target-libgm2: configure-target-libgm2
-configure-target-libgm2:
+configure-target-libgm2: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -59271,7 +58780,7 @@ maybe-info-target-libgm2:
 maybe-info-target-libgm2: info-target-libgm2
 
 info-target-libgm2: \
-    configure-target-libgm2
+    configure-target-libgm2 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgm2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -59297,7 +58806,7 @@ maybe-dvi-target-libgm2:
 maybe-dvi-target-libgm2: dvi-target-libgm2
 
 dvi-target-libgm2: \
-    configure-target-libgm2
+    configure-target-libgm2 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgm2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -59323,7 +58832,7 @@ maybe-pdf-target-libgm2:
 maybe-pdf-target-libgm2: pdf-target-libgm2
 
 pdf-target-libgm2: \
-    configure-target-libgm2
+    configure-target-libgm2 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgm2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -59349,7 +58858,7 @@ maybe-html-target-libgm2:
 maybe-html-target-libgm2: html-target-libgm2
 
 html-target-libgm2: \
-    configure-target-libgm2
+    configure-target-libgm2 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgm2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -59375,7 +58884,7 @@ maybe-TAGS-target-libgm2:
 maybe-TAGS-target-libgm2: TAGS-target-libgm2
 
 TAGS-target-libgm2: \
-    configure-target-libgm2
+    configure-target-libgm2 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgm2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -59402,7 +58911,7 @@ maybe-install-info-target-libgm2: install-info-target-libgm2
 
 install-info-target-libgm2: \
     configure-target-libgm2 \
-    info-target-libgm2
+    info-target-libgm2 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgm2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -59429,7 +58938,7 @@ maybe-install-dvi-target-libgm2: install-dvi-target-libgm2
 
 install-dvi-target-libgm2: \
     configure-target-libgm2 \
-    dvi-target-libgm2
+    dvi-target-libgm2 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgm2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -59456,7 +58965,7 @@ maybe-install-pdf-target-libgm2: install-pdf-target-libgm2
 
 install-pdf-target-libgm2: \
     configure-target-libgm2 \
-    pdf-target-libgm2
+    pdf-target-libgm2 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgm2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -59483,7 +58992,7 @@ maybe-install-html-target-libgm2: install-html-target-libgm2
 
 install-html-target-libgm2: \
     configure-target-libgm2 \
-    html-target-libgm2
+    html-target-libgm2 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgm2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -59509,7 +59018,7 @@ maybe-installcheck-target-libgm2:
 maybe-installcheck-target-libgm2: installcheck-target-libgm2
 
 installcheck-target-libgm2: \
-    configure-target-libgm2
+    configure-target-libgm2 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgm2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -59534,7 +59043,7 @@ maybe-mostlyclean-target-libgm2:
 @if target-libgm2
 maybe-mostlyclean-target-libgm2: mostlyclean-target-libgm2
 
-mostlyclean-target-libgm2:
+mostlyclean-target-libgm2: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgm2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -59559,7 +59068,7 @@ maybe-clean-target-libgm2:
 @if target-libgm2
 maybe-clean-target-libgm2: clean-target-libgm2
 
-clean-target-libgm2:
+clean-target-libgm2: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgm2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -59584,7 +59093,7 @@ maybe-distclean-target-libgm2:
 @if target-libgm2
 maybe-distclean-target-libgm2: distclean-target-libgm2
 
-distclean-target-libgm2:
+distclean-target-libgm2: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgm2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -59609,7 +59118,7 @@ maybe-maintainer-clean-target-libgm2:
 @if target-libgm2
 maybe-maintainer-clean-target-libgm2: maintainer-clean-target-libgm2
 
-maintainer-clean-target-libgm2:
+maintainer-clean-target-libgm2: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgm2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -59640,7 +59149,7 @@ configure-target-libgomp: stage_current
 @endif gcc-bootstrap
 @if target-libgomp
 maybe-configure-target-libgomp: configure-target-libgomp
-configure-target-libgomp:
+configure-target-libgomp: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	echo "Checking multilib configuration for libgomp..."; \
@@ -60541,7 +60050,7 @@ maybe-info-target-libgomp:
 maybe-info-target-libgomp: info-target-libgomp
 
 info-target-libgomp: \
-    configure-target-libgomp
+    configure-target-libgomp 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -60567,7 +60076,7 @@ maybe-dvi-target-libgomp:
 maybe-dvi-target-libgomp: dvi-target-libgomp
 
 dvi-target-libgomp: \
-    configure-target-libgomp
+    configure-target-libgomp 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -60593,7 +60102,7 @@ maybe-pdf-target-libgomp:
 maybe-pdf-target-libgomp: pdf-target-libgomp
 
 pdf-target-libgomp: \
-    configure-target-libgomp
+    configure-target-libgomp 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -60619,7 +60128,7 @@ maybe-html-target-libgomp:
 maybe-html-target-libgomp: html-target-libgomp
 
 html-target-libgomp: \
-    configure-target-libgomp
+    configure-target-libgomp 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -60645,7 +60154,7 @@ maybe-TAGS-target-libgomp:
 maybe-TAGS-target-libgomp: TAGS-target-libgomp
 
 TAGS-target-libgomp: \
-    configure-target-libgomp
+    configure-target-libgomp 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -60672,7 +60181,7 @@ maybe-install-info-target-libgomp: install-info-target-libgomp
 
 install-info-target-libgomp: \
     configure-target-libgomp \
-    info-target-libgomp
+    info-target-libgomp 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -60699,7 +60208,7 @@ maybe-install-dvi-target-libgomp: install-dvi-target-libgomp
 
 install-dvi-target-libgomp: \
     configure-target-libgomp \
-    dvi-target-libgomp
+    dvi-target-libgomp 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -60726,7 +60235,7 @@ maybe-install-pdf-target-libgomp: install-pdf-target-libgomp
 
 install-pdf-target-libgomp: \
     configure-target-libgomp \
-    pdf-target-libgomp
+    pdf-target-libgomp 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -60753,7 +60262,7 @@ maybe-install-html-target-libgomp: install-html-target-libgomp
 
 install-html-target-libgomp: \
     configure-target-libgomp \
-    html-target-libgomp
+    html-target-libgomp 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -60779,7 +60288,7 @@ maybe-installcheck-target-libgomp:
 maybe-installcheck-target-libgomp: installcheck-target-libgomp
 
 installcheck-target-libgomp: \
-    configure-target-libgomp
+    configure-target-libgomp 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -60804,7 +60313,7 @@ maybe-mostlyclean-target-libgomp:
 @if target-libgomp
 maybe-mostlyclean-target-libgomp: mostlyclean-target-libgomp
 
-mostlyclean-target-libgomp:
+mostlyclean-target-libgomp: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -60829,7 +60338,7 @@ maybe-clean-target-libgomp:
 @if target-libgomp
 maybe-clean-target-libgomp: clean-target-libgomp
 
-clean-target-libgomp:
+clean-target-libgomp: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -60854,7 +60363,7 @@ maybe-distclean-target-libgomp:
 @if target-libgomp
 maybe-distclean-target-libgomp: distclean-target-libgomp
 
-distclean-target-libgomp:
+distclean-target-libgomp: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -60879,7 +60388,7 @@ maybe-maintainer-clean-target-libgomp:
 @if target-libgomp
 maybe-maintainer-clean-target-libgomp: maintainer-clean-target-libgomp
 
-maintainer-clean-target-libgomp:
+maintainer-clean-target-libgomp: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -60910,7 +60419,7 @@ configure-target-libitm: stage_current
 @endif gcc-bootstrap
 @if target-libitm
 maybe-configure-target-libitm: configure-target-libitm
-configure-target-libitm:
+configure-target-libitm: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -61026,7 +60535,7 @@ maybe-info-target-libitm:
 maybe-info-target-libitm: info-target-libitm
 
 info-target-libitm: \
-    configure-target-libitm
+    configure-target-libitm 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -61052,7 +60561,7 @@ maybe-dvi-target-libitm:
 maybe-dvi-target-libitm: dvi-target-libitm
 
 dvi-target-libitm: \
-    configure-target-libitm
+    configure-target-libitm 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -61078,7 +60587,7 @@ maybe-pdf-target-libitm:
 maybe-pdf-target-libitm: pdf-target-libitm
 
 pdf-target-libitm: \
-    configure-target-libitm
+    configure-target-libitm 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -61104,7 +60613,7 @@ maybe-html-target-libitm:
 maybe-html-target-libitm: html-target-libitm
 
 html-target-libitm: \
-    configure-target-libitm
+    configure-target-libitm 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -61130,7 +60639,7 @@ maybe-TAGS-target-libitm:
 maybe-TAGS-target-libitm: TAGS-target-libitm
 
 TAGS-target-libitm: \
-    configure-target-libitm
+    configure-target-libitm 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -61157,7 +60666,7 @@ maybe-install-info-target-libitm: install-info-target-libitm
 
 install-info-target-libitm: \
     configure-target-libitm \
-    info-target-libitm
+    info-target-libitm 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -61184,7 +60693,7 @@ maybe-install-dvi-target-libitm: install-dvi-target-libitm
 
 install-dvi-target-libitm: \
     configure-target-libitm \
-    dvi-target-libitm
+    dvi-target-libitm 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -61211,7 +60720,7 @@ maybe-install-pdf-target-libitm: install-pdf-target-libitm
 
 install-pdf-target-libitm: \
     configure-target-libitm \
-    pdf-target-libitm
+    pdf-target-libitm 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -61238,7 +60747,7 @@ maybe-install-html-target-libitm: install-html-target-libitm
 
 install-html-target-libitm: \
     configure-target-libitm \
-    html-target-libitm
+    html-target-libitm 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -61264,7 +60773,7 @@ maybe-installcheck-target-libitm:
 maybe-installcheck-target-libitm: installcheck-target-libitm
 
 installcheck-target-libitm: \
-    configure-target-libitm
+    configure-target-libitm 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -61289,7 +60798,7 @@ maybe-mostlyclean-target-libitm:
 @if target-libitm
 maybe-mostlyclean-target-libitm: mostlyclean-target-libitm
 
-mostlyclean-target-libitm:
+mostlyclean-target-libitm: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -61314,7 +60823,7 @@ maybe-clean-target-libitm:
 @if target-libitm
 maybe-clean-target-libitm: clean-target-libitm
 
-clean-target-libitm:
+clean-target-libitm: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -61339,7 +60848,7 @@ maybe-distclean-target-libitm:
 @if target-libitm
 maybe-distclean-target-libitm: distclean-target-libitm
 
-distclean-target-libitm:
+distclean-target-libitm: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -61364,7 +60873,7 @@ maybe-maintainer-clean-target-libitm:
 @if target-libitm
 maybe-maintainer-clean-target-libitm: maintainer-clean-target-libitm
 
-maintainer-clean-target-libitm:
+maintainer-clean-target-libitm: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -61395,7 +60904,7 @@ configure-target-libatomic: stage_current
 @endif gcc-bootstrap
 @if target-libatomic
 maybe-configure-target-libatomic: configure-target-libatomic
-configure-target-libatomic:
+configure-target-libatomic: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	echo "Checking multilib configuration for libatomic..."; \
@@ -62296,7 +61805,7 @@ maybe-info-target-libatomic:
 maybe-info-target-libatomic: info-target-libatomic
 
 info-target-libatomic: \
-    configure-target-libatomic
+    configure-target-libatomic 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -62322,7 +61831,7 @@ maybe-dvi-target-libatomic:
 maybe-dvi-target-libatomic: dvi-target-libatomic
 
 dvi-target-libatomic: \
-    configure-target-libatomic
+    configure-target-libatomic 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -62348,7 +61857,7 @@ maybe-pdf-target-libatomic:
 maybe-pdf-target-libatomic: pdf-target-libatomic
 
 pdf-target-libatomic: \
-    configure-target-libatomic
+    configure-target-libatomic 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -62374,7 +61883,7 @@ maybe-html-target-libatomic:
 maybe-html-target-libatomic: html-target-libatomic
 
 html-target-libatomic: \
-    configure-target-libatomic
+    configure-target-libatomic 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -62400,7 +61909,7 @@ maybe-TAGS-target-libatomic:
 maybe-TAGS-target-libatomic: TAGS-target-libatomic
 
 TAGS-target-libatomic: \
-    configure-target-libatomic
+    configure-target-libatomic 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -62427,7 +61936,7 @@ maybe-install-info-target-libatomic: install-info-target-libatomic
 
 install-info-target-libatomic: \
     configure-target-libatomic \
-    info-target-libatomic
+    info-target-libatomic 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -62454,7 +61963,7 @@ maybe-install-dvi-target-libatomic: install-dvi-target-libatomic
 
 install-dvi-target-libatomic: \
     configure-target-libatomic \
-    dvi-target-libatomic
+    dvi-target-libatomic 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -62481,7 +61990,7 @@ maybe-install-pdf-target-libatomic: install-pdf-target-libatomic
 
 install-pdf-target-libatomic: \
     configure-target-libatomic \
-    pdf-target-libatomic
+    pdf-target-libatomic 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -62508,7 +62017,7 @@ maybe-install-html-target-libatomic: install-html-target-libatomic
 
 install-html-target-libatomic: \
     configure-target-libatomic \
-    html-target-libatomic
+    html-target-libatomic 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -62534,7 +62043,7 @@ maybe-installcheck-target-libatomic:
 maybe-installcheck-target-libatomic: installcheck-target-libatomic
 
 installcheck-target-libatomic: \
-    configure-target-libatomic
+    configure-target-libatomic 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -62559,7 +62068,7 @@ maybe-mostlyclean-target-libatomic:
 @if target-libatomic
 maybe-mostlyclean-target-libatomic: mostlyclean-target-libatomic
 
-mostlyclean-target-libatomic:
+mostlyclean-target-libatomic: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -62584,7 +62093,7 @@ maybe-clean-target-libatomic:
 @if target-libatomic
 maybe-clean-target-libatomic: clean-target-libatomic
 
-clean-target-libatomic:
+clean-target-libatomic: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -62609,7 +62118,7 @@ maybe-distclean-target-libatomic:
 @if target-libatomic
 maybe-distclean-target-libatomic: distclean-target-libatomic
 
-distclean-target-libatomic:
+distclean-target-libatomic: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -62634,7 +62143,7 @@ maybe-maintainer-clean-target-libatomic:
 @if target-libatomic
 maybe-maintainer-clean-target-libatomic: maintainer-clean-target-libatomic
 
-maintainer-clean-target-libatomic:
+maintainer-clean-target-libatomic: 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -62756,7 +62265,7 @@ check-gcc-m2:
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-m2);
-check-m2: check-gcc-m2 check-target-libgm2 check-gm2tools
+check-m2: check-gcc-m2 check-target-libgm2
 
 .PHONY: check-gcc-d check-d
 check-gcc-d:
@@ -62970,7 +62479,7 @@ stage1-start::
 	  mkdir stage1-$(TARGET_SUBDIR); \
 	mv stage1-$(TARGET_SUBDIR) $(TARGET_SUBDIR)
 
-stage1-end::
+stage1-end:: 
 @if bfd
 	@if test -d $(HOST_SUBDIR)/bfd; then \
 	  cd $(HOST_SUBDIR); mv bfd stage1-bfd; \
@@ -63100,7 +62609,7 @@ stage1-end::
 # remade, but not reconfigured.  The next stage (if any) will not be
 # reconfigured either.
 .PHONY: stage1-bubble
-stage1-bubble::
+stage1-bubble:: 
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	if test -f stage1-lean ; then \
@@ -63126,7 +62635,7 @@ do-clean: clean-stage1
 distclean-stage1::
 	@: $(MAKE); $(stage)
 	@test "`cat stage_last`" != stage1 || rm -f stage_last
-	rm -rf stage1-*
+	rm -rf stage1-* 
 
 
 @endif gcc-bootstrap
@@ -63143,152 +62652,152 @@ stage2-start::
 	@cd $(HOST_SUBDIR); [ -d stage2-bfd ] || \
 	  mkdir stage2-bfd; \
 	mv stage2-bfd bfd; \
-	mv stage1-bfd prev-bfd || test -f stage1-lean
+	mv stage1-bfd prev-bfd || test -f stage1-lean 
 @endif bfd
 @if opcodes
 	@cd $(HOST_SUBDIR); [ -d stage2-opcodes ] || \
 	  mkdir stage2-opcodes; \
 	mv stage2-opcodes opcodes; \
-	mv stage1-opcodes prev-opcodes || test -f stage1-lean
+	mv stage1-opcodes prev-opcodes || test -f stage1-lean 
 @endif opcodes
 @if binutils
 	@cd $(HOST_SUBDIR); [ -d stage2-binutils ] || \
 	  mkdir stage2-binutils; \
 	mv stage2-binutils binutils; \
-	mv stage1-binutils prev-binutils || test -f stage1-lean
+	mv stage1-binutils prev-binutils || test -f stage1-lean 
 @endif binutils
 @if fixincludes
 	@cd $(HOST_SUBDIR); [ -d stage2-fixincludes ] || \
 	  mkdir stage2-fixincludes; \
 	mv stage2-fixincludes fixincludes; \
-	mv stage1-fixincludes prev-fixincludes || test -f stage1-lean
+	mv stage1-fixincludes prev-fixincludes || test -f stage1-lean 
 @endif fixincludes
 @if gas
 	@cd $(HOST_SUBDIR); [ -d stage2-gas ] || \
 	  mkdir stage2-gas; \
 	mv stage2-gas gas; \
-	mv stage1-gas prev-gas || test -f stage1-lean
+	mv stage1-gas prev-gas || test -f stage1-lean 
 @endif gas
 @if gcc
 	@cd $(HOST_SUBDIR); [ -d stage2-gcc ] || \
 	  mkdir stage2-gcc; \
 	mv stage2-gcc gcc; \
-	mv stage1-gcc prev-gcc || test -f stage1-lean
+	mv stage1-gcc prev-gcc || test -f stage1-lean 
 @endif gcc
 @if gmp
 	@cd $(HOST_SUBDIR); [ -d stage2-gmp ] || \
 	  mkdir stage2-gmp; \
 	mv stage2-gmp gmp; \
-	mv stage1-gmp prev-gmp || test -f stage1-lean
+	mv stage1-gmp prev-gmp || test -f stage1-lean 
 @endif gmp
 @if mpfr
 	@cd $(HOST_SUBDIR); [ -d stage2-mpfr ] || \
 	  mkdir stage2-mpfr; \
 	mv stage2-mpfr mpfr; \
-	mv stage1-mpfr prev-mpfr || test -f stage1-lean
+	mv stage1-mpfr prev-mpfr || test -f stage1-lean 
 @endif mpfr
 @if mpc
 	@cd $(HOST_SUBDIR); [ -d stage2-mpc ] || \
 	  mkdir stage2-mpc; \
 	mv stage2-mpc mpc; \
-	mv stage1-mpc prev-mpc || test -f stage1-lean
+	mv stage1-mpc prev-mpc || test -f stage1-lean 
 @endif mpc
 @if isl
 	@cd $(HOST_SUBDIR); [ -d stage2-isl ] || \
 	  mkdir stage2-isl; \
 	mv stage2-isl isl; \
-	mv stage1-isl prev-isl || test -f stage1-lean
+	mv stage1-isl prev-isl || test -f stage1-lean 
 @endif isl
 @if libelf
 	@cd $(HOST_SUBDIR); [ -d stage2-libelf ] || \
 	  mkdir stage2-libelf; \
 	mv stage2-libelf libelf; \
-	mv stage1-libelf prev-libelf || test -f stage1-lean
+	mv stage1-libelf prev-libelf || test -f stage1-lean 
 @endif libelf
 @if gold
 	@cd $(HOST_SUBDIR); [ -d stage2-gold ] || \
 	  mkdir stage2-gold; \
 	mv stage2-gold gold; \
-	mv stage1-gold prev-gold || test -f stage1-lean
+	mv stage1-gold prev-gold || test -f stage1-lean 
 @endif gold
 @if intl
 	@cd $(HOST_SUBDIR); [ -d stage2-intl ] || \
 	  mkdir stage2-intl; \
 	mv stage2-intl intl; \
-	mv stage1-intl prev-intl || test -f stage1-lean
+	mv stage1-intl prev-intl || test -f stage1-lean 
 @endif intl
 @if ld
 	@cd $(HOST_SUBDIR); [ -d stage2-ld ] || \
 	  mkdir stage2-ld; \
 	mv stage2-ld ld; \
-	mv stage1-ld prev-ld || test -f stage1-lean
+	mv stage1-ld prev-ld || test -f stage1-lean 
 @endif ld
 @if libbacktrace
 	@cd $(HOST_SUBDIR); [ -d stage2-libbacktrace ] || \
 	  mkdir stage2-libbacktrace; \
 	mv stage2-libbacktrace libbacktrace; \
-	mv stage1-libbacktrace prev-libbacktrace || test -f stage1-lean
+	mv stage1-libbacktrace prev-libbacktrace || test -f stage1-lean 
 @endif libbacktrace
 @if libcpp
 	@cd $(HOST_SUBDIR); [ -d stage2-libcpp ] || \
 	  mkdir stage2-libcpp; \
 	mv stage2-libcpp libcpp; \
-	mv stage1-libcpp prev-libcpp || test -f stage1-lean
+	mv stage1-libcpp prev-libcpp || test -f stage1-lean 
 @endif libcpp
 @if libcody
 	@cd $(HOST_SUBDIR); [ -d stage2-libcody ] || \
 	  mkdir stage2-libcody; \
 	mv stage2-libcody libcody; \
-	mv stage1-libcody prev-libcody || test -f stage1-lean
+	mv stage1-libcody prev-libcody || test -f stage1-lean 
 @endif libcody
 @if libdecnumber
 	@cd $(HOST_SUBDIR); [ -d stage2-libdecnumber ] || \
 	  mkdir stage2-libdecnumber; \
 	mv stage2-libdecnumber libdecnumber; \
-	mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean
+	mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean 
 @endif libdecnumber
 @if libiberty
 	@cd $(HOST_SUBDIR); [ -d stage2-libiberty ] || \
 	  mkdir stage2-libiberty; \
 	mv stage2-libiberty libiberty; \
-	mv stage1-libiberty prev-libiberty || test -f stage1-lean
+	mv stage1-libiberty prev-libiberty || test -f stage1-lean 
 @endif libiberty
 @if libiberty-linker-plugin
 	@cd $(HOST_SUBDIR); [ -d stage2-libiberty-linker-plugin ] || \
 	  mkdir stage2-libiberty-linker-plugin; \
 	mv stage2-libiberty-linker-plugin libiberty-linker-plugin; \
-	mv stage1-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage1-lean
+	mv stage1-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage1-lean 
 @endif libiberty-linker-plugin
 @if libiconv
 	@cd $(HOST_SUBDIR); [ -d stage2-libiconv ] || \
 	  mkdir stage2-libiconv; \
 	mv stage2-libiconv libiconv; \
-	mv stage1-libiconv prev-libiconv || test -f stage1-lean
+	mv stage1-libiconv prev-libiconv || test -f stage1-lean 
 @endif libiconv
 @if zlib
 	@cd $(HOST_SUBDIR); [ -d stage2-zlib ] || \
 	  mkdir stage2-zlib; \
 	mv stage2-zlib zlib; \
-	mv stage1-zlib prev-zlib || test -f stage1-lean
+	mv stage1-zlib prev-zlib || test -f stage1-lean 
 @endif zlib
 @if lto-plugin
 	@cd $(HOST_SUBDIR); [ -d stage2-lto-plugin ] || \
 	  mkdir stage2-lto-plugin; \
 	mv stage2-lto-plugin lto-plugin; \
-	mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean
+	mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean 
 @endif lto-plugin
 @if libctf
 	@cd $(HOST_SUBDIR); [ -d stage2-libctf ] || \
 	  mkdir stage2-libctf; \
 	mv stage2-libctf libctf; \
-	mv stage1-libctf prev-libctf || test -f stage1-lean
+	mv stage1-libctf prev-libctf || test -f stage1-lean 
 @endif libctf
 	@[ -d stage2-$(TARGET_SUBDIR) ] || \
 	  mkdir stage2-$(TARGET_SUBDIR); \
 	mv stage2-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
-	mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean
+	mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean 
 
-stage2-end::
+stage2-end:: 
 @if bfd
 	@if test -d $(HOST_SUBDIR)/bfd; then \
 	  cd $(HOST_SUBDIR); mv bfd stage2-bfd; \
@@ -63487,12 +62996,12 @@ bootstrap2-lean:
 
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stage1:: distclean-stage2
+distclean-stage1:: distclean-stage2 
 .PHONY: distclean-stage2
 distclean-stage2::
 	@: $(MAKE); $(stage)
 	@test "`cat stage_last`" != stage2 || rm -f stage_last
-	rm -rf stage2-*
+	rm -rf stage2-* 
 
 
 @endif gcc-bootstrap
@@ -63509,152 +63018,152 @@ stage3-start::
 	@cd $(HOST_SUBDIR); [ -d stage3-bfd ] || \
 	  mkdir stage3-bfd; \
 	mv stage3-bfd bfd; \
-	mv stage2-bfd prev-bfd || test -f stage2-lean
+	mv stage2-bfd prev-bfd || test -f stage2-lean 
 @endif bfd
 @if opcodes
 	@cd $(HOST_SUBDIR); [ -d stage3-opcodes ] || \
 	  mkdir stage3-opcodes; \
 	mv stage3-opcodes opcodes; \
-	mv stage2-opcodes prev-opcodes || test -f stage2-lean
+	mv stage2-opcodes prev-opcodes || test -f stage2-lean 
 @endif opcodes
 @if binutils
 	@cd $(HOST_SUBDIR); [ -d stage3-binutils ] || \
 	  mkdir stage3-binutils; \
 	mv stage3-binutils binutils; \
-	mv stage2-binutils prev-binutils || test -f stage2-lean
+	mv stage2-binutils prev-binutils || test -f stage2-lean 
 @endif binutils
 @if fixincludes
 	@cd $(HOST_SUBDIR); [ -d stage3-fixincludes ] || \
 	  mkdir stage3-fixincludes; \
 	mv stage3-fixincludes fixincludes; \
-	mv stage2-fixincludes prev-fixincludes || test -f stage2-lean
+	mv stage2-fixincludes prev-fixincludes || test -f stage2-lean 
 @endif fixincludes
 @if gas
 	@cd $(HOST_SUBDIR); [ -d stage3-gas ] || \
 	  mkdir stage3-gas; \
 	mv stage3-gas gas; \
-	mv stage2-gas prev-gas || test -f stage2-lean
+	mv stage2-gas prev-gas || test -f stage2-lean 
 @endif gas
 @if gcc
 	@cd $(HOST_SUBDIR); [ -d stage3-gcc ] || \
 	  mkdir stage3-gcc; \
 	mv stage3-gcc gcc; \
-	mv stage2-gcc prev-gcc || test -f stage2-lean
+	mv stage2-gcc prev-gcc || test -f stage2-lean 
 @endif gcc
 @if gmp
 	@cd $(HOST_SUBDIR); [ -d stage3-gmp ] || \
 	  mkdir stage3-gmp; \
 	mv stage3-gmp gmp; \
-	mv stage2-gmp prev-gmp || test -f stage2-lean
+	mv stage2-gmp prev-gmp || test -f stage2-lean 
 @endif gmp
 @if mpfr
 	@cd $(HOST_SUBDIR); [ -d stage3-mpfr ] || \
 	  mkdir stage3-mpfr; \
 	mv stage3-mpfr mpfr; \
-	mv stage2-mpfr prev-mpfr || test -f stage2-lean
+	mv stage2-mpfr prev-mpfr || test -f stage2-lean 
 @endif mpfr
 @if mpc
 	@cd $(HOST_SUBDIR); [ -d stage3-mpc ] || \
 	  mkdir stage3-mpc; \
 	mv stage3-mpc mpc; \
-	mv stage2-mpc prev-mpc || test -f stage2-lean
+	mv stage2-mpc prev-mpc || test -f stage2-lean 
 @endif mpc
 @if isl
 	@cd $(HOST_SUBDIR); [ -d stage3-isl ] || \
 	  mkdir stage3-isl; \
 	mv stage3-isl isl; \
-	mv stage2-isl prev-isl || test -f stage2-lean
+	mv stage2-isl prev-isl || test -f stage2-lean 
 @endif isl
 @if libelf
 	@cd $(HOST_SUBDIR); [ -d stage3-libelf ] || \
 	  mkdir stage3-libelf; \
 	mv stage3-libelf libelf; \
-	mv stage2-libelf prev-libelf || test -f stage2-lean
+	mv stage2-libelf prev-libelf || test -f stage2-lean 
 @endif libelf
 @if gold
 	@cd $(HOST_SUBDIR); [ -d stage3-gold ] || \
 	  mkdir stage3-gold; \
 	mv stage3-gold gold; \
-	mv stage2-gold prev-gold || test -f stage2-lean
+	mv stage2-gold prev-gold || test -f stage2-lean 
 @endif gold
 @if intl
 	@cd $(HOST_SUBDIR); [ -d stage3-intl ] || \
 	  mkdir stage3-intl; \
 	mv stage3-intl intl; \
-	mv stage2-intl prev-intl || test -f stage2-lean
+	mv stage2-intl prev-intl || test -f stage2-lean 
 @endif intl
 @if ld
 	@cd $(HOST_SUBDIR); [ -d stage3-ld ] || \
 	  mkdir stage3-ld; \
 	mv stage3-ld ld; \
-	mv stage2-ld prev-ld || test -f stage2-lean
+	mv stage2-ld prev-ld || test -f stage2-lean 
 @endif ld
 @if libbacktrace
 	@cd $(HOST_SUBDIR); [ -d stage3-libbacktrace ] || \
 	  mkdir stage3-libbacktrace; \
 	mv stage3-libbacktrace libbacktrace; \
-	mv stage2-libbacktrace prev-libbacktrace || test -f stage2-lean
+	mv stage2-libbacktrace prev-libbacktrace || test -f stage2-lean 
 @endif libbacktrace
 @if libcpp
 	@cd $(HOST_SUBDIR); [ -d stage3-libcpp ] || \
 	  mkdir stage3-libcpp; \
 	mv stage3-libcpp libcpp; \
-	mv stage2-libcpp prev-libcpp || test -f stage2-lean
+	mv stage2-libcpp prev-libcpp || test -f stage2-lean 
 @endif libcpp
 @if libcody
 	@cd $(HOST_SUBDIR); [ -d stage3-libcody ] || \
 	  mkdir stage3-libcody; \
 	mv stage3-libcody libcody; \
-	mv stage2-libcody prev-libcody || test -f stage2-lean
+	mv stage2-libcody prev-libcody || test -f stage2-lean 
 @endif libcody
 @if libdecnumber
 	@cd $(HOST_SUBDIR); [ -d stage3-libdecnumber ] || \
 	  mkdir stage3-libdecnumber; \
 	mv stage3-libdecnumber libdecnumber; \
-	mv stage2-libdecnumber prev-libdecnumber || test -f stage2-lean
+	mv stage2-libdecnumber prev-libdecnumber || test -f stage2-lean 
 @endif libdecnumber
 @if libiberty
 	@cd $(HOST_SUBDIR); [ -d stage3-libiberty ] || \
 	  mkdir stage3-libiberty; \
 	mv stage3-libiberty libiberty; \
-	mv stage2-libiberty prev-libiberty || test -f stage2-lean
+	mv stage2-libiberty prev-libiberty || test -f stage2-lean 
 @endif libiberty
 @if libiberty-linker-plugin
 	@cd $(HOST_SUBDIR); [ -d stage3-libiberty-linker-plugin ] || \
 	  mkdir stage3-libiberty-linker-plugin; \
 	mv stage3-libiberty-linker-plugin libiberty-linker-plugin; \
-	mv stage2-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage2-lean
+	mv stage2-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage2-lean 
 @endif libiberty-linker-plugin
 @if libiconv
 	@cd $(HOST_SUBDIR); [ -d stage3-libiconv ] || \
 	  mkdir stage3-libiconv; \
 	mv stage3-libiconv libiconv; \
-	mv stage2-libiconv prev-libiconv || test -f stage2-lean
+	mv stage2-libiconv prev-libiconv || test -f stage2-lean 
 @endif libiconv
 @if zlib
 	@cd $(HOST_SUBDIR); [ -d stage3-zlib ] || \
 	  mkdir stage3-zlib; \
 	mv stage3-zlib zlib; \
-	mv stage2-zlib prev-zlib || test -f stage2-lean
+	mv stage2-zlib prev-zlib || test -f stage2-lean 
 @endif zlib
 @if lto-plugin
 	@cd $(HOST_SUBDIR); [ -d stage3-lto-plugin ] || \
 	  mkdir stage3-lto-plugin; \
 	mv stage3-lto-plugin lto-plugin; \
-	mv stage2-lto-plugin prev-lto-plugin || test -f stage2-lean
+	mv stage2-lto-plugin prev-lto-plugin || test -f stage2-lean 
 @endif lto-plugin
 @if libctf
 	@cd $(HOST_SUBDIR); [ -d stage3-libctf ] || \
 	  mkdir stage3-libctf; \
 	mv stage3-libctf libctf; \
-	mv stage2-libctf prev-libctf || test -f stage2-lean
+	mv stage2-libctf prev-libctf || test -f stage2-lean 
 @endif libctf
 	@[ -d stage3-$(TARGET_SUBDIR) ] || \
 	  mkdir stage3-$(TARGET_SUBDIR); \
 	mv stage3-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
-	mv stage2-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage2-lean
+	mv stage2-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage2-lean 
 
-stage3-end::
+stage3-end:: 
 @if bfd
 	@if test -d $(HOST_SUBDIR)/bfd; then \
 	  cd $(HOST_SUBDIR); mv bfd stage3-bfd; \
@@ -63897,12 +63406,12 @@ bootstrap-lean:
 
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stage2:: distclean-stage3
+distclean-stage2:: distclean-stage3 
 .PHONY: distclean-stage3
 distclean-stage3::
 	@: $(MAKE); $(stage)
 	@test "`cat stage_last`" != stage3 || rm -f stage_last
-	rm -rf stage3-* compare
+	rm -rf stage3-* compare 
 
 
 .PHONY: cleanstrap
@@ -63931,152 +63440,152 @@ stage4-start::
 	@cd $(HOST_SUBDIR); [ -d stage4-bfd ] || \
 	  mkdir stage4-bfd; \
 	mv stage4-bfd bfd; \
-	mv stage3-bfd prev-bfd || test -f stage3-lean
+	mv stage3-bfd prev-bfd || test -f stage3-lean 
 @endif bfd
 @if opcodes
 	@cd $(HOST_SUBDIR); [ -d stage4-opcodes ] || \
 	  mkdir stage4-opcodes; \
 	mv stage4-opcodes opcodes; \
-	mv stage3-opcodes prev-opcodes || test -f stage3-lean
+	mv stage3-opcodes prev-opcodes || test -f stage3-lean 
 @endif opcodes
 @if binutils
 	@cd $(HOST_SUBDIR); [ -d stage4-binutils ] || \
 	  mkdir stage4-binutils; \
 	mv stage4-binutils binutils; \
-	mv stage3-binutils prev-binutils || test -f stage3-lean
+	mv stage3-binutils prev-binutils || test -f stage3-lean 
 @endif binutils
 @if fixincludes
 	@cd $(HOST_SUBDIR); [ -d stage4-fixincludes ] || \
 	  mkdir stage4-fixincludes; \
 	mv stage4-fixincludes fixincludes; \
-	mv stage3-fixincludes prev-fixincludes || test -f stage3-lean
+	mv stage3-fixincludes prev-fixincludes || test -f stage3-lean 
 @endif fixincludes
 @if gas
 	@cd $(HOST_SUBDIR); [ -d stage4-gas ] || \
 	  mkdir stage4-gas; \
 	mv stage4-gas gas; \
-	mv stage3-gas prev-gas || test -f stage3-lean
+	mv stage3-gas prev-gas || test -f stage3-lean 
 @endif gas
 @if gcc
 	@cd $(HOST_SUBDIR); [ -d stage4-gcc ] || \
 	  mkdir stage4-gcc; \
 	mv stage4-gcc gcc; \
-	mv stage3-gcc prev-gcc || test -f stage3-lean
+	mv stage3-gcc prev-gcc || test -f stage3-lean 
 @endif gcc
 @if gmp
 	@cd $(HOST_SUBDIR); [ -d stage4-gmp ] || \
 	  mkdir stage4-gmp; \
 	mv stage4-gmp gmp; \
-	mv stage3-gmp prev-gmp || test -f stage3-lean
+	mv stage3-gmp prev-gmp || test -f stage3-lean 
 @endif gmp
 @if mpfr
 	@cd $(HOST_SUBDIR); [ -d stage4-mpfr ] || \
 	  mkdir stage4-mpfr; \
 	mv stage4-mpfr mpfr; \
-	mv stage3-mpfr prev-mpfr || test -f stage3-lean
+	mv stage3-mpfr prev-mpfr || test -f stage3-lean 
 @endif mpfr
 @if mpc
 	@cd $(HOST_SUBDIR); [ -d stage4-mpc ] || \
 	  mkdir stage4-mpc; \
 	mv stage4-mpc mpc; \
-	mv stage3-mpc prev-mpc || test -f stage3-lean
+	mv stage3-mpc prev-mpc || test -f stage3-lean 
 @endif mpc
 @if isl
 	@cd $(HOST_SUBDIR); [ -d stage4-isl ] || \
 	  mkdir stage4-isl; \
 	mv stage4-isl isl; \
-	mv stage3-isl prev-isl || test -f stage3-lean
+	mv stage3-isl prev-isl || test -f stage3-lean 
 @endif isl
 @if libelf
 	@cd $(HOST_SUBDIR); [ -d stage4-libelf ] || \
 	  mkdir stage4-libelf; \
 	mv stage4-libelf libelf; \
-	mv stage3-libelf prev-libelf || test -f stage3-lean
+	mv stage3-libelf prev-libelf || test -f stage3-lean 
 @endif libelf
 @if gold
 	@cd $(HOST_SUBDIR); [ -d stage4-gold ] || \
 	  mkdir stage4-gold; \
 	mv stage4-gold gold; \
-	mv stage3-gold prev-gold || test -f stage3-lean
+	mv stage3-gold prev-gold || test -f stage3-lean 
 @endif gold
 @if intl
 	@cd $(HOST_SUBDIR); [ -d stage4-intl ] || \
 	  mkdir stage4-intl; \
 	mv stage4-intl intl; \
-	mv stage3-intl prev-intl || test -f stage3-lean
+	mv stage3-intl prev-intl || test -f stage3-lean 
 @endif intl
 @if ld
 	@cd $(HOST_SUBDIR); [ -d stage4-ld ] || \
 	  mkdir stage4-ld; \
 	mv stage4-ld ld; \
-	mv stage3-ld prev-ld || test -f stage3-lean
+	mv stage3-ld prev-ld || test -f stage3-lean 
 @endif ld
 @if libbacktrace
 	@cd $(HOST_SUBDIR); [ -d stage4-libbacktrace ] || \
 	  mkdir stage4-libbacktrace; \
 	mv stage4-libbacktrace libbacktrace; \
-	mv stage3-libbacktrace prev-libbacktrace || test -f stage3-lean
+	mv stage3-libbacktrace prev-libbacktrace || test -f stage3-lean 
 @endif libbacktrace
 @if libcpp
 	@cd $(HOST_SUBDIR); [ -d stage4-libcpp ] || \
 	  mkdir stage4-libcpp; \
 	mv stage4-libcpp libcpp; \
-	mv stage3-libcpp prev-libcpp || test -f stage3-lean
+	mv stage3-libcpp prev-libcpp || test -f stage3-lean 
 @endif libcpp
 @if libcody
 	@cd $(HOST_SUBDIR); [ -d stage4-libcody ] || \
 	  mkdir stage4-libcody; \
 	mv stage4-libcody libcody; \
-	mv stage3-libcody prev-libcody || test -f stage3-lean
+	mv stage3-libcody prev-libcody || test -f stage3-lean 
 @endif libcody
 @if libdecnumber
 	@cd $(HOST_SUBDIR); [ -d stage4-libdecnumber ] || \
 	  mkdir stage4-libdecnumber; \
 	mv stage4-libdecnumber libdecnumber; \
-	mv stage3-libdecnumber prev-libdecnumber || test -f stage3-lean
+	mv stage3-libdecnumber prev-libdecnumber || test -f stage3-lean 
 @endif libdecnumber
 @if libiberty
 	@cd $(HOST_SUBDIR); [ -d stage4-libiberty ] || \
 	  mkdir stage4-libiberty; \
 	mv stage4-libiberty libiberty; \
-	mv stage3-libiberty prev-libiberty || test -f stage3-lean
+	mv stage3-libiberty prev-libiberty || test -f stage3-lean 
 @endif libiberty
 @if libiberty-linker-plugin
 	@cd $(HOST_SUBDIR); [ -d stage4-libiberty-linker-plugin ] || \
 	  mkdir stage4-libiberty-linker-plugin; \
 	mv stage4-libiberty-linker-plugin libiberty-linker-plugin; \
-	mv stage3-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage3-lean
+	mv stage3-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage3-lean 
 @endif libiberty-linker-plugin
 @if libiconv
 	@cd $(HOST_SUBDIR); [ -d stage4-libiconv ] || \
 	  mkdir stage4-libiconv; \
 	mv stage4-libiconv libiconv; \
-	mv stage3-libiconv prev-libiconv || test -f stage3-lean
+	mv stage3-libiconv prev-libiconv || test -f stage3-lean 
 @endif libiconv
 @if zlib
 	@cd $(HOST_SUBDIR); [ -d stage4-zlib ] || \
 	  mkdir stage4-zlib; \
 	mv stage4-zlib zlib; \
-	mv stage3-zlib prev-zlib || test -f stage3-lean
+	mv stage3-zlib prev-zlib || test -f stage3-lean 
 @endif zlib
 @if lto-plugin
 	@cd $(HOST_SUBDIR); [ -d stage4-lto-plugin ] || \
 	  mkdir stage4-lto-plugin; \
 	mv stage4-lto-plugin lto-plugin; \
-	mv stage3-lto-plugin prev-lto-plugin || test -f stage3-lean
+	mv stage3-lto-plugin prev-lto-plugin || test -f stage3-lean 
 @endif lto-plugin
 @if libctf
 	@cd $(HOST_SUBDIR); [ -d stage4-libctf ] || \
 	  mkdir stage4-libctf; \
 	mv stage4-libctf libctf; \
-	mv stage3-libctf prev-libctf || test -f stage3-lean
+	mv stage3-libctf prev-libctf || test -f stage3-lean 
 @endif libctf
 	@[ -d stage4-$(TARGET_SUBDIR) ] || \
 	  mkdir stage4-$(TARGET_SUBDIR); \
 	mv stage4-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
-	mv stage3-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage3-lean
+	mv stage3-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage3-lean 
 
-stage4-end::
+stage4-end:: 
 @if bfd
 	@if test -d $(HOST_SUBDIR)/bfd; then \
 	  cd $(HOST_SUBDIR); mv bfd stage4-bfd; \
@@ -64319,12 +63828,12 @@ bootstrap4-lean:
 
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stage3:: distclean-stage4
+distclean-stage3:: distclean-stage4 
 .PHONY: distclean-stage4
 distclean-stage4::
 	@: $(MAKE); $(stage)
 	@test "`cat stage_last`" != stage4 || rm -f stage_last
-	rm -rf stage4-* compare3
+	rm -rf stage4-* compare3 
 
 
 @endif gcc-bootstrap
@@ -64341,152 +63850,152 @@ stageprofile-start::
 	@cd $(HOST_SUBDIR); [ -d stageprofile-bfd ] || \
 	  mkdir stageprofile-bfd; \
 	mv stageprofile-bfd bfd; \
-	mv stage1-bfd prev-bfd || test -f stage1-lean
+	mv stage1-bfd prev-bfd || test -f stage1-lean 
 @endif bfd
 @if opcodes
 	@cd $(HOST_SUBDIR); [ -d stageprofile-opcodes ] || \
 	  mkdir stageprofile-opcodes; \
 	mv stageprofile-opcodes opcodes; \
-	mv stage1-opcodes prev-opcodes || test -f stage1-lean
+	mv stage1-opcodes prev-opcodes || test -f stage1-lean 
 @endif opcodes
 @if binutils
 	@cd $(HOST_SUBDIR); [ -d stageprofile-binutils ] || \
 	  mkdir stageprofile-binutils; \
 	mv stageprofile-binutils binutils; \
-	mv stage1-binutils prev-binutils || test -f stage1-lean
+	mv stage1-binutils prev-binutils || test -f stage1-lean 
 @endif binutils
 @if fixincludes
 	@cd $(HOST_SUBDIR); [ -d stageprofile-fixincludes ] || \
 	  mkdir stageprofile-fixincludes; \
 	mv stageprofile-fixincludes fixincludes; \
-	mv stage1-fixincludes prev-fixincludes || test -f stage1-lean
+	mv stage1-fixincludes prev-fixincludes || test -f stage1-lean 
 @endif fixincludes
 @if gas
 	@cd $(HOST_SUBDIR); [ -d stageprofile-gas ] || \
 	  mkdir stageprofile-gas; \
 	mv stageprofile-gas gas; \
-	mv stage1-gas prev-gas || test -f stage1-lean
+	mv stage1-gas prev-gas || test -f stage1-lean 
 @endif gas
 @if gcc
 	@cd $(HOST_SUBDIR); [ -d stageprofile-gcc ] || \
 	  mkdir stageprofile-gcc; \
 	mv stageprofile-gcc gcc; \
-	mv stage1-gcc prev-gcc || test -f stage1-lean
+	mv stage1-gcc prev-gcc || test -f stage1-lean 
 @endif gcc
 @if gmp
 	@cd $(HOST_SUBDIR); [ -d stageprofile-gmp ] || \
 	  mkdir stageprofile-gmp; \
 	mv stageprofile-gmp gmp; \
-	mv stage1-gmp prev-gmp || test -f stage1-lean
+	mv stage1-gmp prev-gmp || test -f stage1-lean 
 @endif gmp
 @if mpfr
 	@cd $(HOST_SUBDIR); [ -d stageprofile-mpfr ] || \
 	  mkdir stageprofile-mpfr; \
 	mv stageprofile-mpfr mpfr; \
-	mv stage1-mpfr prev-mpfr || test -f stage1-lean
+	mv stage1-mpfr prev-mpfr || test -f stage1-lean 
 @endif mpfr
 @if mpc
 	@cd $(HOST_SUBDIR); [ -d stageprofile-mpc ] || \
 	  mkdir stageprofile-mpc; \
 	mv stageprofile-mpc mpc; \
-	mv stage1-mpc prev-mpc || test -f stage1-lean
+	mv stage1-mpc prev-mpc || test -f stage1-lean 
 @endif mpc
 @if isl
 	@cd $(HOST_SUBDIR); [ -d stageprofile-isl ] || \
 	  mkdir stageprofile-isl; \
 	mv stageprofile-isl isl; \
-	mv stage1-isl prev-isl || test -f stage1-lean
+	mv stage1-isl prev-isl || test -f stage1-lean 
 @endif isl
 @if libelf
 	@cd $(HOST_SUBDIR); [ -d stageprofile-libelf ] || \
 	  mkdir stageprofile-libelf; \
 	mv stageprofile-libelf libelf; \
-	mv stage1-libelf prev-libelf || test -f stage1-lean
+	mv stage1-libelf prev-libelf || test -f stage1-lean 
 @endif libelf
 @if gold
 	@cd $(HOST_SUBDIR); [ -d stageprofile-gold ] || \
 	  mkdir stageprofile-gold; \
 	mv stageprofile-gold gold; \
-	mv stage1-gold prev-gold || test -f stage1-lean
+	mv stage1-gold prev-gold || test -f stage1-lean 
 @endif gold
 @if intl
 	@cd $(HOST_SUBDIR); [ -d stageprofile-intl ] || \
 	  mkdir stageprofile-intl; \
 	mv stageprofile-intl intl; \
-	mv stage1-intl prev-intl || test -f stage1-lean
+	mv stage1-intl prev-intl || test -f stage1-lean 
 @endif intl
 @if ld
 	@cd $(HOST_SUBDIR); [ -d stageprofile-ld ] || \
 	  mkdir stageprofile-ld; \
 	mv stageprofile-ld ld; \
-	mv stage1-ld prev-ld || test -f stage1-lean
+	mv stage1-ld prev-ld || test -f stage1-lean 
 @endif ld
 @if libbacktrace
 	@cd $(HOST_SUBDIR); [ -d stageprofile-libbacktrace ] || \
 	  mkdir stageprofile-libbacktrace; \
 	mv stageprofile-libbacktrace libbacktrace; \
-	mv stage1-libbacktrace prev-libbacktrace || test -f stage1-lean
+	mv stage1-libbacktrace prev-libbacktrace || test -f stage1-lean 
 @endif libbacktrace
 @if libcpp
 	@cd $(HOST_SUBDIR); [ -d stageprofile-libcpp ] || \
 	  mkdir stageprofile-libcpp; \
 	mv stageprofile-libcpp libcpp; \
-	mv stage1-libcpp prev-libcpp || test -f stage1-lean
+	mv stage1-libcpp prev-libcpp || test -f stage1-lean 
 @endif libcpp
 @if libcody
 	@cd $(HOST_SUBDIR); [ -d stageprofile-libcody ] || \
 	  mkdir stageprofile-libcody; \
 	mv stageprofile-libcody libcody; \
-	mv stage1-libcody prev-libcody || test -f stage1-lean
+	mv stage1-libcody prev-libcody || test -f stage1-lean 
 @endif libcody
 @if libdecnumber
 	@cd $(HOST_SUBDIR); [ -d stageprofile-libdecnumber ] || \
 	  mkdir stageprofile-libdecnumber; \
 	mv stageprofile-libdecnumber libdecnumber; \
-	mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean
+	mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean 
 @endif libdecnumber
 @if libiberty
 	@cd $(HOST_SUBDIR); [ -d stageprofile-libiberty ] || \
 	  mkdir stageprofile-libiberty; \
 	mv stageprofile-libiberty libiberty; \
-	mv stage1-libiberty prev-libiberty || test -f stage1-lean
+	mv stage1-libiberty prev-libiberty || test -f stage1-lean 
 @endif libiberty
 @if libiberty-linker-plugin
 	@cd $(HOST_SUBDIR); [ -d stageprofile-libiberty-linker-plugin ] || \
 	  mkdir stageprofile-libiberty-linker-plugin; \
 	mv stageprofile-libiberty-linker-plugin libiberty-linker-plugin; \
-	mv stage1-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage1-lean
+	mv stage1-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage1-lean 
 @endif libiberty-linker-plugin
 @if libiconv
 	@cd $(HOST_SUBDIR); [ -d stageprofile-libiconv ] || \
 	  mkdir stageprofile-libiconv; \
 	mv stageprofile-libiconv libiconv; \
-	mv stage1-libiconv prev-libiconv || test -f stage1-lean
+	mv stage1-libiconv prev-libiconv || test -f stage1-lean 
 @endif libiconv
 @if zlib
 	@cd $(HOST_SUBDIR); [ -d stageprofile-zlib ] || \
 	  mkdir stageprofile-zlib; \
 	mv stageprofile-zlib zlib; \
-	mv stage1-zlib prev-zlib || test -f stage1-lean
+	mv stage1-zlib prev-zlib || test -f stage1-lean 
 @endif zlib
 @if lto-plugin
 	@cd $(HOST_SUBDIR); [ -d stageprofile-lto-plugin ] || \
 	  mkdir stageprofile-lto-plugin; \
 	mv stageprofile-lto-plugin lto-plugin; \
-	mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean
+	mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean 
 @endif lto-plugin
 @if libctf
 	@cd $(HOST_SUBDIR); [ -d stageprofile-libctf ] || \
 	  mkdir stageprofile-libctf; \
 	mv stageprofile-libctf libctf; \
-	mv stage1-libctf prev-libctf || test -f stage1-lean
+	mv stage1-libctf prev-libctf || test -f stage1-lean 
 @endif libctf
 	@[ -d stageprofile-$(TARGET_SUBDIR) ] || \
 	  mkdir stageprofile-$(TARGET_SUBDIR); \
 	mv stageprofile-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
-	mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean
+	mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean 
 
-stageprofile-end::
+stageprofile-end:: 
 @if bfd
 	@if test -d $(HOST_SUBDIR)/bfd; then \
 	  cd $(HOST_SUBDIR); mv bfd stageprofile-bfd; \
@@ -64662,12 +64171,12 @@ do-clean: clean-stageprofile
 
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stage1:: distclean-stageprofile
+distclean-stage1:: distclean-stageprofile 
 .PHONY: distclean-stageprofile
 distclean-stageprofile::
 	@: $(MAKE); $(stage)
 	@test "`cat stage_last`" != stageprofile || rm -f stage_last
-	rm -rf stageprofile-*
+	rm -rf stageprofile-* 
 
 
 @endif gcc-bootstrap
@@ -64684,152 +64193,152 @@ stagetrain-start::
 	@cd $(HOST_SUBDIR); [ -d stagetrain-bfd ] || \
 	  mkdir stagetrain-bfd; \
 	mv stagetrain-bfd bfd; \
-	mv stageprofile-bfd prev-bfd || test -f stageprofile-lean
+	mv stageprofile-bfd prev-bfd || test -f stageprofile-lean 
 @endif bfd
 @if opcodes
 	@cd $(HOST_SUBDIR); [ -d stagetrain-opcodes ] || \
 	  mkdir stagetrain-opcodes; \
 	mv stagetrain-opcodes opcodes; \
-	mv stageprofile-opcodes prev-opcodes || test -f stageprofile-lean
+	mv stageprofile-opcodes prev-opcodes || test -f stageprofile-lean 
 @endif opcodes
 @if binutils
 	@cd $(HOST_SUBDIR); [ -d stagetrain-binutils ] || \
 	  mkdir stagetrain-binutils; \
 	mv stagetrain-binutils binutils; \
-	mv stageprofile-binutils prev-binutils || test -f stageprofile-lean
+	mv stageprofile-binutils prev-binutils || test -f stageprofile-lean 
 @endif binutils
 @if fixincludes
 	@cd $(HOST_SUBDIR); [ -d stagetrain-fixincludes ] || \
 	  mkdir stagetrain-fixincludes; \
 	mv stagetrain-fixincludes fixincludes; \
-	mv stageprofile-fixincludes prev-fixincludes || test -f stageprofile-lean
+	mv stageprofile-fixincludes prev-fixincludes || test -f stageprofile-lean 
 @endif fixincludes
 @if gas
 	@cd $(HOST_SUBDIR); [ -d stagetrain-gas ] || \
 	  mkdir stagetrain-gas; \
 	mv stagetrain-gas gas; \
-	mv stageprofile-gas prev-gas || test -f stageprofile-lean
+	mv stageprofile-gas prev-gas || test -f stageprofile-lean 
 @endif gas
 @if gcc
 	@cd $(HOST_SUBDIR); [ -d stagetrain-gcc ] || \
 	  mkdir stagetrain-gcc; \
 	mv stagetrain-gcc gcc; \
-	mv stageprofile-gcc prev-gcc || test -f stageprofile-lean
+	mv stageprofile-gcc prev-gcc || test -f stageprofile-lean 
 @endif gcc
 @if gmp
 	@cd $(HOST_SUBDIR); [ -d stagetrain-gmp ] || \
 	  mkdir stagetrain-gmp; \
 	mv stagetrain-gmp gmp; \
-	mv stageprofile-gmp prev-gmp || test -f stageprofile-lean
+	mv stageprofile-gmp prev-gmp || test -f stageprofile-lean 
 @endif gmp
 @if mpfr
 	@cd $(HOST_SUBDIR); [ -d stagetrain-mpfr ] || \
 	  mkdir stagetrain-mpfr; \
 	mv stagetrain-mpfr mpfr; \
-	mv stageprofile-mpfr prev-mpfr || test -f stageprofile-lean
+	mv stageprofile-mpfr prev-mpfr || test -f stageprofile-lean 
 @endif mpfr
 @if mpc
 	@cd $(HOST_SUBDIR); [ -d stagetrain-mpc ] || \
 	  mkdir stagetrain-mpc; \
 	mv stagetrain-mpc mpc; \
-	mv stageprofile-mpc prev-mpc || test -f stageprofile-lean
+	mv stageprofile-mpc prev-mpc || test -f stageprofile-lean 
 @endif mpc
 @if isl
 	@cd $(HOST_SUBDIR); [ -d stagetrain-isl ] || \
 	  mkdir stagetrain-isl; \
 	mv stagetrain-isl isl; \
-	mv stageprofile-isl prev-isl || test -f stageprofile-lean
+	mv stageprofile-isl prev-isl || test -f stageprofile-lean 
 @endif isl
 @if libelf
 	@cd $(HOST_SUBDIR); [ -d stagetrain-libelf ] || \
 	  mkdir stagetrain-libelf; \
 	mv stagetrain-libelf libelf; \
-	mv stageprofile-libelf prev-libelf || test -f stageprofile-lean
+	mv stageprofile-libelf prev-libelf || test -f stageprofile-lean 
 @endif libelf
 @if gold
 	@cd $(HOST_SUBDIR); [ -d stagetrain-gold ] || \
 	  mkdir stagetrain-gold; \
 	mv stagetrain-gold gold; \
-	mv stageprofile-gold prev-gold || test -f stageprofile-lean
+	mv stageprofile-gold prev-gold || test -f stageprofile-lean 
 @endif gold
 @if intl
 	@cd $(HOST_SUBDIR); [ -d stagetrain-intl ] || \
 	  mkdir stagetrain-intl; \
 	mv stagetrain-intl intl; \
-	mv stageprofile-intl prev-intl || test -f stageprofile-lean
+	mv stageprofile-intl prev-intl || test -f stageprofile-lean 
 @endif intl
 @if ld
 	@cd $(HOST_SUBDIR); [ -d stagetrain-ld ] || \
 	  mkdir stagetrain-ld; \
 	mv stagetrain-ld ld; \
-	mv stageprofile-ld prev-ld || test -f stageprofile-lean
+	mv stageprofile-ld prev-ld || test -f stageprofile-lean 
 @endif ld
 @if libbacktrace
 	@cd $(HOST_SUBDIR); [ -d stagetrain-libbacktrace ] || \
 	  mkdir stagetrain-libbacktrace; \
 	mv stagetrain-libbacktrace libbacktrace; \
-	mv stageprofile-libbacktrace prev-libbacktrace || test -f stageprofile-lean
+	mv stageprofile-libbacktrace prev-libbacktrace || test -f stageprofile-lean 
 @endif libbacktrace
 @if libcpp
 	@cd $(HOST_SUBDIR); [ -d stagetrain-libcpp ] || \
 	  mkdir stagetrain-libcpp; \
 	mv stagetrain-libcpp libcpp; \
-	mv stageprofile-libcpp prev-libcpp || test -f stageprofile-lean
+	mv stageprofile-libcpp prev-libcpp || test -f stageprofile-lean 
 @endif libcpp
 @if libcody
 	@cd $(HOST_SUBDIR); [ -d stagetrain-libcody ] || \
 	  mkdir stagetrain-libcody; \
 	mv stagetrain-libcody libcody; \
-	mv stageprofile-libcody prev-libcody || test -f stageprofile-lean
+	mv stageprofile-libcody prev-libcody || test -f stageprofile-lean 
 @endif libcody
 @if libdecnumber
 	@cd $(HOST_SUBDIR); [ -d stagetrain-libdecnumber ] || \
 	  mkdir stagetrain-libdecnumber; \
 	mv stagetrain-libdecnumber libdecnumber; \
-	mv stageprofile-libdecnumber prev-libdecnumber || test -f stageprofile-lean
+	mv stageprofile-libdecnumber prev-libdecnumber || test -f stageprofile-lean 
 @endif libdecnumber
 @if libiberty
 	@cd $(HOST_SUBDIR); [ -d stagetrain-libiberty ] || \
 	  mkdir stagetrain-libiberty; \
 	mv stagetrain-libiberty libiberty; \
-	mv stageprofile-libiberty prev-libiberty || test -f stageprofile-lean
+	mv stageprofile-libiberty prev-libiberty || test -f stageprofile-lean 
 @endif libiberty
 @if libiberty-linker-plugin
 	@cd $(HOST_SUBDIR); [ -d stagetrain-libiberty-linker-plugin ] || \
 	  mkdir stagetrain-libiberty-linker-plugin; \
 	mv stagetrain-libiberty-linker-plugin libiberty-linker-plugin; \
-	mv stageprofile-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stageprofile-lean
+	mv stageprofile-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stageprofile-lean 
 @endif libiberty-linker-plugin
 @if libiconv
 	@cd $(HOST_SUBDIR); [ -d stagetrain-libiconv ] || \
 	  mkdir stagetrain-libiconv; \
 	mv stagetrain-libiconv libiconv; \
-	mv stageprofile-libiconv prev-libiconv || test -f stageprofile-lean
+	mv stageprofile-libiconv prev-libiconv || test -f stageprofile-lean 
 @endif libiconv
 @if zlib
 	@cd $(HOST_SUBDIR); [ -d stagetrain-zlib ] || \
 	  mkdir stagetrain-zlib; \
 	mv stagetrain-zlib zlib; \
-	mv stageprofile-zlib prev-zlib || test -f stageprofile-lean
+	mv stageprofile-zlib prev-zlib || test -f stageprofile-lean 
 @endif zlib
 @if lto-plugin
 	@cd $(HOST_SUBDIR); [ -d stagetrain-lto-plugin ] || \
 	  mkdir stagetrain-lto-plugin; \
 	mv stagetrain-lto-plugin lto-plugin; \
-	mv stageprofile-lto-plugin prev-lto-plugin || test -f stageprofile-lean
+	mv stageprofile-lto-plugin prev-lto-plugin || test -f stageprofile-lean 
 @endif lto-plugin
 @if libctf
 	@cd $(HOST_SUBDIR); [ -d stagetrain-libctf ] || \
 	  mkdir stagetrain-libctf; \
 	mv stagetrain-libctf libctf; \
-	mv stageprofile-libctf prev-libctf || test -f stageprofile-lean
+	mv stageprofile-libctf prev-libctf || test -f stageprofile-lean 
 @endif libctf
 	@[ -d stagetrain-$(TARGET_SUBDIR) ] || \
 	  mkdir stagetrain-$(TARGET_SUBDIR); \
 	mv stagetrain-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
-	mv stageprofile-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stageprofile-lean
+	mv stageprofile-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stageprofile-lean 
 
-stagetrain-end::
+stagetrain-end:: 
 @if bfd
 	@if test -d $(HOST_SUBDIR)/bfd; then \
 	  cd $(HOST_SUBDIR); mv bfd stagetrain-bfd; \
@@ -65005,12 +64514,12 @@ do-clean: clean-stagetrain
 
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stageprofile:: distclean-stagetrain
+distclean-stageprofile:: distclean-stagetrain 
 .PHONY: distclean-stagetrain
 distclean-stagetrain::
 	@: $(MAKE); $(stage)
 	@test "`cat stage_last`" != stagetrain || rm -f stage_last
-	rm -rf stagetrain-*
+	rm -rf stagetrain-* 
 
 
 @endif gcc-bootstrap
@@ -65027,152 +64536,152 @@ stagefeedback-start::
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-bfd ] || \
 	  mkdir stagefeedback-bfd; \
 	mv stagefeedback-bfd bfd; \
-	mv stagetrain-bfd prev-bfd || test -f stagetrain-lean
+	mv stagetrain-bfd prev-bfd || test -f stagetrain-lean 
 @endif bfd
 @if opcodes
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-opcodes ] || \
 	  mkdir stagefeedback-opcodes; \
 	mv stagefeedback-opcodes opcodes; \
-	mv stagetrain-opcodes prev-opcodes || test -f stagetrain-lean
+	mv stagetrain-opcodes prev-opcodes || test -f stagetrain-lean 
 @endif opcodes
 @if binutils
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-binutils ] || \
 	  mkdir stagefeedback-binutils; \
 	mv stagefeedback-binutils binutils; \
-	mv stagetrain-binutils prev-binutils || test -f stagetrain-lean
+	mv stagetrain-binutils prev-binutils || test -f stagetrain-lean 
 @endif binutils
 @if fixincludes
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-fixincludes ] || \
 	  mkdir stagefeedback-fixincludes; \
 	mv stagefeedback-fixincludes fixincludes; \
-	mv stagetrain-fixincludes prev-fixincludes || test -f stagetrain-lean
+	mv stagetrain-fixincludes prev-fixincludes || test -f stagetrain-lean 
 @endif fixincludes
 @if gas
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-gas ] || \
 	  mkdir stagefeedback-gas; \
 	mv stagefeedback-gas gas; \
-	mv stagetrain-gas prev-gas || test -f stagetrain-lean
+	mv stagetrain-gas prev-gas || test -f stagetrain-lean 
 @endif gas
 @if gcc
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-gcc ] || \
 	  mkdir stagefeedback-gcc; \
 	mv stagefeedback-gcc gcc; \
-	mv stagetrain-gcc prev-gcc || test -f stagetrain-lean
+	mv stagetrain-gcc prev-gcc || test -f stagetrain-lean 
 @endif gcc
 @if gmp
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-gmp ] || \
 	  mkdir stagefeedback-gmp; \
 	mv stagefeedback-gmp gmp; \
-	mv stagetrain-gmp prev-gmp || test -f stagetrain-lean
+	mv stagetrain-gmp prev-gmp || test -f stagetrain-lean 
 @endif gmp
 @if mpfr
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-mpfr ] || \
 	  mkdir stagefeedback-mpfr; \
 	mv stagefeedback-mpfr mpfr; \
-	mv stagetrain-mpfr prev-mpfr || test -f stagetrain-lean
+	mv stagetrain-mpfr prev-mpfr || test -f stagetrain-lean 
 @endif mpfr
 @if mpc
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-mpc ] || \
 	  mkdir stagefeedback-mpc; \
 	mv stagefeedback-mpc mpc; \
-	mv stagetrain-mpc prev-mpc || test -f stagetrain-lean
+	mv stagetrain-mpc prev-mpc || test -f stagetrain-lean 
 @endif mpc
 @if isl
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-isl ] || \
 	  mkdir stagefeedback-isl; \
 	mv stagefeedback-isl isl; \
-	mv stagetrain-isl prev-isl || test -f stagetrain-lean
+	mv stagetrain-isl prev-isl || test -f stagetrain-lean 
 @endif isl
 @if libelf
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-libelf ] || \
 	  mkdir stagefeedback-libelf; \
 	mv stagefeedback-libelf libelf; \
-	mv stagetrain-libelf prev-libelf || test -f stagetrain-lean
+	mv stagetrain-libelf prev-libelf || test -f stagetrain-lean 
 @endif libelf
 @if gold
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-gold ] || \
 	  mkdir stagefeedback-gold; \
 	mv stagefeedback-gold gold; \
-	mv stagetrain-gold prev-gold || test -f stagetrain-lean
+	mv stagetrain-gold prev-gold || test -f stagetrain-lean 
 @endif gold
 @if intl
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-intl ] || \
 	  mkdir stagefeedback-intl; \
 	mv stagefeedback-intl intl; \
-	mv stagetrain-intl prev-intl || test -f stagetrain-lean
+	mv stagetrain-intl prev-intl || test -f stagetrain-lean 
 @endif intl
 @if ld
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-ld ] || \
 	  mkdir stagefeedback-ld; \
 	mv stagefeedback-ld ld; \
-	mv stagetrain-ld prev-ld || test -f stagetrain-lean
+	mv stagetrain-ld prev-ld || test -f stagetrain-lean 
 @endif ld
 @if libbacktrace
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-libbacktrace ] || \
 	  mkdir stagefeedback-libbacktrace; \
 	mv stagefeedback-libbacktrace libbacktrace; \
-	mv stagetrain-libbacktrace prev-libbacktrace || test -f stagetrain-lean
+	mv stagetrain-libbacktrace prev-libbacktrace || test -f stagetrain-lean 
 @endif libbacktrace
 @if libcpp
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-libcpp ] || \
 	  mkdir stagefeedback-libcpp; \
 	mv stagefeedback-libcpp libcpp; \
-	mv stagetrain-libcpp prev-libcpp || test -f stagetrain-lean
+	mv stagetrain-libcpp prev-libcpp || test -f stagetrain-lean 
 @endif libcpp
 @if libcody
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-libcody ] || \
 	  mkdir stagefeedback-libcody; \
 	mv stagefeedback-libcody libcody; \
-	mv stagetrain-libcody prev-libcody || test -f stagetrain-lean
+	mv stagetrain-libcody prev-libcody || test -f stagetrain-lean 
 @endif libcody
 @if libdecnumber
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-libdecnumber ] || \
 	  mkdir stagefeedback-libdecnumber; \
 	mv stagefeedback-libdecnumber libdecnumber; \
-	mv stagetrain-libdecnumber prev-libdecnumber || test -f stagetrain-lean
+	mv stagetrain-libdecnumber prev-libdecnumber || test -f stagetrain-lean 
 @endif libdecnumber
 @if libiberty
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-libiberty ] || \
 	  mkdir stagefeedback-libiberty; \
 	mv stagefeedback-libiberty libiberty; \
-	mv stagetrain-libiberty prev-libiberty || test -f stagetrain-lean
+	mv stagetrain-libiberty prev-libiberty || test -f stagetrain-lean 
 @endif libiberty
 @if libiberty-linker-plugin
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-libiberty-linker-plugin ] || \
 	  mkdir stagefeedback-libiberty-linker-plugin; \
 	mv stagefeedback-libiberty-linker-plugin libiberty-linker-plugin; \
-	mv stagetrain-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stagetrain-lean
+	mv stagetrain-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stagetrain-lean 
 @endif libiberty-linker-plugin
 @if libiconv
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-libiconv ] || \
 	  mkdir stagefeedback-libiconv; \
 	mv stagefeedback-libiconv libiconv; \
-	mv stagetrain-libiconv prev-libiconv || test -f stagetrain-lean
+	mv stagetrain-libiconv prev-libiconv || test -f stagetrain-lean 
 @endif libiconv
 @if zlib
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-zlib ] || \
 	  mkdir stagefeedback-zlib; \
 	mv stagefeedback-zlib zlib; \
-	mv stagetrain-zlib prev-zlib || test -f stagetrain-lean
+	mv stagetrain-zlib prev-zlib || test -f stagetrain-lean 
 @endif zlib
 @if lto-plugin
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-lto-plugin ] || \
 	  mkdir stagefeedback-lto-plugin; \
 	mv stagefeedback-lto-plugin lto-plugin; \
-	mv stagetrain-lto-plugin prev-lto-plugin || test -f stagetrain-lean
+	mv stagetrain-lto-plugin prev-lto-plugin || test -f stagetrain-lean 
 @endif lto-plugin
 @if libctf
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-libctf ] || \
 	  mkdir stagefeedback-libctf; \
 	mv stagefeedback-libctf libctf; \
-	mv stagetrain-libctf prev-libctf || test -f stagetrain-lean
+	mv stagetrain-libctf prev-libctf || test -f stagetrain-lean 
 @endif libctf
 	@[ -d stagefeedback-$(TARGET_SUBDIR) ] || \
 	  mkdir stagefeedback-$(TARGET_SUBDIR); \
 	mv stagefeedback-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
-	mv stagetrain-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stagetrain-lean
+	mv stagetrain-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stagetrain-lean 
 
-stagefeedback-end::
+stagefeedback-end:: 
 @if bfd
 	@if test -d $(HOST_SUBDIR)/bfd; then \
 	  cd $(HOST_SUBDIR); mv bfd stagefeedback-bfd; \
@@ -65371,12 +64880,12 @@ profiledbootstrap-lean:
 
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stagetrain:: distclean-stagefeedback
+distclean-stagetrain:: distclean-stagefeedback 
 .PHONY: distclean-stagefeedback
 distclean-stagefeedback::
 	@: $(MAKE); $(stage)
 	@test "`cat stage_last`" != stagefeedback || rm -f stage_last
-	rm -rf stagefeedback-*
+	rm -rf stagefeedback-* 
 
 
 @endif gcc-bootstrap
@@ -65393,152 +64902,152 @@ stageautoprofile-start::
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-bfd ] || \
 	  mkdir stageautoprofile-bfd; \
 	mv stageautoprofile-bfd bfd; \
-	mv stage1-bfd prev-bfd || test -f stage1-lean
+	mv stage1-bfd prev-bfd || test -f stage1-lean 
 @endif bfd
 @if opcodes
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-opcodes ] || \
 	  mkdir stageautoprofile-opcodes; \
 	mv stageautoprofile-opcodes opcodes; \
-	mv stage1-opcodes prev-opcodes || test -f stage1-lean
+	mv stage1-opcodes prev-opcodes || test -f stage1-lean 
 @endif opcodes
 @if binutils
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-binutils ] || \
 	  mkdir stageautoprofile-binutils; \
 	mv stageautoprofile-binutils binutils; \
-	mv stage1-binutils prev-binutils || test -f stage1-lean
+	mv stage1-binutils prev-binutils || test -f stage1-lean 
 @endif binutils
 @if fixincludes
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-fixincludes ] || \
 	  mkdir stageautoprofile-fixincludes; \
 	mv stageautoprofile-fixincludes fixincludes; \
-	mv stage1-fixincludes prev-fixincludes || test -f stage1-lean
+	mv stage1-fixincludes prev-fixincludes || test -f stage1-lean 
 @endif fixincludes
 @if gas
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-gas ] || \
 	  mkdir stageautoprofile-gas; \
 	mv stageautoprofile-gas gas; \
-	mv stage1-gas prev-gas || test -f stage1-lean
+	mv stage1-gas prev-gas || test -f stage1-lean 
 @endif gas
 @if gcc
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-gcc ] || \
 	  mkdir stageautoprofile-gcc; \
 	mv stageautoprofile-gcc gcc; \
-	mv stage1-gcc prev-gcc || test -f stage1-lean
+	mv stage1-gcc prev-gcc || test -f stage1-lean 
 @endif gcc
 @if gmp
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-gmp ] || \
 	  mkdir stageautoprofile-gmp; \
 	mv stageautoprofile-gmp gmp; \
-	mv stage1-gmp prev-gmp || test -f stage1-lean
+	mv stage1-gmp prev-gmp || test -f stage1-lean 
 @endif gmp
 @if mpfr
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-mpfr ] || \
 	  mkdir stageautoprofile-mpfr; \
 	mv stageautoprofile-mpfr mpfr; \
-	mv stage1-mpfr prev-mpfr || test -f stage1-lean
+	mv stage1-mpfr prev-mpfr || test -f stage1-lean 
 @endif mpfr
 @if mpc
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-mpc ] || \
 	  mkdir stageautoprofile-mpc; \
 	mv stageautoprofile-mpc mpc; \
-	mv stage1-mpc prev-mpc || test -f stage1-lean
+	mv stage1-mpc prev-mpc || test -f stage1-lean 
 @endif mpc
 @if isl
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-isl ] || \
 	  mkdir stageautoprofile-isl; \
 	mv stageautoprofile-isl isl; \
-	mv stage1-isl prev-isl || test -f stage1-lean
+	mv stage1-isl prev-isl || test -f stage1-lean 
 @endif isl
 @if libelf
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-libelf ] || \
 	  mkdir stageautoprofile-libelf; \
 	mv stageautoprofile-libelf libelf; \
-	mv stage1-libelf prev-libelf || test -f stage1-lean
+	mv stage1-libelf prev-libelf || test -f stage1-lean 
 @endif libelf
 @if gold
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-gold ] || \
 	  mkdir stageautoprofile-gold; \
 	mv stageautoprofile-gold gold; \
-	mv stage1-gold prev-gold || test -f stage1-lean
+	mv stage1-gold prev-gold || test -f stage1-lean 
 @endif gold
 @if intl
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-intl ] || \
 	  mkdir stageautoprofile-intl; \
 	mv stageautoprofile-intl intl; \
-	mv stage1-intl prev-intl || test -f stage1-lean
+	mv stage1-intl prev-intl || test -f stage1-lean 
 @endif intl
 @if ld
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-ld ] || \
 	  mkdir stageautoprofile-ld; \
 	mv stageautoprofile-ld ld; \
-	mv stage1-ld prev-ld || test -f stage1-lean
+	mv stage1-ld prev-ld || test -f stage1-lean 
 @endif ld
 @if libbacktrace
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-libbacktrace ] || \
 	  mkdir stageautoprofile-libbacktrace; \
 	mv stageautoprofile-libbacktrace libbacktrace; \
-	mv stage1-libbacktrace prev-libbacktrace || test -f stage1-lean
+	mv stage1-libbacktrace prev-libbacktrace || test -f stage1-lean 
 @endif libbacktrace
 @if libcpp
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-libcpp ] || \
 	  mkdir stageautoprofile-libcpp; \
 	mv stageautoprofile-libcpp libcpp; \
-	mv stage1-libcpp prev-libcpp || test -f stage1-lean
+	mv stage1-libcpp prev-libcpp || test -f stage1-lean 
 @endif libcpp
 @if libcody
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-libcody ] || \
 	  mkdir stageautoprofile-libcody; \
 	mv stageautoprofile-libcody libcody; \
-	mv stage1-libcody prev-libcody || test -f stage1-lean
+	mv stage1-libcody prev-libcody || test -f stage1-lean 
 @endif libcody
 @if libdecnumber
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-libdecnumber ] || \
 	  mkdir stageautoprofile-libdecnumber; \
 	mv stageautoprofile-libdecnumber libdecnumber; \
-	mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean
+	mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean 
 @endif libdecnumber
 @if libiberty
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-libiberty ] || \
 	  mkdir stageautoprofile-libiberty; \
 	mv stageautoprofile-libiberty libiberty; \
-	mv stage1-libiberty prev-libiberty || test -f stage1-lean
+	mv stage1-libiberty prev-libiberty || test -f stage1-lean 
 @endif libiberty
 @if libiberty-linker-plugin
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-libiberty-linker-plugin ] || \
 	  mkdir stageautoprofile-libiberty-linker-plugin; \
 	mv stageautoprofile-libiberty-linker-plugin libiberty-linker-plugin; \
-	mv stage1-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage1-lean
+	mv stage1-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage1-lean 
 @endif libiberty-linker-plugin
 @if libiconv
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-libiconv ] || \
 	  mkdir stageautoprofile-libiconv; \
 	mv stageautoprofile-libiconv libiconv; \
-	mv stage1-libiconv prev-libiconv || test -f stage1-lean
+	mv stage1-libiconv prev-libiconv || test -f stage1-lean 
 @endif libiconv
 @if zlib
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-zlib ] || \
 	  mkdir stageautoprofile-zlib; \
 	mv stageautoprofile-zlib zlib; \
-	mv stage1-zlib prev-zlib || test -f stage1-lean
+	mv stage1-zlib prev-zlib || test -f stage1-lean 
 @endif zlib
 @if lto-plugin
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-lto-plugin ] || \
 	  mkdir stageautoprofile-lto-plugin; \
 	mv stageautoprofile-lto-plugin lto-plugin; \
-	mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean
+	mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean 
 @endif lto-plugin
 @if libctf
 	@cd $(HOST_SUBDIR); [ -d stageautoprofile-libctf ] || \
 	  mkdir stageautoprofile-libctf; \
 	mv stageautoprofile-libctf libctf; \
-	mv stage1-libctf prev-libctf || test -f stage1-lean
+	mv stage1-libctf prev-libctf || test -f stage1-lean 
 @endif libctf
 	@[ -d stageautoprofile-$(TARGET_SUBDIR) ] || \
 	  mkdir stageautoprofile-$(TARGET_SUBDIR); \
 	mv stageautoprofile-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
-	mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean
+	mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean 
 
-stageautoprofile-end::
+stageautoprofile-end:: 
 @if bfd
 	@if test -d $(HOST_SUBDIR)/bfd; then \
 	  cd $(HOST_SUBDIR); mv bfd stageautoprofile-bfd; \
@@ -65714,12 +65223,12 @@ do-clean: clean-stageautoprofile
 
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stage1:: distclean-stageautoprofile
+distclean-stage1:: distclean-stageautoprofile 
 .PHONY: distclean-stageautoprofile
 distclean-stageautoprofile::
 	@: $(MAKE); $(stage)
 	@test "`cat stage_last`" != stageautoprofile || rm -f stage_last
-	rm -rf stageautoprofile-*
+	rm -rf stageautoprofile-* 
 
 
 @endif gcc-bootstrap
@@ -65736,152 +65245,152 @@ stageautofeedback-start::
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-bfd ] || \
 	  mkdir stageautofeedback-bfd; \
 	mv stageautofeedback-bfd bfd; \
-	mv stageautoprofile-bfd prev-bfd || test -f stageautoprofile-lean
+	mv stageautoprofile-bfd prev-bfd || test -f stageautoprofile-lean 
 @endif bfd
 @if opcodes
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-opcodes ] || \
 	  mkdir stageautofeedback-opcodes; \
 	mv stageautofeedback-opcodes opcodes; \
-	mv stageautoprofile-opcodes prev-opcodes || test -f stageautoprofile-lean
+	mv stageautoprofile-opcodes prev-opcodes || test -f stageautoprofile-lean 
 @endif opcodes
 @if binutils
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-binutils ] || \
 	  mkdir stageautofeedback-binutils; \
 	mv stageautofeedback-binutils binutils; \
-	mv stageautoprofile-binutils prev-binutils || test -f stageautoprofile-lean
+	mv stageautoprofile-binutils prev-binutils || test -f stageautoprofile-lean 
 @endif binutils
 @if fixincludes
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-fixincludes ] || \
 	  mkdir stageautofeedback-fixincludes; \
 	mv stageautofeedback-fixincludes fixincludes; \
-	mv stageautoprofile-fixincludes prev-fixincludes || test -f stageautoprofile-lean
+	mv stageautoprofile-fixincludes prev-fixincludes || test -f stageautoprofile-lean 
 @endif fixincludes
 @if gas
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-gas ] || \
 	  mkdir stageautofeedback-gas; \
 	mv stageautofeedback-gas gas; \
-	mv stageautoprofile-gas prev-gas || test -f stageautoprofile-lean
+	mv stageautoprofile-gas prev-gas || test -f stageautoprofile-lean 
 @endif gas
 @if gcc
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-gcc ] || \
 	  mkdir stageautofeedback-gcc; \
 	mv stageautofeedback-gcc gcc; \
-	mv stageautoprofile-gcc prev-gcc || test -f stageautoprofile-lean
+	mv stageautoprofile-gcc prev-gcc || test -f stageautoprofile-lean 
 @endif gcc
 @if gmp
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-gmp ] || \
 	  mkdir stageautofeedback-gmp; \
 	mv stageautofeedback-gmp gmp; \
-	mv stageautoprofile-gmp prev-gmp || test -f stageautoprofile-lean
+	mv stageautoprofile-gmp prev-gmp || test -f stageautoprofile-lean 
 @endif gmp
 @if mpfr
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-mpfr ] || \
 	  mkdir stageautofeedback-mpfr; \
 	mv stageautofeedback-mpfr mpfr; \
-	mv stageautoprofile-mpfr prev-mpfr || test -f stageautoprofile-lean
+	mv stageautoprofile-mpfr prev-mpfr || test -f stageautoprofile-lean 
 @endif mpfr
 @if mpc
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-mpc ] || \
 	  mkdir stageautofeedback-mpc; \
 	mv stageautofeedback-mpc mpc; \
-	mv stageautoprofile-mpc prev-mpc || test -f stageautoprofile-lean
+	mv stageautoprofile-mpc prev-mpc || test -f stageautoprofile-lean 
 @endif mpc
 @if isl
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-isl ] || \
 	  mkdir stageautofeedback-isl; \
 	mv stageautofeedback-isl isl; \
-	mv stageautoprofile-isl prev-isl || test -f stageautoprofile-lean
+	mv stageautoprofile-isl prev-isl || test -f stageautoprofile-lean 
 @endif isl
 @if libelf
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-libelf ] || \
 	  mkdir stageautofeedback-libelf; \
 	mv stageautofeedback-libelf libelf; \
-	mv stageautoprofile-libelf prev-libelf || test -f stageautoprofile-lean
+	mv stageautoprofile-libelf prev-libelf || test -f stageautoprofile-lean 
 @endif libelf
 @if gold
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-gold ] || \
 	  mkdir stageautofeedback-gold; \
 	mv stageautofeedback-gold gold; \
-	mv stageautoprofile-gold prev-gold || test -f stageautoprofile-lean
+	mv stageautoprofile-gold prev-gold || test -f stageautoprofile-lean 
 @endif gold
 @if intl
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-intl ] || \
 	  mkdir stageautofeedback-intl; \
 	mv stageautofeedback-intl intl; \
-	mv stageautoprofile-intl prev-intl || test -f stageautoprofile-lean
+	mv stageautoprofile-intl prev-intl || test -f stageautoprofile-lean 
 @endif intl
 @if ld
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-ld ] || \
 	  mkdir stageautofeedback-ld; \
 	mv stageautofeedback-ld ld; \
-	mv stageautoprofile-ld prev-ld || test -f stageautoprofile-lean
+	mv stageautoprofile-ld prev-ld || test -f stageautoprofile-lean 
 @endif ld
 @if libbacktrace
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-libbacktrace ] || \
 	  mkdir stageautofeedback-libbacktrace; \
 	mv stageautofeedback-libbacktrace libbacktrace; \
-	mv stageautoprofile-libbacktrace prev-libbacktrace || test -f stageautoprofile-lean
+	mv stageautoprofile-libbacktrace prev-libbacktrace || test -f stageautoprofile-lean 
 @endif libbacktrace
 @if libcpp
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-libcpp ] || \
 	  mkdir stageautofeedback-libcpp; \
 	mv stageautofeedback-libcpp libcpp; \
-	mv stageautoprofile-libcpp prev-libcpp || test -f stageautoprofile-lean
+	mv stageautoprofile-libcpp prev-libcpp || test -f stageautoprofile-lean 
 @endif libcpp
 @if libcody
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-libcody ] || \
 	  mkdir stageautofeedback-libcody; \
 	mv stageautofeedback-libcody libcody; \
-	mv stageautoprofile-libcody prev-libcody || test -f stageautoprofile-lean
+	mv stageautoprofile-libcody prev-libcody || test -f stageautoprofile-lean 
 @endif libcody
 @if libdecnumber
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-libdecnumber ] || \
 	  mkdir stageautofeedback-libdecnumber; \
 	mv stageautofeedback-libdecnumber libdecnumber; \
-	mv stageautoprofile-libdecnumber prev-libdecnumber || test -f stageautoprofile-lean
+	mv stageautoprofile-libdecnumber prev-libdecnumber || test -f stageautoprofile-lean 
 @endif libdecnumber
 @if libiberty
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-libiberty ] || \
 	  mkdir stageautofeedback-libiberty; \
 	mv stageautofeedback-libiberty libiberty; \
-	mv stageautoprofile-libiberty prev-libiberty || test -f stageautoprofile-lean
+	mv stageautoprofile-libiberty prev-libiberty || test -f stageautoprofile-lean 
 @endif libiberty
 @if libiberty-linker-plugin
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-libiberty-linker-plugin ] || \
 	  mkdir stageautofeedback-libiberty-linker-plugin; \
 	mv stageautofeedback-libiberty-linker-plugin libiberty-linker-plugin; \
-	mv stageautoprofile-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stageautoprofile-lean
+	mv stageautoprofile-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stageautoprofile-lean 
 @endif libiberty-linker-plugin
 @if libiconv
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-libiconv ] || \
 	  mkdir stageautofeedback-libiconv; \
 	mv stageautofeedback-libiconv libiconv; \
-	mv stageautoprofile-libiconv prev-libiconv || test -f stageautoprofile-lean
+	mv stageautoprofile-libiconv prev-libiconv || test -f stageautoprofile-lean 
 @endif libiconv
 @if zlib
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-zlib ] || \
 	  mkdir stageautofeedback-zlib; \
 	mv stageautofeedback-zlib zlib; \
-	mv stageautoprofile-zlib prev-zlib || test -f stageautoprofile-lean
+	mv stageautoprofile-zlib prev-zlib || test -f stageautoprofile-lean 
 @endif zlib
 @if lto-plugin
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-lto-plugin ] || \
 	  mkdir stageautofeedback-lto-plugin; \
 	mv stageautofeedback-lto-plugin lto-plugin; \
-	mv stageautoprofile-lto-plugin prev-lto-plugin || test -f stageautoprofile-lean
+	mv stageautoprofile-lto-plugin prev-lto-plugin || test -f stageautoprofile-lean 
 @endif lto-plugin
 @if libctf
 	@cd $(HOST_SUBDIR); [ -d stageautofeedback-libctf ] || \
 	  mkdir stageautofeedback-libctf; \
 	mv stageautofeedback-libctf libctf; \
-	mv stageautoprofile-libctf prev-libctf || test -f stageautoprofile-lean
+	mv stageautoprofile-libctf prev-libctf || test -f stageautoprofile-lean 
 @endif libctf
 	@[ -d stageautofeedback-$(TARGET_SUBDIR) ] || \
 	  mkdir stageautofeedback-$(TARGET_SUBDIR); \
 	mv stageautofeedback-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
-	mv stageautoprofile-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stageautoprofile-lean
+	mv stageautoprofile-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stageautoprofile-lean 
 
-stageautofeedback-end::
+stageautofeedback-end:: 
 @if bfd
 	@if test -d $(HOST_SUBDIR)/bfd; then \
 	  cd $(HOST_SUBDIR); mv bfd stageautofeedback-bfd; \
@@ -66080,12 +65589,12 @@ autoprofiledbootstrap-lean:
 
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stageautoprofile:: distclean-stageautofeedback
+distclean-stageautoprofile:: distclean-stageautofeedback 
 .PHONY: distclean-stageautofeedback
 distclean-stageautofeedback::
 	@: $(MAKE); $(stage)
 	@test "`cat stage_last`" != stageautofeedback || rm -f stage_last
-	rm -rf stageautofeedback-*
+	rm -rf stageautofeedback-* 
 
 
 @endif gcc-bootstrap
@@ -66740,7 +66249,6 @@ all-stagefeedback-lto-plugin: maybe-all-stagefeedback-libiberty-linker-plugin
 all-stageautoprofile-lto-plugin: maybe-all-stageautoprofile-libiberty-linker-plugin
 all-stageautofeedback-lto-plugin: maybe-all-stageautofeedback-libiberty-linker-plugin
 all-gotools: maybe-all-target-libgo
-all-gm2tools: maybe-all-target-libgm2
 configure-intl: maybe-all-libiconv
 configure-stage1-intl: maybe-all-stage1-libiconv
 configure-stage2-intl: maybe-all-stage2-libiconv
@@ -67487,7 +66995,6 @@ configure-target-libgfortran: maybe-all-target-libquadmath
 configure-gnattools: stage_last
 configure-libcc1: stage_last
 configure-c++tools: stage_last
-configure-gm2tools: stage_last
 configure-utils: stage_last
 configure-gdb: stage_last
 configure-gdbserver: stage_last
@@ -67506,7 +67013,6 @@ all-gnattools: maybe-all-target-libstdc++-v3
 configure-libcc1: maybe-configure-gcc
 all-libcc1: maybe-all-gcc
 all-c++tools: maybe-all-gcc
-all-gm2tools: maybe-all-target-libstdc++-v3
 all-utils: maybe-all-libiberty
 configure-gdb: maybe-all-intl
 configure-gdb: maybe-all-bfd
diff --git a/configure b/configure
index cb892d2ce4c..b146aac737e 100755
--- a/configure
+++ b/configure
@@ -767,7 +767,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -938,7 +937,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE}'
@@ -1191,15 +1189,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1337,7 +1326,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1497,7 +1486,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in
index 727871b3928..42f97b2d423 100644
--- a/gcc/m2/Make-lang.in
+++ b/gcc/m2/Make-lang.in
@@ -635,7 +635,7 @@ GM2-COMP-BOOT-DEFS = FifoQueue.def   M2Debug.def     M2Optimize.def  M2Defaults.
                      M2Base.def      M2Reserved.def  SymbolKey.def   M2BasicBlock.def\
                      M2Search.def    M2Batch.def     M2System.def    P2SymBuild.def  \
                      M2Code.def      M2Comp.def      m2flex.def      NameKey.def     \
-                     M2LexBuf.def    M2Version.def   M2Error.def     \
+                     M2LexBuf.def    M2Version.def   M2Error.def     M2Graph.def     \
                      M2Students.def  \
                      M2GenGCC.def    M2GCCDeclare.def \
                      M2Configure.def SymbolTable.def Lists.def       SymbolConversion.def \
@@ -658,7 +658,7 @@ GM2-COMP-BOOT-MODS = FifoQueue.mod   M2LexBuf.mod                             \
                      M2FileName.mod  P0SymBuild.mod  P1SymBuild.mod  P2SymBuild.mod  \
                      P3SymBuild.mod  \
                      SymbolKey.mod   SymbolTable.mod                 M2Error.mod     \
-                     M2Students.mod  \
+                     M2Graph.mod     M2Students.mod  \
                      M2BasicBlock.mod M2Code.mod     M2GenGCC.mod    M2GCCDeclare.mod \
                      SymbolConversion.mod            M2Base.mod      \
                      M2ALU.mod       M2System.mod    Lists.mod       \
@@ -718,7 +718,7 @@ GM2-LIBS-C         = wrapc.c           Selective.c     choosetemp.c    \
 GM2-LIBS-CC        = UnixArgs.cc       dtoa.cc         ldtoa.cc
 
 GM2-COMP-DEFS      = FifoQueue.def     M2Debug.def     M2Optimize.def  M2Defaults.def  \
-                     M2Options.def     P3SymBuild.def  M2ALU.def       \
+                     M2Options.def     P3SymBuild.def  M2ALU.def       M2Graph.def     \
                      M2Pass.def        P0SymBuild.def  P1SymBuild.def  M2AsmUtil.def   \
                      M2Quads.def     \
                      M2StackWord.def   M2FileName.def  M2Base.def      M2Reserved.def  \
@@ -739,7 +739,7 @@ GM2-COMP-DEFS      = FifoQueue.def     M2Debug.def     M2Optimize.def  M2Default
 GM2-COMP-MODS      = FifoQueue.mod     M2AsmUtil.mod                   M2Optimize.mod  \
                      M2StackWord.mod   M2Options.mod   M2Pass.mod      M2Batch.mod     \
                      M2Quads.mod       M2Comp.mod      M2Reserved.mod  M2Configure.mod \
-                     M2Debug.mod       M2Defaults.mod  NameKey.mod     \
+                     M2Debug.mod       M2Defaults.mod  NameKey.mod     M2Graph.mod     \
                      M2FileName.mod    P0SymBuild.mod  P1SymBuild.mod  P2SymBuild.mod  \
                      P3SymBuild.mod  \
                      SymbolKey.mod     SymbolTable.mod                 M2Error.mod     \
diff --git a/gcc/m2/gm2-compiler/M2Graph.def b/gcc/m2/gm2-compiler/M2Graph.def
new file mode 100644
index 00000000000..261e46fb354
--- /dev/null
+++ b/gcc/m2/gm2-compiler/M2Graph.def
@@ -0,0 +1,58 @@
+(* M2Graph.def maintains the dependancy graph depth.
+
+Copyright (C) 2022 Free Software Foundation, Inc.
+Contributed by Gaius Mulley <gaius.mulley@southwales.ac.uk>.
+
+This file is part of GNU Modula-2.
+
+GNU Modula-2 is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+GNU Modula-2 is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Modula-2; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  *)
+
+DEFINITION MODULE M2Graph ;
+
+FROM Lists IMPORT List ;
+
+TYPE
+   Graph ;
+
+
+(*
+   InitGraph - creates and returns an empty graph.
+*)
+
+PROCEDURE InitGraph () : Graph ;
+
+
+(*
+   KillGraph - deletes graph and all nodes.
+*)
+
+PROCEDURE KillGraph (VAR g: Graph) ;
+
+
+(*
+   AddDependent - adds moduleSym <- dependSym into the graph.
+*)
+
+PROCEDURE AddDependent (graph: Graph; moduleSym, dependSym: CARDINAL) ;
+
+
+(*
+   SortGraph - returns a List containing the sorted graph.
+*)
+
+PROCEDURE SortGraph (g: Graph; topModule: CARDINAL) : List ;
+
+
+END M2Graph.
diff --git a/gcc/m2/gm2-compiler/M2Graph.mod b/gcc/m2/gm2-compiler/M2Graph.mod
new file mode 100644
index 00000000000..3f8f299ea8f
--- /dev/null
+++ b/gcc/m2/gm2-compiler/M2Graph.mod
@@ -0,0 +1,234 @@
+(* M2Graph.mod maintains the dependancy graph depth.
+
+Copyright (C) 2022 Free Software Foundation, Inc.
+Contributed by Gaius Mulley <gaius.mulley@southwales.ac.uk>.
+
+This file is part of GNU Modula-2.
+
+GNU Modula-2 is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+GNU Modula-2 is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Modula-2; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  *)
+
+IMPLEMENTATION MODULE M2Graph ;
+
+
+FROM Storage IMPORT ALLOCATE ;
+FROM StrLib IMPORT StrEqual, StrCopy ;
+FROM NumberIO IMPORT WriteCard ;
+FROM StrIO IMPORT WriteString, WriteLn ;
+FROM NameKey IMPORT Name, WriteKey ;
+FROM Lists IMPORT InitList, KillList, IncludeItemIntoList, RemoveItemFromList ;
+FROM Indexing IMPORT Index, HighIndice, IncludeIndiceIntoIndex, InitIndex, KillIndex, GetIndice ;
+FROM M2Printf IMPORT printf0, printf1, printf2 ;
+FROM SymbolTable IMPORT GetSymName, IsDefinitionForC, IsModule ;
+
+
+CONST
+   Debugging = FALSE ;
+
+TYPE
+   state = (initial, started, ordered) ;
+
+   node = POINTER TO RECORD
+             moduleSym: CARDINAL ;  (* SymbolTable entry for module.  *)
+             deps     : Index ;
+             nstate   : state ;
+          END ;
+
+   Graph = POINTER TO RECORD
+                         nodes : Index ;
+                      END ;
+
+
+(*
+   InitGraph - creates and returns an empty graph.
+*)
+
+PROCEDURE InitGraph () : Graph ;
+VAR
+   g: Graph ;
+BEGIN
+   NEW (g) ;
+   g^.nodes := InitIndex (1) ;
+   RETURN g
+END InitGraph ;
+
+
+(*
+   KillNode - deletes the dynamic storage associated with nptr.
+*)
+
+PROCEDURE KillNode (nptr: node) ;
+BEGIN
+   KillIndex (nptr^.deps)
+END KillNode ;
+
+
+(*
+   KillGraph - deletes graph and all nodes.
+*)
+
+PROCEDURE KillGraph (VAR g: Graph) ;
+VAR
+   i, n: CARDINAL ;
+   nptr: node ;
+BEGIN
+   n := HighIndice (g^.nodes) ;
+   i := 1 ;
+   WHILE i <= n DO
+      nptr := GetIndice (g^.nodes, i) ;
+      KillNode (nptr) ;
+      INC (i)
+   END ;
+   g := NIL
+END KillGraph ;
+
+
+(*
+   initNode - create a new node in graph and return the node.
+*)
+
+PROCEDURE initNode (graph: Graph; moduleSym: CARDINAL) : node ;
+VAR
+   nptr: node ;
+BEGIN
+   NEW (nptr) ;
+   nptr^.moduleSym := moduleSym ;
+   nptr^.deps := InitIndex (1) ;
+   nptr^.nstate := initial ;
+   IncludeIndiceIntoIndex (graph^.nodes, nptr) ;
+   RETURN nptr
+END initNode ;
+
+
+(*
+   getNode - returns a node from graph representing moduleSym.
+             If the node does not exist it is created.
+*)
+
+PROCEDURE getNode (graph: Graph; moduleSym: CARDINAL) : node ;
+VAR
+   i, n: CARDINAL ;
+   nptr: node ;
+BEGIN
+   i := 1 ;
+   n := HighIndice (graph^.nodes) ;
+   WHILE i <= n DO
+      nptr := GetIndice (graph^.nodes, i) ;
+      IF nptr^.moduleSym = moduleSym
+      THEN
+         RETURN nptr
+      END ;
+      INC (i)
+   END ;
+   RETURN initNode (graph, moduleSym)
+END getNode ;
+
+
+(*
+   createDependent - mptr imports from dptr.
+*)
+
+PROCEDURE createDependent (mptr, dptr: node) ;
+BEGIN
+   IncludeIndiceIntoIndex (mptr^.deps, dptr)
+END createDependent ;
+
+
+(*
+   AddDependent - adds moduleSym <- dependSym into the graph.
+*)
+
+PROCEDURE AddDependent (graph: Graph; moduleSym, dependSym: CARDINAL) ;
+VAR
+   mptr, dptr: node ;
+BEGIN
+   IF (IsModule (moduleSym) OR (NOT IsDefinitionForC (moduleSym))) AND
+      (IsModule (dependSym) OR (NOT IsDefinitionForC (dependSym)))
+   THEN
+      mptr := getNode (graph, moduleSym) ;
+      dptr := getNode (graph, dependSym) ;
+      createDependent (mptr, dptr)
+   END
+END AddDependent ;
+
+
+(*
+   SortGraph - returns a List containing the sorted graph.
+*)
+
+PROCEDURE SortGraph (g: Graph; topModule: CARDINAL) : List ;
+VAR
+   sorted: List ;
+   nptr  : node ;
+BEGIN
+   InitList (sorted) ;
+   setNodesInitial (g) ;
+   nptr := getNode (g, topModule) ;
+   resolveImports (sorted, nptr) ;
+   RemoveItemFromList (sorted, topModule) ;
+   IncludeItemIntoList (sorted, topModule) ;  (* Ensure topModule is last.  *)
+   RETURN sorted
+END SortGraph ;
+
+
+(*
+   resolveImports - recursively resolve imports using ISO Modula-2
+                    rules for the order of module initialization.
+*)
+
+PROCEDURE resolveImports (sorted: List; nptr: node) ;
+VAR
+     i, n: CARDINAL ;
+  name: Name ;
+BEGIN
+   IF nptr^.nstate = initial
+   THEN
+      nptr^.nstate := started ;
+      name := GetSymName (nptr^.moduleSym) ;
+      i := 1 ;
+      n := HighIndice (nptr^.deps) ;
+      IF Debugging
+      THEN
+         printf2 ("resolving %a  %d dependents\n", name, n)
+      END ;
+      WHILE i <= n DO
+         resolveImports (sorted, GetIndice (nptr^.deps, i)) ;
+         INC (i)
+      END ;
+      nptr^.nstate := ordered ;
+      IncludeItemIntoList (sorted, nptr^.moduleSym)
+   END
+END resolveImports ;
+
+
+(*
+   setNodesInitial - changes the state of all nodes in graph to initial.
+*)
+
+PROCEDURE setNodesInitial (g: Graph) ;
+VAR
+   i, n: CARDINAL ;
+   nptr: node ;
+BEGIN
+   i := 1 ;
+   n := HighIndice (g^.nodes) ;
+   WHILE i <= n DO
+      nptr := GetIndice (g^.nodes, i) ;
+      nptr^.nstate := initial ;
+      INC (i)
+   END
+END setNodesInitial ;
+
+
+END M2Graph.
diff --git a/gcc/m2/gm2-compiler/M2Scaffold.mod b/gcc/m2/gm2-compiler/M2Scaffold.mod
index ed39be3e98a..4064c431541 100644
--- a/gcc/m2/gm2-compiler/M2Scaffold.mod
+++ b/gcc/m2/gm2-compiler/M2Scaffold.mod
@@ -30,15 +30,18 @@ FROM SymbolTable IMPORT NulSym, MakeProcedure, PutFunction,
                         GetMainModule, GetModuleCtors, MakeDefImp,
                         PutModuleCtorExtern, IsDefinitionForC,
                         ForeachModuleDo, IsDefImp, IsModule,
-                        IsModuleBuiltin,
-                        GetSymName, StartScope, EndScope ;
+                        IsModuleBuiltin, IsImport, IsImportStatement,
+                        GetSymName, StartScope, EndScope,
+                        GetModuleDefImportStatementList,
+                        GetModuleModImportStatementList,
+                        GetImportModule, GetImportStatementList ;
 
 FROM NameKey IMPORT NulName, Name, MakeKey, makekey, KeyToCharStar ;
 FROM M2Base IMPORT Integer, Cardinal ;
 FROM M2System IMPORT Address ;
 FROM M2LexBuf IMPORT GetTokenNo ;
 FROM Assertion IMPORT Assert ;
-FROM Lists IMPORT List, InitList, IncludeItemIntoList, NoOfItemsInList, GetItemFromList ;
+FROM Lists IMPORT List, InitList, IncludeItemIntoList, NoOfItemsInList, GetItemFromList, KillList, IsItemInList ;
 FROM M2MetaError IMPORT MetaErrorT0, MetaErrorStringT0 ;
 
 FROM SFIO IMPORT OpenToWrite, WriteS, ReadS, OpenToRead, Exists ;
@@ -60,8 +63,12 @@ FROM DynamicStrings IMPORT String, InitString, KillString, ConCat, RemoveWhitePr
                     EqualArray, Mark, Assign, Fin, InitStringChar, Length, Slice, Equal,
                     RemoveComment, string, InitStringCharStar ;
 
+FROM M2Graph IMPORT Graph, InitGraph, KillGraph, AddDependent, SortGraph ;
+
+
 CONST
-   Comment = '#'  ; (* Comment leader      *)
+   Comment   = '#'  ; (* Comment leader      *)
+   Debugging = FALSE ;
 
 VAR
    uselistModules,
@@ -249,13 +256,96 @@ BEGIN
 END LookupModuleSym ;
 
 
+(*
+   addDependentStatement - 
+*)
+
+PROCEDURE addDependentStatement (graph: Graph; moduleSym: CARDINAL; list: List) ;
+VAR
+   n1, n2: Name ;
+   import,
+   depmod,
+   i, n  : CARDINAL ;
+BEGIN
+   n := NoOfItemsInList (list) ;
+   i := 1 ;
+   WHILE i <= n DO
+      import := GetItemFromList (list, i) ;
+      Assert (IsImport (import)) ;
+      depmod := GetImportModule (import) ;
+      AddDependent (graph, moduleSym, depmod) ;
+      IF Debugging
+      THEN
+         n1 := GetSymName (moduleSym) ;
+         n2 := GetSymName (depmod) ;
+         printf2 ("AddDependent (%a, %a)\n",
+                  n1, n2)
+      END ;
+      INC (i)
+   END
+END addDependentStatement ;
+
+
+(*
+   addDependentImport - adds dependent imports of moduleSym into the graph.
+*)
+
+PROCEDURE addDependentImport (graph: Graph; moduleSym: CARDINAL; importList: List) ;
+VAR
+   stmt,
+   i, n: CARDINAL ;
+BEGIN
+   n := NoOfItemsInList (importList) ;
+   i := 1 ;
+   WHILE i <= n DO
+      stmt := GetItemFromList (importList, i) ;
+      Assert (IsImportStatement (stmt)) ;
+      addDependentStatement (graph, moduleSym, GetImportStatementList (stmt)) ;
+      INC (i)
+   END
+END addDependentImport ;
+
+
+(*
+   TopologicallySortList - topologically sort the list based on import graph.
+                           A new list is returned.
+*)
+
+PROCEDURE TopologicallySortList (list: List; topModule: CARDINAL) : List ;
+VAR
+   graph    : Graph ;
+   i, n     : CARDINAL ;
+   moduleSym: CARDINAL ;
+BEGIN
+   graph := InitGraph () ;
+   n := NoOfItemsInList (list) ;
+   i := 1 ;
+   WHILE i <= n DO
+      moduleSym := GetItemFromList (uselistModules, i) ;
+      addDependentImport (graph, moduleSym, GetModuleDefImportStatementList (moduleSym)) ;
+      addDependentImport (graph, moduleSym, GetModuleModImportStatementList (moduleSym)) ;
+      INC (i) ;
+   END ;
+   (* Ensure that topModule is also in the graph.  *)
+   IF NOT IsItemInList (list, topModule)
+   THEN
+      addDependentImport (graph, topModule, GetModuleDefImportStatementList (topModule)) ;
+      addDependentImport (graph, topModule, GetModuleModImportStatementList (topModule))
+   END ;
+   RETURN SortGraph (graph, topModule)
+END TopologicallySortList ;
+
+
 (*
    AddEntry - adds an entry to the ctorGlobals and uselistModules.
 *)
 
 PROCEDURE AddEntry (tok: CARDINAL; name: Name) ;
 BEGIN
-   IncludeItemIntoList (ctorGlobals, name) ;
+   IF ctorGlobals # NIL
+   THEN
+      IncludeItemIntoList (ctorGlobals, name)
+   END ;
    IncludeItemIntoList (uselistModules, LookupModuleSym (tok, name))
 END AddEntry ;
 
@@ -292,7 +382,8 @@ VAR
 
 
 (*
-   AddModuleToCtor - adds moduleSym to the ctorGlobals and uselistModules.
+   AddModuleToCtor - adds moduleSym to the uselistModules and
+                     sets all modules ctors as extern.
 *)
 
 PROCEDURE AddModuleToCtor (moduleSym: CARDINAL) ;
@@ -302,7 +393,6 @@ BEGIN
       IF (moduleSym # GetMainModule ()) AND (NOT IsModuleBuiltin (moduleSym))
       THEN
          PutModuleCtorExtern (ctorTok, moduleSym) ;
-         IncludeItemIntoList (ctorGlobals, GetSymName (moduleSym)) ;
          IncludeItemIntoList (uselistModules, moduleSym)
       END
    END
@@ -310,16 +400,17 @@ END AddModuleToCtor ;
 
 
 (*
-   WriteCtorList - writes the ctor list to GetGenModuleFilename
-                   providing the filename is not NIL and not '-'.
+   WriteList - writes the list to GetGenModuleFilename
+               providing the filename is not NIL and not '-'.
 *)
 
-PROCEDURE WriteCtorList (tok: CARDINAL) ;
+PROCEDURE WriteList (tok: CARDINAL; list: List) ;
 VAR
-   fo  : File ;
-   name: Name ;
-   i, n: CARDINAL ;
-   s   : String ;
+   fo       : File ;
+   name     : Name ;
+   moduleSym: CARDINAL ;
+   i, n     : CARDINAL ;
+   s        : String ;
 BEGIN
    IF (GetGenModuleFilename () # NIL) AND (NOT EqualArray (GetGenModuleFilename (), '-'))
    THEN
@@ -327,9 +418,10 @@ BEGIN
       IF IsNoError (fo)
       THEN
          i := 1 ;
-         n := NoOfItemsInList (ctorGlobals) ;
+         n := NoOfItemsInList (list) ;
          WHILE i <= n DO
-            name := GetItemFromList (ctorGlobals, i) ;
+            moduleSym := GetItemFromList (list, i) ;
+            name := GetSymName (moduleSym) ;
             s := InitStringCharStar (KeyToCharStar (name)) ;
             s := ConCat (s, Mark (InitString ('\n'))) ;
             s := HandleEscape (s) ;
@@ -344,7 +436,7 @@ BEGIN
          MetaErrorStringT0 (tok, s)
       END
    END
-END WriteCtorList ;
+END WriteList ;
 
 
 (*
@@ -354,14 +446,27 @@ END WriteCtorList ;
 *)
 
 PROCEDURE CreateCtorListFromImports (tok: CARDINAL) : BOOLEAN ;
+VAR
+   newlist: List ;
+   i, n   : CARDINAL ;
 BEGIN
    IF GenModuleList
    THEN
-      InitList (ctorGlobals) ;
       InitList (uselistModules) ;
       ctorTok := tok ;
       ForeachModuleDo (AddModuleToCtor) ;
-      WriteCtorList (tok) ;
+      newlist := TopologicallySortList (uselistModules, GetMainModule ()) ;
+      KillList (uselistModules) ;
+      uselistModules := newlist ;
+      (* Now create the ctorGlobals using uselistModules and retain the same order.  *)
+      InitList (ctorGlobals) ;
+      i := 1 ;
+      n := NoOfItemsInList (uselistModules) ;
+      WHILE i <= n DO
+         IncludeItemIntoList (ctorGlobals, GetSymName (GetItemFromList (uselistModules, i))) ;
+         INC (i)
+      END ;
+      WriteList (tok, uselistModules) ;
       RETURN TRUE
    END ;
    RETURN FALSE
diff --git a/gcc/m2/gm2-compiler/SymbolTable.mod b/gcc/m2/gm2-compiler/SymbolTable.mod
index 320bf675393..0cfd57b18b9 100644
--- a/gcc/m2/gm2-compiler/SymbolTable.mod
+++ b/gcc/m2/gm2-compiler/SymbolTable.mod
@@ -1251,7 +1251,7 @@ END GetImportStatementList ;
 
 (*
    GetModuleDefImportStatementList - returns the list of dependents associated with
-                               the definition module.
+                                     the definition module.
 *)
 
 PROCEDURE GetModuleDefImportStatementList (sym: CARDINAL) : List ;
@@ -1270,7 +1270,7 @@ END GetModuleDefImportStatementList ;
 
 (*
    GetModuleModImportStatementList - returns the list of dependents associated with
-                               the implementation or program module.
+                                     the implementation or program module.
 *)
 
 PROCEDURE GetModuleModImportStatementList (sym: CARDINAL) : List ;
diff --git a/gcc/m2/gm2spec.cc b/gcc/m2/gm2spec.cc
index 55a6991f48a..a9a57d41884 100644
--- a/gcc/m2/gm2spec.cc
+++ b/gcc/m2/gm2spec.cc
@@ -950,8 +950,8 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options,
 	  if (strcmp (dialect, "iso") == 0)
 	    libraries = xstrdup ("m2iso,m2pim");
 	  else
-	    libraries = xstrdup ("m2pim");  /* Default to pim libraries if none
-					       specified.  */
+	    /* Default to pim libraries if none specified.  */
+	    libraries = xstrdup ("m2pim,m2log,m2iso");
 	}
 
       libraries = convert_abbreviations (libraries);
diff --git a/gcc/m2/mc/keyc.mod b/gcc/m2/mc/keyc.mod
index 7b1273d98af..c1deb1f1e0b 100644
--- a/gcc/m2/mc/keyc.mod
+++ b/gcc/m2/mc/keyc.mod
@@ -997,7 +997,8 @@ BEGIN
    add (keywords, 'catch') ;
    add (keywords, 'operator') ;
    add (keywords, 'complex') ;
-   add (keywords, 'export')
+   add (keywords, 'export') ;
+   add (keywords, 'public')
 END initCP ;
 
 
diff --git a/gcc/testsuite/gm2/projects/README b/gcc/testsuite/gm2/projects/README
new file mode 100644
index 00000000000..bc6bbf6968a
--- /dev/null
+++ b/gcc/testsuite/gm2/projects/README
@@ -0,0 +1,3 @@
+Tests under here provide confidence that basic linking works for small
+projects.  There are projects to link against the core pim, pim and iso
+libraries.
diff --git a/gcc/testsuite/gm2/projects/iso/run/pass/halma/halma.mod b/gcc/testsuite/gm2/projects/iso/run/pass/halma/halma.mod
new file mode 100644
index 00000000000..3d5b8166635
--- /dev/null
+++ b/gcc/testsuite/gm2/projects/iso/run/pass/halma/halma.mod
@@ -0,0 +1,1952 @@
+(* Copyright (C) 2010 Free Software Foundation, Inc. *)
+(* This file is part of GNU Modula-2.
+
+GNU Modula-2 is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+GNU Modula-2 is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License along
+with gm2; see the file COPYING.  If not, write to the Free Software
+Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *)
+
+MODULE halma ;
+
+FROM STextIO IMPORT WriteString, WriteLn, WriteChar, ReadToken, SkipLine ;
+FROM SWholeIO IMPORT WriteCard, WriteInt ;
+FROM Strings IMPORT Length ;
+FROM Selective IMPORT Timeval, GetTimeOfDay, GetTime, InitTime, KillTime ;
+FROM WholeStr IMPORT StrToCard, ConvResults ;
+FROM SYSTEM IMPORT CARDINAL8 ;
+
+CONST
+   TwoPlayer      =            TRUE ;
+   FourPlayer     =           FALSE ;
+   BoardX         =              16 ;
+   BoardY         =              16 ;
+   BoardSize      = BoardX * BoardY ;
+   Pieces         =              19 ;   (* total pieces per player on the board  *)
+   PieceHeap      =            4000 ;   (* maximum moves we will examine per ply *)
+   MaxScore       =          100000 ;
+   MinScore       =         -100000 ;
+   WinScore       =        MaxScore ;
+   LooseScore     =       -WinScore ;
+   Debugging      =           FALSE ;
+   Thinking       =              10 ;   (* how many seconds can the program think? *)
+   slowEvaluation =           FALSE ;
+   HomeWeight     =          BoardX ;
+
+TYPE
+   Squares = [0..BoardSize-1] ;
+   SoS     = SET OF Squares ;
+   Colour  = (Blue, Red, Green, White) ;
+
+   Board = RECORD
+              used  : SoS ;   (* is the square used at all? *)
+              colour: ARRAY [0..1] OF SoS ;   (* if so which colour occupies the square? *)
+              pieces: ARRAY [MIN(Colour)..MAX(Colour)] OF ARRAY [1..Pieces] OF CARDINAL8 ;
+              home  : ARRAY [MIN(Colour)..MAX(Colour)] OF CARDINAL ;
+           END ;
+
+   Moves = RECORD
+              pieceHead: ARRAY [0..Pieces] OF CARDINAL ;      (* pieceHead[0] is start of peg 1 moves in the heap *)
+              pieceList: ARRAY [0..PieceHeap] OF CARDINAL8 ;  (* pieceHead[1] is start of peg 2 moves in the heap *)
+           END ;
+
+   Reachable = RECORD
+                  no  : CARDINAL ;
+                  prev: CARDINAL ;
+                  dist: CARDINAL ;
+                  list: ARRAY Squares OF CARDINAL ;
+               END ;
+
+   Graph = RECORD
+              graph: ARRAY Squares OF Reachable ;
+           END ;
+
+VAR
+   count   : CARDINAL ;
+   homeBase: ARRAY [MIN(Colour)..MAX(Colour)] OF SoS ;
+
+
+(*
+   +-----------------------------------------------------------------+
+   | 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 |
+   |                                                                 |
+   | 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 |
+   |                                                                 |
+   | 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 |
+   |                                                                 |
+   | 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 |
+   |                                                                 |
+   | 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 |
+   |                                                                 |
+   | 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 |
+   |                                                                 |
+   | 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 |
+   |                                                                 |
+   | 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 |
+   |                                                                 |
+   | 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 |
+   |                                                                 |
+   |  96  97  98  99 100 101 102 103 104 105 106 107 108 109 110 111 |
+   |                                                                 |
+   |  80  81  82  83  84  85  86  87  88  89  90  91  92  93  94  95 |
+   |                                                                 |
+   |  64  65  66  67  68  69  70  71  72  73  74  75  76  77  78  79 |
+   |---------                                                        |
+   |  48  49 \50  51  52  53  54  55  56  57  58  59  60  61  62  63 |
+   |           \                                                     |
+   |  32  33  34 \35  36  37  38  39  40  41  42  43  44  45  46  47 |
+   |               \                                                 |
+   |  16  17  18  19| 20  21  22  23  24  25  26  27  28  29  30  31 |
+   |                |                                                |
+   |   0   1   2   3|  4   5   6   7   8   9  10  11  12  13  14  15 |
+   +-----------------------------------------------------------------+
+*)
+
+
+(*
+   stop -
+*)
+
+PROCEDURE stop ;
+BEGIN
+END stop ;
+
+
+(*
+   Min -
+*)
+
+PROCEDURE Min (a, b: INTEGER) : INTEGER ;
+BEGIN
+   IF a<b
+   THEN
+      RETURN( a )
+   ELSE
+      RETURN( b )
+   END
+END Min ;
+
+
+(*
+   assert -
+*)
+
+PROCEDURE assert (b: BOOLEAN) ;
+BEGIN
+   IF NOT b
+   THEN
+      WriteString('assert failed') ; WriteLn ;
+      HALT
+   END
+END assert ;
+
+
+(*
+   initGraph - initialise, g, to empty.
+*)
+
+PROCEDURE initGraph (VAR g: Graph) ;
+VAR
+   i: CARDINAL ;
+BEGIN
+   FOR i := MIN(Squares) TO MAX(Squares) DO
+      g.graph[i].no   := 0 ;
+      g.graph[i].prev := MAX(Squares)+1 ;
+      g.graph[i].dist := MAX(Squares)+1
+   END
+END initGraph ;
+
+
+(*
+   isUsed - return whether a square, p, is in use on board, b.
+*)
+
+PROCEDURE isUsed (VAR b: Board; p: CARDINAL) : BOOLEAN ;
+BEGIN
+   RETURN p IN b.used
+END isUsed ;
+
+
+(*
+   isColour - return TRUE if a square, p, is used and contains a
+              piece of colour, c.
+*)
+
+PROCEDURE isColour (VAR b: Board; p: CARDINAL; c: Colour) : BOOLEAN ;
+BEGIN
+   WITH b DO
+      IF p IN used
+      THEN
+         CASE c OF
+
+         Blue:  RETURN (NOT (p IN colour[0])) AND (NOT (p IN colour[1])) |
+         Red :  RETURN (p IN colour[0]) AND (NOT (p IN colour[1])) |
+         Green: RETURN (NOT (p IN colour[0])) AND (p IN colour[1]) |
+         White: RETURN (p IN colour[0]) AND (p IN colour[1])
+
+         END
+      END
+   END ;
+   RETURN( FALSE )
+END isColour ;
+
+
+(*
+   dumpBase -
+*)
+
+PROCEDURE dumpBase (c: Colour) ;
+VAR
+   n, i: CARDINAL ;
+BEGIN
+   WriteString('dumpBase(c) where ORD(c)=') ; WriteCard(ORD(c), 3) ; WriteLn ;
+   n := 0 ;
+   FOR i := 0 TO MAX(Squares) DO
+      IF (n>0) AND ((n MOD 16) = 0)
+      THEN
+         WriteLn
+      END ;
+      IF i IN homeBase[c]
+      THEN
+         WriteChar('1')
+      ELSE
+         WriteChar('0')
+      END ;
+      INC(n)
+   END ;
+   WriteLn
+END dumpBase ;
+
+
+
+(*
+   addPiece - adds a piece, pos, of colour, c, to the board, b.
+*)
+
+PROCEDURE addPiece (VAR b: Board; pos: CARDINAL; c: Colour; piece: CARDINAL) ;
+BEGIN
+(*
+VAR
+   i: CARDINAL ;
+
+   IF pos IN homeBase[c]
+   THEN
+      WriteString('found ') ; WriteCard(pos, 3) ; WriteString(' in homeBase[c]') ;
+      WriteLn ;
+      dumpBase(c)
+   END ;
+*)
+
+   WITH b DO
+      INCL(used, pos) ;
+      CASE c OF
+
+      Blue:  EXCL(colour[0], pos) ;
+             EXCL(colour[1], pos) |
+      Red :  INCL(colour[0], pos) ;
+             EXCL(colour[1], pos) |
+      Green: EXCL(colour[0], pos) ;
+             INCL(colour[1], pos) |
+      White: INCL(colour[0], pos) ;
+             INCL(colour[1], pos)
+
+      END ;
+      pieces[c][piece] := pos ;
+      IF pos IN homeBase[c]
+      THEN
+         INC(home[c])
+      END
+   END
+END addPiece ;
+
+
+(*
+   subPiece - removes a piece at, pos, from the board, b.
+*)
+
+PROCEDURE subPiece (VAR b: Board; pos: CARDINAL; c: Colour) ;
+BEGIN
+   WITH b DO
+      EXCL(used, pos) ;
+      IF pos IN homeBase[c]
+      THEN
+         DEC(home[c])
+      END
+   END
+END subPiece ;
+
+
+(*
+   ifFreeAdd -
+*)
+
+PROCEDURE ifFreeAdd (condition: BOOLEAN; VAR b: Board; t: INTEGER; p: CARDINAL; c: Colour; VAR m: Moves) ;
+BEGIN
+   IF condition AND (NOT isUsed(b, t)) AND (NOT isRecorded(m, t, p))
+   THEN
+      recordMove(m, t, p)
+   END
+END ifFreeAdd ;
+
+
+(*
+   recordMove - adds tile, t, to piece, p, list of moves.
+*)
+
+PROCEDURE recordMove (VAR m: Moves; t: INTEGER; p: CARDINAL) ;
+BEGIN
+   WITH m DO
+      pieceList[pieceHead[p]] := t ;
+      INC(pieceHead[p])
+   END
+END recordMove ;
+
+
+(*
+   isRecorded - returns TRUE if tile, t, has been already entered as a
+                possible move for piece, p, on move list, m.
+*)
+
+PROCEDURE isRecorded (VAR m: Moves; t: INTEGER; p: CARDINAL) : BOOLEAN ;
+VAR
+   i, j: CARDINAL ;
+BEGIN
+   WITH m DO
+      j := pieceHead[p] ;
+      i := pieceHead[p-1]+1 ;
+      WHILE i<j DO
+         IF pieceList[i]=t
+         THEN
+            RETURN( TRUE )
+         END ;
+         INC(i)
+      END
+   END ;
+   RETURN( FALSE )
+END isRecorded ;
+
+
+(*
+   addSingle - adds a single move from a piece, testing all eight one square
+               moves.
+*)
+
+PROCEDURE addSingle (VAR b: Board; VAR m: Moves; c: Colour; p: CARDINAL) ;
+VAR
+   t   : INTEGER ;
+   x, y: INTEGER ;
+BEGIN
+   WITH b DO
+      t := VAL(INTEGER, pieces[c][p]) ;
+      x := t MOD BoardX ;
+      y := t DIV BoardX ;
+      (* vertical and horizontal *)
+
+      ifFreeAdd(x>0, b, t-1, p, c, m) ;                                  (* -1,  0 *)
+      ifFreeAdd(x<BoardX-1, b, t+1, p, c, m) ;                           (*  1,  0 *)
+      ifFreeAdd(y>0, b, t-BoardX, p, c, m) ;                             (*  0, -1 *)
+      ifFreeAdd(y<BoardY-1, b, t+BoardX, p, c, m) ;                      (*  0,  1 *)
+
+      (* diagonals *)
+      ifFreeAdd((x>0) AND (y>0), b, t-(BoardX+1), p, c, m) ;             (* -1, -1 *)
+      ifFreeAdd((x<BoardX-1) AND (y<BoardY-1), b, t+BoardX+1, p, c, m) ; (*  1,  1 *)
+
+      ifFreeAdd((x<BoardX-1) AND (y>0), b, t-(BoardX-1), p, c, m) ;      (*  1, -1 *)
+      ifFreeAdd((x>0) AND (y<BoardY-1), b, t+(BoardX-1), p, c, m)        (* -1,  1 *)
+   END
+END addSingle ;
+
+
+(*
+   addMultipleV -
+*)
+
+PROCEDURE addMultipleV (VAR b: Board; VAR m: Moves; c: Colour; p: CARDINAL; x, y, i, j: INTEGER) ;
+VAR
+   t   : CARDINAL ;
+   d, e: INTEGER ;
+BEGIN
+   d := 1 ;
+   IF i=0
+   THEN
+      IF j>0
+      THEN
+         e := (BoardY-y) DIV 2
+      ELSIF j<0
+      THEN
+         e := y DIV 2
+      END
+   ELSIF j=0
+   THEN
+      IF i>0
+      THEN
+         e := (BoardX-x) DIV 2
+      ELSIF i<0
+      THEN
+         e := x DIV 2
+      END
+   ELSE
+      IF (i=1) AND (j=1)
+      THEN
+         e := Min((BoardX-x) DIV 2, (BoardY-y) DIV 2)
+      ELSIF (i=-1) AND (j=1)
+      THEN
+         e := Min(x DIV 2, (BoardY-y) DIV 2)
+      ELSIF (i=-1) AND (j=-1)
+      THEN
+         e := Min(x DIV 2, y DIV 2)
+      ELSE
+         (* 1, -1 *)
+         e := Min((BoardX-x) DIV 2, y DIV 2)
+      END
+   END ;
+   LOOP
+      IF d>e
+      THEN
+         (* no point searching further as there is no room for the reflective jump *)
+         RETURN
+      END ;
+      x := x + i ;
+      y := y + j ;
+      IF (x<0) OR (y<0) OR (x>=BoardX) OR (y>=BoardY)
+      THEN
+         RETURN
+      END ;
+      t := VAL(CARDINAL, y)*BoardX+VAL(CARDINAL, x) ;
+      IF isUsed(b, t)
+      THEN
+         (* found pivot, keep looking for the destination *)
+         WHILE d>0 DO
+            x := x + i ;
+            y := y + j ;
+         (*
+            IF i>=0
+            THEN
+               INC(x, i)
+            ELSE
+               DEC(x, -i)
+            END ;
+            IF j>=0
+            THEN
+               INC(y, j)
+            ELSE
+               DEC(y, -j)
+            END ;
+         *)
+            IF (x<0) OR (y<0) OR (x>=BoardX) OR (y>=BoardY)
+            THEN
+               RETURN
+            END ;
+            t := VAL(CARDINAL, y)*BoardX+VAL(CARDINAL, x) ;
+            IF isUsed(b, t)
+            THEN
+               RETURN
+            END ;
+            DEC(d)
+         END ;
+         IF NOT isRecorded(m, t, p)
+         THEN
+            IF Debugging
+            THEN
+               WriteString('adding move ') ; WriteCard(t, 0) ; WriteLn
+            END ;
+            recordMove(m, t, p)
+         END ;
+         RETURN
+      END ;
+      INC(d)
+   END
+END addMultipleV ;
+
+
+(*
+   addMultiple - adds moves which involve jumping.  Current peg, p, is at at position
+                 indicated by, m.pieceList[low].
+*)
+
+PROCEDURE addMultiple (VAR b: Board; VAR m: Moves; c: Colour; p: CARDINAL; low: CARDINAL) ;
+VAR
+   t   : INTEGER ;
+   x, y: INTEGER ;
+BEGIN
+   WITH b DO
+      WHILE low<m.pieceHead[p] DO
+         t := VAL(INTEGER, m.pieceList[low]) ;
+         x := t MOD BoardX ;
+         y := t DIV BoardX ;
+         addMultipleV(b, m, c, p, x, y, -1,  0) ;
+         addMultipleV(b, m, c, p, x, y, -1,  1) ;
+         addMultipleV(b, m, c, p, x, y, -1, -1) ;
+
+         addMultipleV(b, m, c, p, x, y,  1,  0) ;
+         addMultipleV(b, m, c, p, x, y,  1,  1) ;
+         addMultipleV(b, m, c, p, x, y,  1, -1) ;
+
+         addMultipleV(b, m, c, p, x, y,  0,  1) ;
+         addMultipleV(b, m, c, p, x, y,  0, -1) ;
+         INC(low)
+      END
+   END
+END addMultiple ;
+
+
+(*
+   genMove - generate the moves for peg, p.
+*)
+
+PROCEDURE genMove (VAR b: Board; VAR m: Moves; c: Colour; p: CARDINAL) ;
+BEGIN
+   m.pieceHead[p] := m.pieceHead[p-1] ;
+   recordMove(m, b.pieces[c][p], p) ;
+   (* record the current position so we can ignore moving back to it *)
+   addMultiple(b, m, c, p, m.pieceHead[p]-1) ;
+   addSingle(b, m, c, p)
+END genMove ;
+
+
+(*
+   genMoves - generate the list of moves for colour, c, on board, b.
+              The board, b, is unaltered despite being passed by reference.
+*)
+
+PROCEDURE genMoves (VAR b: Board; VAR m: Moves; c: Colour) ;
+VAR
+   pos,
+   peg: CARDINAL ;
+BEGIN
+   m.pieceHead[0] := 0 ;
+   FOR peg := 1 TO Pieces DO
+      pos := b.pieces[c][peg] ;
+      subPiece(b, pos, c) ;     (* remove this peg while jumping (so we dont jump over ourself) *)
+      genMove(b, m, c, peg) ;
+      addPiece(b, pos, c, peg)  (* restore the peg *)
+   END
+END genMoves ;
+
+
+(*
+   addToGraph -
+*)
+
+PROCEDURE addToGraph (VAR g: Graph; from, to: CARDINAL) ;
+VAR
+   i: CARDINAL ;
+BEGIN
+   WITH g.graph[from] DO
+      i := 0 ;
+      WHILE i<no DO
+         IF list[i]=to
+         THEN
+            RETURN
+         ELSE
+            INC(i)
+         END
+      END ;
+      list[no] := to ;
+      INC(no)
+   END
+END addToGraph ;
+
+
+(*
+   ifFreeRecord -
+*)
+
+PROCEDURE ifFreeRecord (condition: BOOLEAN; VAR b: Board; t: INTEGER; p: CARDINAL;
+                        c: Colour; VAR m: Moves; from: CARDINAL; VAR g: Graph) ;
+BEGIN
+   IF condition AND (NOT isUsed(b, t)) AND (NOT isRecorded(m, t, p))
+   THEN
+      recordMove(m, t, p) ;
+      addToGraph(g, from, t)
+   END
+END ifFreeRecord ;
+
+
+(*
+   recordSingle - adds a single move from a piece, testing all eight one square
+                  moves.
+*)
+
+PROCEDURE recordSingle (VAR b: Board; VAR m: Moves; c: Colour;
+                        p: CARDINAL; from: CARDINAL; VAR g: Graph) ;
+VAR
+   t   : INTEGER ;
+   x, y: INTEGER ;
+BEGIN
+   WITH b DO
+      t := VAL(INTEGER, pieces[c][p]) ;
+      x := t MOD BoardX ;
+      y := t DIV BoardX ;
+      (* vertical and horizontal *)
+
+      ifFreeRecord(x>0, b, t-1, p, c, m, from, g) ;                                  (* -1,  0 *)
+      ifFreeRecord(x<BoardX-1, b, t+1, p, c, m, from, g) ;                           (*  1,  0 *)
+      ifFreeRecord(y>0, b, t-BoardX, p, c, m, from, g) ;                             (*  0, -1 *)
+      ifFreeRecord(y<BoardY-1, b, t+BoardX, p, c, m, from, g) ;                      (*  0,  1 *)
+
+      (* diagonals *)
+      ifFreeRecord((x>0) AND (y>0), b, t-(BoardX+1), p, c, m, from, g) ;             (* -1, -1 *)
+      ifFreeRecord((x<BoardX-1) AND (y<BoardY-1), b, t+BoardX+1, p, c, m, from, g) ; (*  1,  1 *)
+
+      ifFreeRecord((x<BoardX-1) AND (y>0), b, t-(BoardX-1), p, c, m, from, g) ;      (*  1, -1 *)
+      ifFreeRecord((x>0) AND (y<BoardY-1), b, t+(BoardX-1), p, c, m, from, g)        (* -1,  1 *)
+   END
+END recordSingle ;
+
+
+(*
+   recordMultipleV -
+*)
+
+PROCEDURE recordMultipleV (VAR b: Board; VAR m: Moves; c: Colour;
+                           p: CARDINAL; x, y, i, j: INTEGER;
+                           from: CARDINAL; VAR g: Graph) ;
+VAR
+   t   : CARDINAL ;
+   d, e: INTEGER ;
+BEGIN
+   d := 1 ;
+   IF i=0
+   THEN
+      IF j>0
+      THEN
+         e := (BoardY-y) DIV 2
+      ELSIF j<0
+      THEN
+         e := y DIV 2
+      END
+   ELSIF j=0
+   THEN
+      IF i>0
+      THEN
+         e := (BoardX-x) DIV 2
+      ELSIF i<0
+      THEN
+         e := x DIV 2
+      END
+   ELSE
+      IF (i=1) AND (j=1)
+      THEN
+         e := Min((BoardX-x) DIV 2, (BoardY-y) DIV 2)
+      ELSIF (i=-1) AND (j=1)
+      THEN
+         e := Min(x DIV 2, (BoardY-y) DIV 2)
+      ELSIF (i=-1) AND (j=-1)
+      THEN
+         e := Min(x DIV 2, y DIV 2)
+      ELSE
+         (* 1, -1 *)
+         e := Min((BoardX-x) DIV 2, y DIV 2)
+      END
+   END ;
+   LOOP
+      IF d>e
+      THEN
+         (* no point searching further as there is no room for the reflective jump *)
+         RETURN
+      END ;
+      x := x + i ;
+      y := y + j ;
+      IF (x<0) OR (y<0) OR (x>=BoardX) OR (y>=BoardY)
+      THEN
+         RETURN
+      END ;
+      t := VAL(CARDINAL, y)*BoardX+VAL(CARDINAL, x) ;
+      IF isUsed(b, t)
+      THEN
+         (* found pivot, keep looking for the destination *)
+         WHILE d>0 DO
+            x := x + i ;
+            y := y + j ;
+            IF (x<0) OR (y<0) OR (x>=BoardX) OR (y>=BoardY)
+            THEN
+               RETURN
+            END ;
+            t := VAL(CARDINAL, y)*BoardX+VAL(CARDINAL, x) ;
+            IF isUsed(b, t)
+            THEN
+               RETURN
+            END ;
+            DEC(d)
+         END ;
+         IF NOT isRecorded(m, t, p)
+         THEN
+            IF Debugging
+            THEN
+               WriteString('adding move ') ; WriteCard(t, 0) ; WriteLn
+            END ;
+            recordMove(m, t, p) ;
+            addToGraph(g, from, t) ;
+            addToGraph(g, t, from)
+         END ;
+         RETURN
+      END ;
+      INC(d)
+   END
+END recordMultipleV ;
+
+
+(*
+   recordMultiple - adds moves which involve jumping.  Current peg, p, is at at position
+                    indicated by, m.pieceList[low].
+*)
+
+PROCEDURE recordMultiple (VAR b: Board; VAR m: Moves; c: Colour;
+                          p: CARDINAL; low: CARDINAL; VAR g: Graph) ;
+VAR
+   from: INTEGER ;
+   x, y: INTEGER ;
+BEGIN
+   WITH b DO
+      WHILE low<m.pieceHead[p] DO
+         from := VAL(INTEGER, m.pieceList[low]) ;
+         x := from MOD BoardX ;
+         y := from DIV BoardX ;
+         recordMultipleV(b, m, c, p, x, y, -1,  0, from, g) ;
+         recordMultipleV(b, m, c, p, x, y, -1,  1, from, g) ;
+         recordMultipleV(b, m, c, p, x, y, -1, -1, from, g) ;
+
+         recordMultipleV(b, m, c, p, x, y,  1,  0, from, g) ;
+         recordMultipleV(b, m, c, p, x, y,  1,  1, from, g) ;
+         recordMultipleV(b, m, c, p, x, y,  1, -1, from, g) ;
+
+         recordMultipleV(b, m, c, p, x, y,  0,  1, from, g) ;
+         recordMultipleV(b, m, c, p, x, y,  0, -1, from, g) ;
+         INC(low)
+      END
+   END
+END recordMultiple ;
+
+
+(*
+   recMove - generate the moves for peg, p.
+*)
+
+PROCEDURE recMove (VAR b: Board; VAR m: Moves; c: Colour;
+                   p: CARDINAL; from: CARDINAL; VAR g: Graph) ;
+BEGIN
+   m.pieceHead[p-1] := 0 ;
+   m.pieceHead[p] := 0 ;
+   recordMove(m, from, p) ;
+   (* record the current position so we can ignore moving back to it *)
+   recordMultiple(b, m, c, p, m.pieceHead[p]-1, g) ;
+   recordSingle(b, m, c, p, from, g)
+END recMove ;
+
+
+(*
+   recMoves - generate the list of moves for colour, c, on board, b, and record each
+              move in r.
+              The board, b, is unaltered despite being passed by reference.
+*)
+
+PROCEDURE recMoves (VAR b: Board; VAR m: Moves; c: Colour;
+                    peg: CARDINAL; from: CARDINAL; VAR g: Graph) ;
+VAR
+   pos: CARDINAL ;
+BEGIN
+   pos := b.pieces[c][peg] ;
+   subPiece(b, pos, c) ;        (* remove this peg while jumping (so we dont jump over ourself) *)
+   initGraph(g) ;
+   recMove(b, m, c, peg, from, g) ;
+   addPiece(b, pos, c, peg)  (* restore the peg *)
+END recMoves ;
+
+
+(*
+   WriteColour - displays the colour, c.
+*)
+
+PROCEDURE WriteColour (c: Colour) ;
+BEGIN
+   CASE c OF
+
+   White:  WriteString('white') |
+   Blue :  WriteString('blue') |
+   Green:  WriteString('green') |
+   Red  :  WriteString('red')
+
+   END
+END WriteColour ;
+
+
+(*
+   getFirstPos -
+*)
+
+PROCEDURE getFirstPos (s: ARRAY OF CHAR; VAR b: Board; c: Colour) : CARDINAL ;
+VAR
+   from: CARDINAL ;
+   x   : CHAR ;
+   y   : CARDINAL ;
+   res : ConvResults ;
+BEGIN
+   IF Length(s)>0
+   THEN
+      x := CAP(s[0]) ;
+      IF x='?'
+      THEN
+         displayAllMoves(b, c)
+      ELSIF (x>='A') AND (x<='P')
+      THEN
+         from := ORD (x) - ORD ('A') ;
+         s[0] := '0' ;
+         IF Length(s)>0
+         THEN
+            StrToCard(s, y, res) ;
+            IF (res=strAllRight) AND ((y=0) OR (y>BoardY))
+            THEN
+               WriteString('Please enter a number between [1-16]') ; WriteLn
+            ELSE
+               from := from+(y-1)*BoardY ;
+               IF isUsed(b, from) AND isColour(b, from, c)
+               THEN
+                  RETURN from
+               ELSE
+                  WriteString('That position is occupied by your opponent') ; WriteLn
+               END
+            END
+         END
+      ELSE
+         WriteString('please enter a letter [A-P] followed by a number [1-16]') ; WriteLn
+      END
+   END ;
+   RETURN BoardSize
+END getFirstPos ;
+
+
+(*
+   getSecondPos -
+*)
+
+PROCEDURE getSecondPos (s: ARRAY OF CHAR; VAR b: Board; c: Colour; peg: CARDINAL) : CARDINAL ;
+VAR
+   from: CARDINAL ;
+   x   : CHAR ;
+   y   : CARDINAL ;
+   res : ConvResults ;
+BEGIN
+   IF Length(s)>0
+   THEN
+      x := CAP(s[0]) ;
+      IF x='?'
+      THEN
+         displayMovesPeg(b, c, peg) ;
+         displayBoardPeg(b, c, peg)
+      ELSIF (x>='A') AND (x<='P')
+      THEN
+         from := ORD (x) - ORD ('A') ;
+         s[0] := '0' ;
+         IF Length(s)>0
+         THEN
+            StrToCard(s, y, res) ;
+            IF (res=strAllRight) AND ((y=0) OR (y>BoardY))
+            THEN
+               WriteString('Please enter a number between [1-16]') ; WriteLn
+            ELSE
+               from := from+(y-1)*BoardY ;
+               IF NOT isUsed(b, from)
+               THEN
+                  RETURN from
+               ELSIF isColour(b, from, c)
+               THEN
+                  WriteString('That position is already occupied by another of your pegs') ; WriteLn
+               ELSE
+                  WriteString('That position is occupied by your opponent') ; WriteLn
+               END
+            END
+         END
+      ELSE
+         WriteString('please enter a letter [A-P] followed by a number [1-16]') ; WriteLn
+      END
+   END ;
+   RETURN BoardSize
+END getSecondPos ;
+
+
+(*
+   getPeg -
+*)
+
+PROCEDURE getPeg (VAR b: Board; c: Colour; from: CARDINAL) : CARDINAL ;
+VAR
+   p: CARDINAL ;
+BEGIN
+   FOR p := 1 TO Pieces DO
+      IF b.pieces[c][p]=from
+      THEN
+         RETURN p
+      END
+   END ;
+   HALT ;
+   RETURN Pieces+1
+END getPeg ;
+
+
+(*
+   checkLegal -
+*)
+
+PROCEDURE checkLegal (VAR b: Board; col: Colour; from, to: CARDINAL; peg: CARDINAL) : BOOLEAN ;
+VAR
+   m   : Moves ;
+   i, j: CARDINAL ;
+BEGIN
+   IF (to=BoardSize) OR (from=BoardSize)
+   THEN
+      RETURN FALSE
+   END ;
+   genMoves(b, m, col) ;
+   IF from#b.pieces[col][peg]
+   THEN
+      RETURN FALSE
+   END ;
+   i := m.pieceHead[peg-1]+1 ;  (* skip the initial move *)
+   j := m.pieceHead[peg] ;
+   WHILE i<j DO
+      IF to=m.pieceList[i]
+      THEN
+         RETURN TRUE
+      END ;
+      INC(i)
+   END ;
+   RETURN FALSE
+END checkLegal ;
+
+
+(*
+   noOfMoves - returns the number of moves held in, m.
+*)
+
+PROCEDURE noOfMoves (VAR m: Moves) : CARDINAL ;
+VAR
+   n, p, i, j: CARDINAL ;
+BEGIN
+   n := 0 ;
+   FOR p := 1 TO Pieces DO
+      i := m.pieceHead[p-1]+1 ;  (* skip the initial move *)
+      j := m.pieceHead[p] ;
+      WHILE i<j DO
+         INC(n) ;
+         INC(i)
+      END
+   END ;
+   RETURN n
+END noOfMoves ;
+
+
+(*
+   askMove - returns a move entered.
+*)
+
+PROCEDURE askMove (VAR b: Board; c: Colour; VAR peg: CARDINAL) : CARDINAL ;
+VAR
+   s       : ARRAY [0..80] OF CHAR ;
+   y,
+   from, to: CARDINAL ;
+   res     : ConvResults ;
+BEGIN
+   LOOP
+      WriteString('Please enter your move, from, ') ;
+      WriteColour(c) ;
+      WriteString(' ') ;
+      ReadToken(s) ;
+      SkipLine ;
+      from := getFirstPos(s, b, c) ;
+      IF from=BoardSize
+      THEN
+         WriteString('please try again...') ; WriteLn
+      ELSE
+         WriteString('now please enter your move, to, ') ;
+         WriteColour(c) ;
+         WriteString(' ') ;
+         ReadToken(s) ;
+         SkipLine ;
+         peg := getPeg(b, c, from) ;
+         to := getSecondPos(s, b, c, peg) ;
+         IF checkLegal(b, c, from, to, peg)
+         THEN
+            WriteString('you are ') ;
+            showMove(b, c, peg, from, to) ;
+            RETURN to
+         END
+      END
+   END
+END askMove ;
+
+
+(*
+   opponent - returns the opponents colour.
+*)
+
+PROCEDURE opponent (col: Colour) : Colour ;
+BEGIN
+   IF col=Red
+   THEN
+      RETURN Blue
+   ELSE
+      RETURN Red
+   END
+END opponent ;
+
+
+(*
+   maximumScore - returns TRUE if the maximim score was found.
+*)
+
+PROCEDURE maximumScore (score: INTEGER) : BOOLEAN ;
+BEGIN
+   RETURN (score<=MinScore) OR (score>=MaxScore)
+END maximumScore ;
+
+
+(*
+   calcScoreForPos - returns the score for Colour, c, pos, on Board, b.
+*)
+
+PROCEDURE calcScoreForPos (VAR b: Board; c: Colour; pos: CARDINAL) : INTEGER ;
+VAR
+   home,
+   x, y: CARDINAL ;
+BEGIN
+   IF c=Red
+   THEN
+      pos := (BoardSize-1) - pos
+   ELSIF c=Blue
+   THEN
+      (* nothing to do *)
+   ELSE
+      HALT  (* not implemented yet *)
+   END ;
+   IF pos IN homeBase[c]
+   THEN
+      home := HomeWeight
+   ELSE
+      home := 0
+   END ;
+
+   (* our score is dependant upon how far this piece is away from the opposite corner *)
+   x := pos MOD BoardX ;
+   y := pos DIV BoardY ;
+   IF x>y
+   THEN
+      (* max squares from 0,0 *)
+      RETURN BoardX-x+home
+   ELSE
+      RETURN BoardY-y+home
+   END
+END calcScoreForPos ;
+
+
+(*
+   calcScoreFor - returns the score for Colour, c.
+*)
+
+PROCEDURE calcScoreFor (VAR b: Board; c: Colour) : INTEGER ;
+VAR
+   score: INTEGER ;
+   p    : CARDINAL ;
+BEGIN
+   score := 0 ;
+   FOR p := 1 TO Pieces DO
+      INC(score, calcScoreForPos(b, c, b.pieces[c][p]))
+   END ;
+   RETURN score
+END calcScoreFor ;
+
+
+(*
+   updateMove -
+*)
+
+PROCEDURE updateMove (VAR b: Board; col: Colour; peg: CARDINAL; topos: CARDINAL) ;
+VAR
+   frompos: CARDINAL ;
+BEGIN
+   frompos := b.pieces[col][peg] ;
+   subPiece(b, frompos, col) ;
+   addPiece(b, topos, col, peg)
+END updateMove ;
+
+
+(*
+   retractMove -
+*)
+
+PROCEDURE retractMove (VAR b: Board; col: Colour; peg: CARDINAL; topos: CARDINAL) ;
+BEGIN
+   updateMove(b, col, peg, topos)
+END retractMove ;
+
+
+(*
+   calcScore - make the move and update the score.
+*)
+
+PROCEDURE calcScore (VAR b: Board; score: INTEGER; peg: CARDINAL;
+                     topos: CARDINAL; col: Colour) : INTEGER ;
+VAR
+   i, j, k: INTEGER ;
+BEGIN
+   IF slowEvaluation
+   THEN
+      (* compute the score by examine each peg in turn *)
+      updateMove(b, col, peg, topos) ;
+
+      (* check whether one side has won *)
+      IF b.home[Blue]=Pieces
+      THEN
+         RETURN MaxScore
+      ELSIF b.home[Red]=Pieces
+      THEN
+         RETURN MinScore
+      END ;
+
+      RETURN calcScoreFor(b, Blue) - calcScoreFor(b, Red)
+   ELSE
+      i := calcScoreForPos(b, col, b.pieces[col][peg]) ;
+      updateMove(b, col, peg, topos) ;  (* move the peg *)
+
+      (* check whether one side has won *)
+      IF b.home[Blue]=Pieces
+      THEN
+         RETURN MaxScore
+      ELSIF b.home[Red]=Pieces
+      THEN
+         RETURN MinScore
+      END ;
+
+      j := calcScoreForPos(b, col, topos) ;
+      IF col=Red
+      THEN
+         score := score + i - j
+      ELSE
+         score := score - i + j
+      END ;
+      IF Debugging
+      THEN
+         k := calcScoreFor(b, Blue) - calcScoreFor(b, Red) ;
+         IF score#k
+         THEN
+            HALT
+         END
+      END ;
+      RETURN score
+   END
+END calcScore ;
+
+
+(*
+   alphaBeta - returns the score estimated should move, pos, be chosen.
+               The board, b, and score is in the state _before_ move pos
+               is made.
+*)
+
+PROCEDURE alphaBeta (peg: CARDINAL; frompos, topos: CARDINAL;
+                     VAR b: Board; col: Colour;
+                     depth: CARDINAL;
+                     alpha, beta, score: INTEGER) : INTEGER ;
+VAR
+   try     : INTEGER ;
+   i, j,
+   n, p    : CARDINAL ;
+   m       : Moves ;
+   from, to: CARDINAL ;
+   op      : Colour ;
+BEGIN
+   score := calcScore(b, score, peg, topos, col) ;   (* make move and update score *)
+   IF (depth=0) OR maximumScore(score)
+   THEN
+      retractMove(b, col, peg, frompos) ;
+      INC(count) ;
+      IF col=Red
+      THEN
+         RETURN score+VAL(INTEGER, depth)
+      ELSE
+         RETURN score-VAL(INTEGER, depth)
+      END
+   ELSE
+      op := opponent(col) ;
+      genMoves(b, m, op) ;
+      IF op=Blue
+      THEN
+         (* blue to move, move is possible, continue searching *)
+         FOR p := 1 TO Pieces DO
+            from := b.pieces[op][p] ;
+            i := m.pieceHead[p-1]+1 ;  (* skip the initial move *)
+            j := m.pieceHead[p] ;
+            WHILE i<j DO
+               to := m.pieceList[i] ;
+               try := alphaBeta(p, from, to,
+                                b, op, depth-1, alpha, beta, score) ;
+               IF try > alpha
+               THEN
+                  (* found a better move *)
+                  alpha := try
+               END ;
+               IF alpha >= beta
+               THEN
+                  retractMove(b, col, peg, frompos) ;
+                  RETURN alpha
+               END ;
+               INC(i)
+            END
+         END ;
+         retractMove(b, col, peg, frompos) ;
+         RETURN alpha
+      ELSE
+         (* red to move, move is possible, continue searching *)
+         FOR p := 1 TO Pieces DO
+            from := b.pieces[op][p] ;
+            i := m.pieceHead[p-1]+1 ;  (* skip the initial move *)
+            j := m.pieceHead[p] ;
+            WHILE i<j DO
+               to := m.pieceList[i] ;
+               try := alphaBeta(p, from, to,
+                                b, op, depth-1, alpha, beta, score) ;
+               IF try < beta
+               THEN
+                  (* found a better move *)
+                  beta := try
+               END ;
+               IF alpha >= beta
+               THEN
+                  (* no point searching further as Red would choose
+                   a different previous move *)
+                  retractMove(b, col, peg, frompos) ;
+                  RETURN beta
+               END ;
+               INC(i)
+            END
+         END ;
+         retractMove(b, col, peg, frompos) ;
+         RETURN beta   (* the best score for a move Blue has found *)
+      END
+   END
+END alphaBeta ;
+
+
+(*
+   makeMove - computer makes a move for colour, col.
+*)
+
+PROCEDURE makeMove (VAR b: Board; col: Colour; score: INTEGER; VAR peg: CARDINAL) : INTEGER ;
+VAR
+   no        : CARDINAL ;
+   p, from,
+   frompos,
+   topos, to : CARDINAL ;
+   start, end: Timeval ;
+   try,
+   r, best   : INTEGER ;
+   secS, usec,
+   secE, i, j: CARDINAL ;
+   m         : Moves ;
+   plies     : CARDINAL ;
+   outOfTime : BOOLEAN ;
+BEGIN
+   start := InitTime(0, 0) ;
+   end := InitTime(0, 0) ;
+
+   r := GetTimeOfDay(start) ;
+   best := MinScore-1 ;   (* worst than minimum score so we will choose a loosing move if forced *)
+
+   count := 0 ;
+   i := 0 ;
+   genMoves(b, m, col) ;
+   no := noOfMoves(m) ;
+   peg := Pieces+1 ;
+   outOfTime := FALSE ;
+   plies := 0 ;
+   frompos := BoardSize ;
+   topos := BoardSize ;
+   REPEAT
+      WriteString("I'm going to look ") ;
+      WriteCard(plies, 0) ; WriteString(' moves ahead') ; WriteLn ;
+
+      FOR p := 1 TO Pieces DO
+         from := b.pieces[col][p] ;
+         i := m.pieceHead[p-1]+1 ;  (* skip the initial move *)
+         j := m.pieceHead[p] ;
+         IF (no=1) AND (i<j)
+         THEN
+            (* only one move and this peg can move, therefore dont bother evaluating the move, just play it *)
+            to := m.pieceList[i] ;
+            frompos := from ;
+            best := 0 ;
+            topos := to ;
+            peg := p
+         ELSE
+            WHILE (i<j) AND (NOT outOfTime) DO
+               r := GetTimeOfDay(end) ;
+               GetTime(start, secS, usec) ;
+               GetTime(end, secE, usec) ;
+               outOfTime := (secE-secS > Thinking) ;
+
+               IF outOfTime
+               THEN
+                  WriteString('out of time...') ; WriteLn
+               ELSE
+                  to := m.pieceList[i] ;
+                  try := alphaBeta(p, from, to,
+                                   b, col, plies,
+                                   MinScore, MaxScore, score) ;
+                  IF try>best
+                  THEN
+                     best := try ;
+                     topos := to ;
+                     frompos := from ;
+                     peg := p
+                  END
+               END ;
+               INC(i)
+            END
+         END
+      END ;
+      IF (NOT outOfTime) AND (frompos<BoardSize) AND (topos<BoardSize)
+      THEN
+         WriteString('so far I think the best move is from') ;
+         writePosition(frompos) ;
+         WriteString(' to') ;
+         writePosition(topos) ;
+         WriteLn
+      END ;
+      INC(plies)
+   UNTIL (no<2) OR outOfTime ;
+
+   IF best >= WinScore
+   THEN
+      WriteString('I think I can force a win') ; WriteLn
+   END ;
+   IF best <= LooseScore
+   THEN
+      WriteString('You should be able to force a win') ; WriteLn
+   END ;
+
+   IF no=1
+   THEN
+      WriteString('I can only play one move, so there is little point wasting time') ; WriteLn
+   ELSIF no=0
+   THEN
+      WriteString('I cannot move, so there is little point wasting time') ; WriteLn
+   ELSE
+      WriteString('I took ') ; WriteCard(secE-secS, 0) ;
+      WriteString(' seconds and evaluated ') ;
+      WriteCard(count, 0) ; WriteString(' positions,') ; WriteLn ;
+   END ;
+
+   start := KillTime(start) ;
+   end := KillTime(end) ;
+   RETURN topos
+END makeMove ;
+
+
+(*
+   test -
+*)
+
+PROCEDURE test ;
+VAR
+   b  : Board ;
+   c  : Colour ;
+   s  : INTEGER ;
+   peg,
+   to : CARDINAL ;
+BEGIN
+   initBoard(b) ;
+   c := Red ;
+   s := 0 ;
+   displayBoard(b) ;
+   peg := getPeg(b, c, 4) ;
+   displayBoardPeg(b, c, peg) ;
+   to := 36 ;
+   s := calcScore(b, s, peg, to, c) ;
+
+
+
+   peg := 5 ;
+   c := opponent(c) ;
+   peg := getPeg(b, c, 12*BoardX+15) ;
+   to := 12*BoardX+13 ;
+   s := calcScore(b, s, peg, to, c) ;
+   displayBoardPeg(b, c, peg) ;
+
+
+
+   c := Red ;
+   displayBoard(b) ;
+   peg := getPeg(b, c, 36) ;
+   stop ;
+   displayBoardPeg(b, c, peg) ;
+   to := 4 ;
+   s := calcScore(b, s, peg, to, c) ;
+   displayBoardPeg(b, c, peg) ;
+
+END test ;
+
+
+(*
+   displayHow -
+*)
+
+PROCEDURE displayHow (from, to: CARDINAL; VAR rec: ARRAY OF CARDINAL; r: CARDINAL) ;
+VAR
+   i: CARDINAL ;
+BEGIN
+   writePosition(from) ; WriteString(' can move to ') ; writePosition(to) ; WriteString(' by: ') ;
+   i := 0 ;
+   WHILE (i<r) AND (i<=HIGH(rec)) DO
+      writePosition(rec[i])
+   END ;
+   WriteLn
+END displayHow ;
+
+
+(*
+   addToList -
+*)
+
+PROCEDURE addToList (VAR choices: ARRAY OF CARDINAL; VAR n: CARDINAL; from: CARDINAL) ;
+VAR
+   i: CARDINAL ;
+BEGIN
+   i := 0 ;
+   WHILE i<n DO
+      IF choices[i]=from
+      THEN
+         RETURN
+      END ;
+      INC(i)
+   END ;
+   choices[n] := from ;
+   INC(n)
+END addToList ;
+
+
+(*
+   subBest -
+*)
+
+PROCEDURE subBest (VAR choices: ARRAY OF CARDINAL; VAR n: CARDINAL; VAR g: Graph) : CARDINAL ;
+VAR
+   b: CARDINAL ;
+   i, j, k: CARDINAL ;
+BEGIN
+   k := choices[0] ;
+   b := g.graph[k].dist ;
+   i := 1 ;
+   WHILE i<n DO
+      IF g.graph[choices[i]].dist<b
+      THEN
+         k := choices[i] ;
+         b := g.graph[k].dist
+      END ;
+      INC(i)
+   END ;
+   (* remove, k, from, choices *)
+   i := 0 ;
+   j := 0 ;
+   WHILE i<n DO
+      IF i#j
+      THEN
+         choices[i] := choices[j] ;
+         INC(i) ;
+      ELSIF choices[i]#k
+      THEN
+         INC(i)
+      END ;
+      INC(j)
+   END ;
+   DEC(n) ;
+   RETURN k
+END subBest ;
+
+
+(*
+   dijkstra -
+*)
+
+PROCEDURE dijkstra (from, to: CARDINAL; VAR g: Graph) ;
+VAR
+   visited: SoS ;
+   choices: ARRAY Squares OF CARDINAL ;
+   alt,
+   n, i   : CARDINAL ;
+   u, v   : CARDINAL ;
+BEGIN
+   g.graph[from].dist := 0 ;
+   g.graph[from].prev := from ;
+   visited := SoS{from} ;
+   n := 0 ;
+   addToList(choices, n, from) ;
+   WHILE n#0 DO
+      u := subBest(choices, n, g) ;
+      IF u=to
+      THEN
+         RETURN
+      ELSE
+         WITH g.graph[u] DO
+            i := 0 ;
+            WHILE i<no DO
+               v := list[i] ;
+               IF NOT (v IN visited)
+               THEN
+                  INCL(visited, v) ;
+                  addToList(choices, n, v) ;
+                  alt := dist + 1 ;
+                  IF alt<g.graph[v].dist
+                  THEN
+                     g.graph[v].dist := alt ;
+                     g.graph[v].prev := u
+                  END
+               END ;
+               INC(i)
+            END
+         END
+      END
+   END
+END dijkstra ;
+
+
+(*
+   showRoute -
+*)
+
+PROCEDURE showRoute (from, to: CARDINAL; VAR g: Graph) ;
+BEGIN
+   IF from#to
+   THEN
+      showRoute(from, g.graph[to].prev, g)
+   END ;
+   IF from=to
+   THEN
+      WriteString(' from')
+   ELSE
+      WriteString(' to')
+   END ;
+   writePosition(to)
+END showRoute ;
+
+
+(*
+   showMove - show how, peg, can move, from, to, on board, b.
+*)
+
+PROCEDURE showMove (VAR b: Board;
+                    c: Colour; peg: CARDINAL; from, to: CARDINAL) ;
+VAR
+   m: Moves ;
+   g: Graph ;
+BEGIN
+   recMoves(b, m, c, peg, from, g) ;
+   dijkstra(from, to, g) ;
+   WriteString('moving peg') ;
+   showRoute(from, to, g) ;
+   WriteLn
+END showMove ;
+
+
+(*
+   play -
+*)
+
+PROCEDURE play ;
+VAR
+   b       : Board ;
+   c       : Colour ;
+   s       : INTEGER ;
+   peg,
+   to, from: CARDINAL ;
+BEGIN
+   initBoard(b) ;
+   c := Red ;
+   s := 0 ;
+   displayBoard(b) ;
+   RETURN ;   (* remove this line of code if you really want to play the game.  *)
+   LOOP
+      to := askMove(b, c, peg) ;
+      s := calcScore(b, s, peg, to, c) ;
+      displayBoard(b) ;
+      WriteString('Current score = ') ; WriteInt(s, 0) ; WriteLn ;
+      IF s<=MinScore
+      THEN
+         WriteString('Well done you win') ; WriteLn ;
+         RETURN
+      END ;
+      c := opponent(c) ;
+      to := makeMove(b, c, s, peg) ;
+      IF peg>Pieces
+      THEN
+         WriteString('I cannot move') ; WriteLn
+      ELSE
+         from := b.pieces[c][peg] ;
+         WriteString('I am ') ;
+         showMove(b, c, peg, from, to) ;
+         s := calcScore(b, s, peg, to, c) ;
+         displayBoard(b) ;
+         WriteString('Current score = ') ; WriteInt(s, 0) ; WriteLn ;
+         IF s>=MaxScore
+         THEN
+            WriteString('Good try, but I win') ; WriteLn ;
+            RETURN
+         END
+      END ;
+      c := opponent(c)
+   END
+END play ;
+
+
+(*
+   writePosition -
+*)
+
+PROCEDURE writePosition (x: CARDINAL) ;
+BEGIN
+   WriteChar(' ') ;
+   WriteChar(CHR(ORD('a')+x MOD BoardX)) ;
+   WriteCard(x DIV BoardX+1, 0)
+END writePosition ;
+
+
+(*
+   displayMovesForPeg -
+*)
+
+PROCEDURE displayMovesForPeg (VAR b: Board; m: Moves; c: Colour; peg: CARDINAL) ;
+VAR
+   p, i, j: CARDINAL ;
+BEGIN
+   WriteString('peg at') ;
+   writePosition(b.pieces[c][peg]) ;
+   IF m.pieceHead[peg-1]+1<m.pieceHead[peg]
+   THEN
+      WriteString(' can move to ') ;
+      i := m.pieceHead[peg-1]+1 ;  (* skip the initial move *)
+      j := m.pieceHead[peg] ;
+      WHILE i<j DO
+         writePosition(m.pieceList[i]) ;
+         WriteString(' ') ;
+         INC(i)
+      END ;
+      WriteLn
+   ELSE
+      WriteString(' cannot move') ; WriteLn
+   END
+END displayMovesForPeg ;
+
+
+(*
+   displayMoves -
+*)
+
+PROCEDURE displayMoves (VAR b: Board; m: Moves; c: Colour) ;
+VAR
+   p, i, j: CARDINAL ;
+BEGIN
+   WriteString('possible moves are ') ; WriteLn ;
+   FOR p := 1 TO Pieces DO
+      IF m.pieceHead[p-1]+1<m.pieceHead[p]
+      THEN
+         WriteString('piece at position ') ;
+         writePosition(b.pieces[c][p]) ;
+         WriteString(' can move to ') ;
+         i := m.pieceHead[p-1]+1 ;  (* skip the initial move *)
+         j := m.pieceHead[p] ;
+         WHILE i<j DO
+            writePosition(m.pieceList[i]) ;
+            WriteString(' ') ;
+            INC(i)
+         END ;
+         WriteLn
+      END
+   END
+END displayMoves ;
+
+
+(*
+   displayAllMoves -
+*)
+
+PROCEDURE displayAllMoves (VAR b: Board; c: Colour) ;
+VAR
+   m: Moves ;
+BEGIN
+   genMoves(b, m, c) ;
+   displayMoves(b, m, c)
+END displayAllMoves ;
+
+
+(*
+   displayMovesPeg -
+*)
+
+PROCEDURE displayMovesPeg (VAR b: Board; c: Colour; peg: CARDINAL) ;
+VAR
+   m: Moves ;
+BEGIN
+   genMoves(b, m, c) ;
+   displayMovesForPeg(b, m, c, peg)
+END displayMovesPeg ;
+
+
+(*
+   initBoard -
+*)
+
+PROCEDURE initBoard (VAR b: Board) ;
+BEGIN
+   b.used := SoS {} ;
+   b.colour[0] := SoS {} ;
+   b.colour[1] := SoS {} ;
+   b.home[Blue] := 0 ;
+   b.home[Red] := 0 ;
+   b.home[Green] := 0 ;
+   b.home[White] := 0 ;
+   IF TwoPlayer OR FourPlayer
+   THEN
+      homeBase[Blue] := SoS{0, 1, 2, 3,
+                            16, 17, 18, 19,
+                            32, 33, 34,
+                            48, 49} ;
+      IF Debugging
+      THEN
+         dumpBase(Blue) ;
+         dumpBase(Red)
+      END ;
+
+      homeBase[Red] := SoS{255-0, 255-1, 255-2, 255-3,
+                           255-16, 255-17, 255-18, 255-19,
+                           255-32, 255-33, 255-34,
+                           255-48, 255-49} ;
+      IF Debugging
+      THEN
+         dumpBase(Red) ;
+         dumpBase(Blue)
+      END ;
+
+      (* red *)
+      addPiece(b,  0, Red, 1) ;
+      addPiece(b,  1, Red, 2) ;
+      addPiece(b,  2, Red, 3) ;
+      addPiece(b,  3, Red, 4) ;
+      addPiece(b, 16, Red, 5) ;
+      addPiece(b, 17, Red, 6) ;
+      addPiece(b, 18, Red, 7) ;
+      addPiece(b, 19, Red, 8) ;
+      addPiece(b, 32, Red, 9) ;
+      addPiece(b, 33, Red, 10) ;
+      addPiece(b, 34, Red, 11) ;
+      addPiece(b, 48, Red, 12) ;
+      addPiece(b, 49, Red, 13) ;
+
+      (* blue *)
+      addPiece(b, 255-0, Blue, 1) ;
+      addPiece(b, 255-1, Blue, 2) ;
+      addPiece(b, 255-2, Blue, 3) ;
+      addPiece(b, 255-3, Blue, 4) ;
+      addPiece(b, 255-16, Blue, 5) ;
+      addPiece(b, 255-17, Blue, 6) ;
+      addPiece(b, 255-18, Blue, 7) ;
+      addPiece(b, 255-19, Blue, 8) ;
+      addPiece(b, 255-32, Blue, 9) ;
+      addPiece(b, 255-33, Blue, 10) ;
+      addPiece(b, 255-34, Blue, 11) ;
+      addPiece(b, 255-48, Blue, 12) ;
+      addPiece(b, 255-49, Blue, 13) ;
+
+   END ;
+   IF TwoPlayer
+   THEN
+      homeBase[Blue] := homeBase[Blue] + SoS{4, 20, 35, 50, 65, 64} ;
+      IF Debugging
+      THEN
+         dumpBase(Blue)
+      END ;
+      homeBase[Red] := homeBase[Red] + SoS{255-4, 255-20, 255-35, 255-50, 255-65, 255-64} ;
+      IF Debugging
+      THEN
+         dumpBase(Red)
+      END ;
+(*
+      INCL(homeBase[Blue], 4) ;
+      INCL(homeBase[Blue], 20) ;
+      INCL(homeBase[Blue], 35) ;
+      INCL(homeBase[Blue], 50) ;
+      INCL(homeBase[Blue], 65) ;
+      INCL(homeBase[Blue], 64) ;
+*)
+      IF Debugging
+      THEN
+         dumpBase(Blue)
+      END ;
+
+(*
+      INCL(homeBase[Red], 255-4) ;
+      INCL(homeBase[Red], 255-20) ;
+      INCL(homeBase[Red], 255-35) ;
+      INCL(homeBase[Red], 255-50) ;
+      INCL(homeBase[Red], 255-65) ;
+      INCL(homeBase[Red], 255-64) ;
+*)
+
+      IF Debugging
+      THEN
+         dumpBase(Red)
+      END ;
+
+      (* red *)
+      addPiece(b,  4, Red, 14) ;
+      addPiece(b, 20, Red, 15) ;
+      addPiece(b, 35, Red, 16) ;
+      addPiece(b, 50, Red, 17) ;
+      addPiece(b, 65, Red, 18) ;
+      addPiece(b, 64, Red, 19) ;
+
+      (* blue *)
+      addPiece(b, 255-4, Blue, 14) ;
+      addPiece(b, 255-20, Blue, 15) ;
+      addPiece(b, 255-35, Blue, 16) ;
+      addPiece(b, 255-50, Blue, 17) ;
+      addPiece(b, 255-65, Blue, 18) ;
+      addPiece(b, 255-64, Blue, 19) ;
+
+   END ;
+   assert(b.home[Blue] = 0) ;
+   assert(b.home[Red] = 0) ;
+   assert(b.home[Green] = 0) ;
+   assert(b.home[White] = 0)
+END initBoard ;
+
+
+(*
+   displayBoard - displays the board.
+*)
+
+PROCEDURE displayBoard (b: Board) ;
+VAR
+   i, j: CARDINAL ;
+BEGIN
+   WriteString('     a  b  c  d  e  f  g  h  i  j  k  l  m  n  o  p') ; WriteLn ;
+   WriteString('   +------------------------------------------------+') ; WriteLn ;
+   FOR j := BoardY TO 1 BY -1 DO
+      WriteCard(j, 2) ;
+      WriteString(' |') ;
+      FOR i := 1 TO BoardX DO
+         WriteChar(' ') ;
+         IF isColour(b, (j-1)*BoardX+(i-1), Blue)
+         THEN
+            WriteChar('b')
+         ELSIF isColour(b, (j-1)*BoardX+(i-1), Red)
+         THEN
+            WriteChar('r')
+         ELSIF isColour(b, (j-1)*BoardX+(i-1), Green)
+         THEN
+            WriteChar('g')
+         ELSIF isColour(b, (j-1)*BoardX+(i-1), White)
+         THEN
+            WriteChar('w')
+         ELSE
+            WriteChar(' ')
+         END ;
+         WriteChar(' ')
+      END ;
+      WriteString('| ') ;
+      WriteCard(j, 2) ;
+      WriteLn
+   END ;
+   WriteString('   +------------------------------------------------+') ; WriteLn ;
+   WriteString('     a  b  c  d  e  f  g  h  i  j  k  l  m  n  o  p') ; WriteLn
+END displayBoard ;
+
+
+(*
+   emitSpecialIf -
+*)
+
+PROCEDURE emitSpecialIf (normal, special: CHAR; i, j, x, y: CARDINAL) ;
+BEGIN
+   IF (x=i) AND (y=j)
+   THEN
+      WriteChar(special)
+   ELSE
+      WriteChar(normal)
+   END
+END emitSpecialIf ;
+
+
+(*
+   displayBoardPeg - displays the board with all moves by peg illustrated.
+*)
+
+PROCEDURE displayBoardPeg (b: Board; c: Colour; peg: CARDINAL) ;
+VAR
+   x, y,
+   i, j: CARDINAL ;
+   m   : Moves ;
+BEGIN
+   genMoves(b, m, c) ;
+   x := b.pieces[c][peg] MOD BoardX+1 ;
+   y := b.pieces[c][peg] DIV BoardX+1 ;
+   WriteString('     a  b  c  d  e  f  g  h  i  j  k  l  m  n  o  p') ; WriteLn ;
+   WriteString('   +------------------------------------------------+') ; WriteLn ;
+   FOR j := BoardY TO 1 BY -1 DO
+      WriteCard(j, 2) ;
+      WriteString(' |') ;
+      FOR i := 1 TO BoardX DO
+         WriteChar(' ') ;
+         IF isColour(b, (j-1)*BoardX+(i-1), Blue)
+         THEN
+            emitSpecialIf('b', 'x', i, j, x, y)
+         ELSIF isColour(b, (j-1)*BoardX+(i-1), Red)
+         THEN
+            emitSpecialIf('r', 'x', i, j, x, y)
+         ELSIF isColour(b, (j-1)*BoardX+(i-1), Green)
+         THEN
+            emitSpecialIf('g', 'x', i, j, x, y)
+         ELSIF isColour(b, (j-1)*BoardX+(i-1), White)
+         THEN
+            emitSpecialIf('w', 'x', i, j, x, y)
+         ELSE
+            IF isRecorded(m, ((j-1)*BoardX)+(i-1), peg)
+            THEN
+               CASE c OF
+
+               Blue :  WriteChar('B') |
+               Red  :  WriteChar('R') |
+               Green:  WriteChar('G') |
+               White:  WriteChar('W')
+
+               END
+            ELSE
+               WriteChar(' ')
+            END
+         END ;
+         WriteChar(' ')
+      END ;
+      WriteString('| ') ;
+      WriteCard(j, 2) ;
+      WriteLn
+   END ;
+   WriteString('   +------------------------------------------------+') ; WriteLn ;
+   WriteString('     a  b  c  d  e  f  g  h  i  j  k  l  m  n  o  p') ; WriteLn
+END displayBoardPeg ;
+
+
+BEGIN
+   (* test *)
+   play
+END halma.
+(*
+ * Local variables:
+ *  compile-command: "gm2 -g -fiso halma.mod"
+ * End:
+ *)
diff --git a/gcc/testsuite/gm2/projects/iso/run/pass/halma/projects-iso-run-pass-halma.exp b/gcc/testsuite/gm2/projects/iso/run/pass/halma/projects-iso-run-pass-halma.exp
new file mode 100644
index 00000000000..304cd39d79d
--- /dev/null
+++ b/gcc/testsuite/gm2/projects/iso/run/pass/halma/projects-iso-run-pass-halma.exp
@@ -0,0 +1,40 @@
+# Expect driver script for GCC Regression Tests
+# Copyright (C) 2022 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+# This file was written by Gaius Mulley (gaius.mulley@southwales.ac.uk)
+# for GNU Modula-2.
+
+if $tracelevel then {
+    strace $tracelevel
+}
+
+# load support procs
+load_lib gm2-torture.exp
+
+set gm2src ${srcdir}/../m2
+
+gm2_link_lib "m2iso m2pim"
+gm2_init_iso
+
+foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $testcase] then {
+	continue
+    }
+
+    gm2-torture-execute $testcase "" "pass"
+}
diff --git a/gcc/testsuite/gm2/projects/iso/run/pass/hello/hello.mod b/gcc/testsuite/gm2/projects/iso/run/pass/hello/hello.mod
new file mode 100644
index 00000000000..f08d248a61b
--- /dev/null
+++ b/gcc/testsuite/gm2/projects/iso/run/pass/hello/hello.mod
@@ -0,0 +1,7 @@
+MODULE hello ;
+
+FROM STextIO IMPORT WriteString, WriteLn ;
+
+BEGIN
+   WriteString ("hello world using the ISO libraries") ; WriteLn
+END hello.
diff --git a/gcc/testsuite/gm2/projects/iso/run/pass/hello/projects-iso-run-pass-hello.exp b/gcc/testsuite/gm2/projects/iso/run/pass/hello/projects-iso-run-pass-hello.exp
new file mode 100755
index 00000000000..304cd39d79d
--- /dev/null
+++ b/gcc/testsuite/gm2/projects/iso/run/pass/hello/projects-iso-run-pass-hello.exp
@@ -0,0 +1,40 @@
+# Expect driver script for GCC Regression Tests
+# Copyright (C) 2022 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+# This file was written by Gaius Mulley (gaius.mulley@southwales.ac.uk)
+# for GNU Modula-2.
+
+if $tracelevel then {
+    strace $tracelevel
+}
+
+# load support procs
+load_lib gm2-torture.exp
+
+set gm2src ${srcdir}/../m2
+
+gm2_link_lib "m2iso m2pim"
+gm2_init_iso
+
+foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $testcase] then {
+	continue
+    }
+
+    gm2-torture-execute $testcase "" "pass"
+}
diff --git a/gcc/testsuite/gm2/projects/log/run/pass/hello/hello.mod b/gcc/testsuite/gm2/projects/log/run/pass/hello/hello.mod
new file mode 100644
index 00000000000..53e301f9ddf
--- /dev/null
+++ b/gcc/testsuite/gm2/projects/log/run/pass/hello/hello.mod
@@ -0,0 +1,7 @@
+MODULE hello ;
+
+FROM InOut IMPORT WriteString, WriteLn ;
+
+BEGIN
+   WriteString ("hello world from the pim compatible libraries") ; WriteLn
+END hello.
diff --git a/gcc/testsuite/gm2/projects/log/run/pass/hello/projects-log-run-pass-hello.exp b/gcc/testsuite/gm2/projects/log/run/pass/hello/projects-log-run-pass-hello.exp
new file mode 100755
index 00000000000..a9474fcb692
--- /dev/null
+++ b/gcc/testsuite/gm2/projects/log/run/pass/hello/projects-log-run-pass-hello.exp
@@ -0,0 +1,40 @@
+# Expect driver script for GCC Regression Tests
+# Copyright (C) 2022 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+# This file was written by Gaius Mulley (gaius.mulley@southwales.ac.uk)
+# for GNU Modula-2.
+
+if $tracelevel then {
+    strace $tracelevel
+}
+
+# load support procs
+load_lib gm2-torture.exp
+
+set gm2src ${srcdir}/../m2
+
+# gm2_link_lib "m2log m2pim m2iso"
+gm2_init_log
+
+foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $testcase] then {
+	continue
+    }
+
+    gm2-torture-execute $testcase "" "pass"
+}
diff --git a/gcc/testsuite/gm2/projects/pim/run/pass/hello/hello.mod b/gcc/testsuite/gm2/projects/pim/run/pass/hello/hello.mod
new file mode 100644
index 00000000000..554ab2aa95a
--- /dev/null
+++ b/gcc/testsuite/gm2/projects/pim/run/pass/hello/hello.mod
@@ -0,0 +1,7 @@
+MODULE hello ;
+
+FROM StrIO IMPORT WriteString, WriteLn ;
+
+BEGIN
+   WriteString ("hello world from the core pim libraries") ; WriteLn
+END hello.
\ No newline at end of file
diff --git a/gcc/testsuite/gm2/projects/pim/run/pass/hello/projects-pim-run-pass-hello.exp b/gcc/testsuite/gm2/projects/pim/run/pass/hello/projects-pim-run-pass-hello.exp
new file mode 100755
index 00000000000..cd97496d61f
--- /dev/null
+++ b/gcc/testsuite/gm2/projects/pim/run/pass/hello/projects-pim-run-pass-hello.exp
@@ -0,0 +1,40 @@
+# Expect driver script for GCC Regression Tests
+# Copyright (C) 2022 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+# This file was written by Gaius Mulley (gaius.mulley@southwales.ac.uk)
+# for GNU Modula-2.
+
+if $tracelevel then {
+    strace $tracelevel
+}
+
+# load support procs
+load_lib gm2-torture.exp
+
+set gm2src ${srcdir}/../m2
+
+gm2_link_lib "m2pim m2log m2iso"
+gm2_init_pim
+
+foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $testcase] then {
+	continue
+    }
+
+    gm2-torture-execute $testcase "" "pass"
+}
diff --git a/gcc/testsuite/gm2/projects/pim/run/pass/random/AdvMap.def b/gcc/testsuite/gm2/projects/pim/run/pass/random/AdvMap.def
new file mode 100644
index 00000000000..1e7281f7cd6
--- /dev/null
+++ b/gcc/testsuite/gm2/projects/pim/run/pass/random/AdvMap.def
@@ -0,0 +1,107 @@
+(* Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+                 Free Software Foundation, Inc. *)
+(* This file is part of Chisel.
+
+Chisel is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 3, or (at your option) any later
+version.
+
+Chisel is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License along
+with gm2; see the file COPYING.  If not, write to the Free Software
+Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *)
+
+DEFINITION MODULE AdvMap ;
+
+
+EXPORT QUALIFIED Rooms, Line, DoorStatus, Door, Room, Treasure,
+                 ActualNoOfRooms, MaxNoOfTreasures, MaxNoOfRooms,
+                 NoOfRoomsToHidePlayers, NoOfRoomsToSpring,
+                 NoOfRoomsToHideCoal, NoOfRoomsToHideGrenade,
+                 ReadAdvMap, Adjacent, IncPosition,
+                 FileName, MaxLengthOfFileName ;
+
+
+CONST
+   MaxNoOfRooms           = 350 ;
+   MaxWallsPerRoom        =   8 ;
+   MaxDoorsPerRoom        =   6 ;
+   MaxNoOfTreasures       =  15 ;
+   MaxLengthOfFileName    =  11 ;
+   NoOfRoomsToHidePlayers =  50 ;
+   NoOfRoomsToSpring      =  50 ;
+   NoOfRoomsToHideCoal    =  50 ;
+   NoOfRoomsToHideGrenade =  50 ;
+
+
+TYPE
+
+   Line         = RECORD
+                     X1 : CARDINAL ;
+                     Y1 : CARDINAL ;
+                     X2 : CARDINAL ;
+                     Y2 : CARDINAL
+                  END ;
+
+   DoorStatus   = (Open, Closed, Secret) ;
+
+   Door         = RECORD
+                     Position    : Line ;
+                     StateOfDoor : DoorStatus ;
+                     LeadsTo     : CARDINAL
+                  END ;
+
+   TreasureInfo = RECORD
+                     Xpos         : CARDINAL ;
+                     Ypos         : CARDINAL ;
+                     Rm           : CARDINAL ;
+                     Tweight      : CARDINAL ;
+                     TreasureName : ARRAY [0..12] OF CHAR
+                  END ;
+
+   Room         = RECORD
+                     RoomNo      : CARDINAL ;
+                     NoOfWalls   : CARDINAL ;
+                     NoOfDoors   : CARDINAL ;
+                     Walls       : ARRAY [1..MaxWallsPerRoom] OF Line ;
+                     Doors       : ARRAY [1..MaxDoorsPerRoom] OF Door ;
+                     Treasures   : BITSET ;
+                  END ;
+
+
+VAR
+   ActualNoOfRooms : CARDINAL ;
+   Treasure        : ARRAY [1..MaxNoOfTreasures] OF TreasureInfo ;
+   Rooms           : ARRAY [1..MaxNoOfRooms] OF Room ;
+
+   FileName        : ARRAY [0..MaxLengthOfFileName] OF CHAR ;
+
+
+(*
+   ReadAdvMap - read map, Name, into memory.
+                TRUE is returned if the operation was successful.
+*)
+
+PROCEDURE ReadAdvMap (Name: ARRAY OF CHAR) : BOOLEAN ;
+
+
+(*
+   Adjacent - tests to see if two rooms are Adjacent to each other.
+*)
+
+PROCEDURE Adjacent (R1, R2: CARDINAL) : BOOLEAN ;
+
+
+(*
+   IncPosition - increments the position of x, y by the direction that are facing.
+*)
+
+PROCEDURE IncPosition (VAR x, y: CARDINAL ; Dir: CARDINAL) ;
+
+
+END AdvMap.
diff --git a/gcc/testsuite/gm2/projects/pim/run/pass/random/AdvMap.mod b/gcc/testsuite/gm2/projects/pim/run/pass/random/AdvMap.mod
new file mode 100644
index 00000000000..92b78552f8e
--- /dev/null
+++ b/gcc/testsuite/gm2/projects/pim/run/pass/random/AdvMap.mod
@@ -0,0 +1,420 @@
+(* Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+                 Free Software Foundation, Inc. *)
+(* This file is part of Chisel.
+
+Chisel is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 3, or (at your option) any later
+version.
+
+Chisel is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License along
+with gm2; see the file COPYING.  If not, write to the Free Software
+Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *)
+
+IMPLEMENTATION MODULE AdvMap ;
+
+IMPORT StdIO ;
+
+FROM Scan IMPORT WriteError, GetNextSymbol, OpenSource, CloseSource ;
+FROM StrIO IMPORT ReadString, WriteString, WriteLn ;
+FROM NumberIO IMPORT WriteCard ;
+FROM StrLib IMPORT StrEqual, StrLen, StrCopy ;
+FROM ASCII IMPORT cr, lf, nul, EOL ;
+
+
+VAR
+   CurrentRoom  : CARDINAL ;
+   CurrentSymbol: ARRAY [0..20] OF CHAR ;
+   FatalError   : BOOLEAN ;
+
+
+(* IncPosition increments the x,y coordinates according  *)
+(* the Direction sent.                                   *)
+
+PROCEDURE IncPosition (VAR x, y: CARDINAL ; Dir: CARDINAL) ;
+BEGIN
+   IF (Dir=0) AND (y>0)
+   THEN
+      DEC(y)
+   ELSIF Dir=3
+   THEN
+      INC(x)
+   ELSIF Dir=2
+   THEN
+      INC(y)
+   ELSIF x>0
+   THEN
+      DEC(x)
+   END
+END IncPosition ;
+
+
+
+(* Adjacent tests whether two rooms R1 & R2 are adjacent *)
+(* Assume that access to map has been granted.           *)
+
+PROCEDURE Adjacent (R1, R2: CARDINAL) : BOOLEAN ;
+VAR
+   i, r1, r2 : CARDINAL ;
+   ok: BOOLEAN ;
+BEGIN
+   WITH Rooms[R1] DO
+      i := NoOfDoors ;
+      ok := FALSE ;
+      WHILE (i>0) AND (NOT ok) DO
+         IF Doors[i].LeadsTo=R2
+         THEN
+            ok := TRUE
+         ELSE
+            DEC(i)
+         END
+      END
+   END ;
+   RETURN( ok )
+END Adjacent ;
+
+
+(* The following procedures test and read the syntax marking out the  *)
+(* map of the adventure game. Displaying syntactic errors if occurred *)
+
+(*
+   ReadAdvMap - read map, Name, into memory.
+                TRUE is returned if the operation was successful.
+*)
+
+PROCEDURE ReadAdvMap (Name: ARRAY OF CHAR) : BOOLEAN ;
+VAR
+   Success: BOOLEAN ;
+BEGIN
+   Success := OpenSource(Name) ;
+   IF Success
+   THEN
+      GetNextSymbol(CurrentSymbol) ;
+      WHILE (NOT StrEqual( CurrentSymbol, 'END.' )) AND (NOT FatalError) DO
+         ReadRoom ;
+         GetNextSymbol(CurrentSymbol)
+      END ;
+      CloseSource ;
+      Success := NOT FatalError
+   ELSE
+      WriteString('cannot open: ') ; WriteString(Name) ; WriteLn
+   END ;
+   RETURN( Success )
+END ReadAdvMap ;
+
+
+PROCEDURE ReadRoom ;
+BEGIN
+   IF NOT FatalError
+   THEN
+      IF NOT StrEqual( CurrentSymbol, 'ROOM' )
+      THEN
+         WriteError('ROOM --- Expected') ;
+         FatalError := TRUE
+      ELSE
+         GetNextSymbol(CurrentSymbol) ;
+         ReadRoomNo ;
+         IF (CurrentRoom<1) OR (CurrentRoom>MaxNoOfRooms)
+         THEN
+            WriteError('Out Of Range Error - Room No.') ;
+            FatalError := TRUE ;
+            WriteString('Non Recoverable Error') ;
+            WriteLn
+         ELSE
+            WITH Rooms[CurrentRoom] DO
+               Treasures := {} ;
+               NoOfWalls := 0 ;
+               NoOfDoors := 0 ;
+            END ;
+            GetNextSymbol(CurrentSymbol) ;
+
+            WHILE (NOT StrEqual( CurrentSymbol, 'END' )) AND
+                  (NOT FatalError) DO
+               IF StrEqual( CurrentSymbol, 'WALL' )
+               THEN
+                  ReadWall
+               ELSIF StrEqual( CurrentSymbol, 'DOOR' )
+               THEN
+                  ReadDoor
+               ELSIF StrEqual( CurrentSymbol, 'TREASURE' )
+               THEN
+                  ReadTreasure
+               ELSE
+                  WriteError('WALL, DOOR, TREASURE, END --- Expected') ;
+                  FatalError := TRUE ;
+                  GetNextSymbol(CurrentSymbol)
+               END
+            END
+         END
+      END
+   END
+END ReadRoom ;
+
+
+PROCEDURE ReadWall ;
+VAR
+   x1, y1,
+   x2, y2: CARDINAL ;
+BEGIN
+   IF NOT FatalError
+   THEN
+      GetNextSymbol(CurrentSymbol) ;
+      WITH Rooms[CurrentRoom] DO
+         REPEAT
+            INC( NoOfWalls ) ;
+            IF NoOfWalls>MaxWallsPerRoom
+            THEN
+               WriteError('MaxWallsPerRoom needs to be increased') ;
+               FatalError := TRUE ;
+               WriteString('Non Recoverable Error') ;
+               WriteLn
+            ELSE
+               ReadCard( x1 ) ;
+               GetNextSymbol(CurrentSymbol) ;
+               ReadCard( y1 ) ;
+               GetNextSymbol(CurrentSymbol) ;
+               ReadCard( x2 ) ;
+               GetNextSymbol(CurrentSymbol) ;
+               ReadCard( y2 ) ;
+
+               IF (x1#x2) AND (y1#y2)
+               THEN
+                  WriteError('Diagonal Wall --- Not Allowed') ;
+                  FatalError := TRUE
+               END ;
+
+               (* Always have the lowest value of x in x1 OR y in y1 *)
+
+               IF (x1<x2) OR (y1<y2)
+               THEN
+                  Walls[NoOfWalls].X1 := x1 ;
+                  Walls[NoOfWalls].Y1 := y1 ;
+                  Walls[NoOfWalls].X2 := x2 ;
+                  Walls[NoOfWalls].Y2 := y2
+               ELSE
+                  Walls[NoOfWalls].X1 := x2 ;
+                  Walls[NoOfWalls].Y1 := y2 ;
+                  Walls[NoOfWalls].X2 := x1 ;
+                  Walls[NoOfWalls].Y2 := y1
+               END
+            END ;
+            GetNextSymbol(CurrentSymbol) ;
+         UNTIL StrEqual( CurrentSymbol, 'WALL' ) OR
+               StrEqual( CurrentSymbol, 'DOOR' ) OR
+               StrEqual( CurrentSymbol, 'TREASURE' ) OR
+               StrEqual( CurrentSymbol, 'END' ) OR
+               FatalError ;
+      END ;
+   END
+END ReadWall ;
+
+
+PROCEDURE ReadDoor ;
+VAR
+   x1, y1,
+   x2, y2: CARDINAL ;
+BEGIN
+   IF NOT FatalError
+   THEN
+      GetNextSymbol(CurrentSymbol) ;
+      WITH Rooms[CurrentRoom] DO
+         REPEAT
+            INC( NoOfDoors ) ;
+            IF NoOfDoors>MaxDoorsPerRoom
+            THEN
+               WriteError('Out Of Range Error - Too Many Doors') ;
+               FatalError := TRUE ;
+               WriteString('Non Recoverable Error') ;
+               WriteLn
+            ELSE
+               ReadCard( x1 ) ;
+               GetNextSymbol(CurrentSymbol) ;
+               ReadCard( y1 ) ;
+               GetNextSymbol(CurrentSymbol) ;
+               ReadCard( x2 ) ;
+               GetNextSymbol(CurrentSymbol) ;
+               ReadCard( y2 ) ;
+
+               IF (x1#x2) AND (y1#y2)
+               THEN
+                  WriteError('Diagonal Door --- Not Allowed') ;
+                  FatalError := TRUE
+               END ;
+
+               (* Always have the lowest value of x in x1 OR y in y1 *)
+
+               IF (x1<x2) OR (y1<y2)
+               THEN
+                  Doors[NoOfDoors].Position.X1 := x1 ;
+                  Doors[NoOfDoors].Position.Y1 := y1 ;
+                  Doors[NoOfDoors].Position.X2 := x2 ;
+                  Doors[NoOfDoors].Position.Y2 := y2
+               ELSE
+                  Doors[NoOfDoors].Position.X1 := x2 ;
+                  Doors[NoOfDoors].Position.Y1 := y2 ;
+                  Doors[NoOfDoors].Position.X2 := x1 ;
+                  Doors[NoOfDoors].Position.Y2 := y1
+               END ;
+               GetNextSymbol(CurrentSymbol) ;
+               IF NOT StrEqual( CurrentSymbol, 'STATUS' )
+               THEN
+                  WriteError('STATUS --- Expected') ;
+                  FatalError := TRUE
+               END ;
+               GetNextSymbol(CurrentSymbol) ;
+               IF StrEqual( CurrentSymbol, 'CLOSED' )
+               THEN
+                  Doors[NoOfDoors].StateOfDoor := Closed
+               ELSIF StrEqual( CurrentSymbol, 'SECRET' )
+               THEN
+                  Doors[NoOfDoors].StateOfDoor := Secret
+               ELSIF StrEqual( CurrentSymbol, 'OPEN' )
+               THEN
+                  Doors[NoOfDoors].StateOfDoor := Open
+               ELSE
+                  WriteError('Illegal Door Status')
+               END ;
+               GetNextSymbol(CurrentSymbol) ;
+               IF NOT StrEqual( CurrentSymbol, 'LEADS' )
+               THEN
+                  WriteError('LEADS --- Expected') ;
+                  FatalError := TRUE
+               END ;
+               GetNextSymbol(CurrentSymbol) ;
+               IF NOT StrEqual( CurrentSymbol, 'TO' )
+               THEN
+                  WriteError('TO --- Expected') ;
+                  FatalError := TRUE
+               END ;
+               GetNextSymbol(CurrentSymbol) ;
+               ReadCard( x1 ) ;
+               IF x1>MaxNoOfRooms
+               THEN
+                  WriteError('Out Of Range Error - Room No.') ;
+                  FatalError := TRUE
+               ELSE
+                  Doors[NoOfDoors].LeadsTo := x1
+               END
+            END ;
+            GetNextSymbol(CurrentSymbol) ;
+         UNTIL StrEqual( CurrentSymbol, 'DOOR' ) OR
+               StrEqual( CurrentSymbol, 'WALL' ) OR
+               StrEqual( CurrentSymbol, 'TREASURE' ) OR
+               StrEqual( CurrentSymbol, 'END' ) OR
+               FatalError ;
+      END
+   END
+END ReadDoor ;
+
+
+PROCEDURE ReadTreasure ;
+VAR
+   x, y, TreasureNo: CARDINAL ;
+BEGIN
+   IF NOT FatalError
+   THEN
+      GetNextSymbol(CurrentSymbol) ;
+      REPEAT
+         WITH Rooms[CurrentRoom] DO
+            IF NOT StrEqual( CurrentSymbol, 'AT' )
+            THEN
+               WriteError('AT --- Expected') ;
+               FatalError := TRUE
+            END ;
+            GetNextSymbol(CurrentSymbol) ;
+            ReadCard( x ) ;
+            GetNextSymbol(CurrentSymbol) ;
+            ReadCard( y ) ;
+            GetNextSymbol(CurrentSymbol) ;
+            IF NOT StrEqual( CurrentSymbol, 'IS' )
+            THEN
+               WriteError('IS --- Expected') ;
+               FatalError := TRUE
+            END ;
+            GetNextSymbol(CurrentSymbol) ;
+            ReadCard( TreasureNo ) ;
+
+            IF (TreasureNo<=MaxNoOfTreasures) AND (TreasureNo>0)
+            THEN
+               (* Tell Room about treasures *)
+
+               INCL( Treasures, TreasureNo ) ;
+
+               (* Tell Treasures about Treasures! and Room *)
+
+               Treasure[TreasureNo].Xpos := x ;
+               Treasure[TreasureNo].Ypos := y ;
+               Treasure[TreasureNo].Rm := CurrentRoom ;
+            ELSE
+               WriteError('Out Of Range Error - Treasure No.') ;
+               FatalError := TRUE
+            END
+         END ;
+         GetNextSymbol(CurrentSymbol) ;
+      UNTIL StrEqual( CurrentSymbol, 'WALL' ) OR
+            StrEqual( CurrentSymbol, 'DOOR' ) OR
+            StrEqual( CurrentSymbol, 'TREASURE' ) OR
+            StrEqual( CurrentSymbol, 'END' ) OR
+            FatalError ;
+   END
+END ReadTreasure ;
+
+
+PROCEDURE ReadRoomNo ;
+BEGIN
+   IF NOT FatalError
+   THEN
+      ReadCard( CurrentRoom ) ;
+      IF (CurrentRoom>0) AND (CurrentRoom<=MaxNoOfRooms)
+      THEN
+         IF CurrentRoom>ActualNoOfRooms
+         THEN
+            ActualNoOfRooms := CurrentRoom
+         END
+      END
+   END
+END ReadRoomNo ;
+
+
+PROCEDURE ReadCard (VAR c: CARDINAL) ;
+VAR
+   i    : CARDINAL ;
+   High : CARDINAL ;
+   ch   : CHAR ;
+BEGIN
+   IF NOT FatalError
+   THEN
+      i := 0 ;
+      c := 0 ;
+      High := HIGH(CurrentSymbol) ;
+      REPEAT
+         ch := CurrentSymbol[i] ;
+         IF (ch>='0') AND (ch<='9')
+         THEN
+            c := c*10+ORD(ch)-ORD('0')
+         ELSIF ch#nul
+         THEN
+            WriteError('Cardinal Number Expected') ;
+            FatalError := TRUE
+         END ;
+         INC( i ) ;
+      UNTIL (i>High) OR (ch=nul) ;
+   END
+END ReadCard ;
+
+
+PROCEDURE Init ;
+BEGIN
+   ActualNoOfRooms := 0 ;
+   FatalError := FALSE
+END Init ;
+
+
+BEGIN
+   Init
+END AdvMap.
diff --git a/gcc/testsuite/gm2/projects/pim/run/pass/random/BoxMap.def b/gcc/testsuite/gm2/projects/pim/run/pass/random/BoxMap.def
new file mode 100644
index 00000000000..3ca431c2bcf
--- /dev/null
+++ b/gcc/testsuite/gm2/projects/pim/run/pass/random/BoxMap.def
@@ -0,0 +1,81 @@
+(* Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+                 Free Software Foundation, Inc. *)
+(* This file is part of Chisel.
+
+Chisel is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 3, or (at your option) any later
+version.
+
+Chisel is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License along
+with gm2; see the file COPYING.  If not, write to the Free Software
+Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *)
+DEFINITION MODULE BoxMap ;
+
+(*
+   Title      : BoxMap
+   Author     : Gaius Mulley
+   Date       : 18/7/88
+   System     : LOGITECH MODULA-2/86
+   Description: Generates a simple random map full of boxes.
+                Box corridors and box rooms.
+                All boxes are contained in the array Boxes and
+                1..NoOfCorridorBoxes are the corridor boxes and
+                NoOfCorridorBoxes..NoOfBoxes are the room boxes.
+*)
+
+EXPORT QUALIFIED MaxBoxes, MaxX, MaxY,
+                 MaxDoorLength, MinDoorLength,
+                 CorridorWidth, CorridorDoorLength,
+                 TotalCorridorLength, MinDistanceBetweenCorridors,
+                 MaxCorridorLength, MinCorridorLength,
+                 MaxRoomLength, MinRoomLength,
+                 Box,
+                 Boxes,
+                 NoOfBoxes, NoOfCorridorBoxes,
+                 CreateBoxMap ;
+
+CONST
+   MaxBoxes =  500 ;
+   MaxX     =  120 ;  (* 38 ; *)
+   MaxY     =   80 ;  (* 24 ; *)
+
+   MaxDoorLength               =   3 ;
+   MinDoorLength               =   2 ;
+   CorridorWidth               =   7 ;  (* 4 ; *)
+   CorridorDoorLength          =   CorridorWidth-2 ;
+   TotalCorridorLength         =   (MaxX*3+MaxY*3) DIV 2 ;
+   MinDistanceBetweenCorridors =   CorridorWidth ;
+   MaxCorridorLength           =  70 ;  (* 70 ; *)
+   MinCorridorLength           =  15 ;  (* 8 ; *)
+   MaxRoomLength               =  13 ;
+   MinRoomLength               =   6 ;  (* 4 ; *)
+
+
+TYPE
+   Box    = RECORD
+               x1, y1,
+               x2, y2   : CARDINAL ;
+               RoomOfBox: CARDINAL ;
+            END ;
+
+VAR
+                      (* Box 0 is the boarder of the map.             *)
+   Boxes            : ARRAY [0..MaxBoxes] OF Box ;
+   NoOfCorridorBoxes: CARDINAL ;
+   NoOfBoxes        : CARDINAL ;
+
+
+(*
+   CreateBoxMap - builds a map with central corridors and ajoining rooms.
+*)
+
+PROCEDURE CreateBoxMap ;
+
+
+END BoxMap.
diff --git a/gcc/testsuite/gm2/projects/pim/run/pass/random/BoxMap.mod b/gcc/testsuite/gm2/projects/pim/run/pass/random/BoxMap.mod
new file mode 100644
index 00000000000..f60f365ef24
--- /dev/null
+++ b/gcc/testsuite/gm2/projects/pim/run/pass/random/BoxMap.mod
@@ -0,0 +1,1784 @@
+(* Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+                 Free Software Foundation, Inc. *)
+(* This file is part of Chisel.
+
+Chisel is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 3, or (at your option) any later
+version.
+
+Chisel is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License along
+with gm2; see the file COPYING.  If not, write to the Free Software
+Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *)
+
+IMPLEMENTATION MODULE BoxMap ;
+
+(*
+   Title      : MakeMap
+   Author     : Gaius Mulley
+   Date       : 18/7/88
+   LastEdit   : 18/7/88
+   System     : LOGITECH MODULA-2/86
+   Description: Generates a simple random box map for Dungeon
+*)
+
+FROM MapOptions IMPORT isVerbose ;
+FROM StdIO IMPORT Write, Read ;
+FROM StrIO IMPORT WriteString, WriteLn ;
+FROM NumberIO IMPORT WriteCard, ReadCard ;
+FROM Assertion IMPORT Assert ;
+
+FROM Geometry IMPORT IsSubLine, IsSubRange, IsIntersectingRange,
+                     IntersectionLength, IsPointOnLine, Abs, Min, Max ;
+
+FROM MakeBoxes IMPORT InitBoxes, KillBoxes,
+                      AddBoxes, GetAndDeleteRandomBox ;
+
+FROM StoreCoords IMPORT InitCoords, KillCoords,
+                        GetAndDeleteRandomCoord, AddCoord, CoordsExist ;
+
+FROM Chance IMPORT InitRandom, KillRandom,
+                   GetAndDeleteRandom, AddRandom,
+                   GetRand ;
+
+FROM Options IMPORT userX, userY,
+                    userMinRoomLength, userMaxRoomLength,
+		    userMinCorridorLength, userMaxCorridorLength,
+		    userTotalCorridorLength ;
+
+
+CONST
+   MaxCard  = MAX(CARDINAL) ;
+   MaxStack =  5000 ;
+
+TYPE
+   Square = RECORD
+               Contents    : (Empty, Secret, Door, Wall, Treasure) ;
+               RoomOfSquare: CARDINAL ;
+            END ;
+
+   Map      = ARRAY [1..MaxX], [1..MaxY] OF Square ;
+
+   StackEntity = RECORD
+                    PerimeterIndex  : CARDINAL ;  (* Untried Coords   *)
+                    BoxIndex        : CARDINAL ;  (* Untried boxes    *)
+                    OrientationIndex: CARDINAL ;  (* Untried orient's *)
+                 END ;
+
+VAR
+   CurrentMap       : Map ;
+   Stack            : ARRAY [1..MaxStack] OF StackEntity ;
+   StackPtr         : CARDINAL ;
+
+
+(*
+   MinDistanceBetweenRooms - returns the minimum distance between two rooms.
+*)
+
+PROCEDURE MinDistanceBetweenRooms () : CARDINAL ;
+BEGIN
+   RETURN userMinRoomLength-1
+END MinDistanceBetweenRooms ;
+
+
+(*
+   InitializeMap - Initializes CurrentMap.
+                   CurrentMap has its boarder set to a Wall and middle
+                   is set to Empty.
+*)
+
+PROCEDURE InitializeMap ;
+VAR
+   i, j: CARDINAL ;
+BEGIN
+   FOR i := 1 TO userX DO
+      FOR j := 1 TO userY DO
+         WITH CurrentMap[i, j] DO
+            Contents := Empty ;
+            RoomOfSquare := 0
+         END
+      END
+   END
+END InitializeMap ;
+
+
+(*
+   Init - Initialize the module and start the generation of a map.
+*)
+
+PROCEDURE Init ;
+BEGIN
+   NoOfBoxes := 0 ;
+   (* Initialize box 0 the edge of the map *)
+   WITH Boxes[0] DO
+      x1 := 1 ;
+      x2 := userX ;
+      y1 := 1 ;
+      y2 := userY
+   END ;
+   StackPtr := 0
+END Init ;
+
+
+(*
+   CreateBoxMap - builds a map with central corridors and ajoining rooms.
+*)
+
+PROCEDURE CreateBoxMap ;
+BEGIN
+   Init ;
+   CorridorMap ;
+   RoomMap
+END CreateBoxMap ;
+
+
+(*
+   CorridorMap - makes a map based arround central corridors.
+*)
+
+PROCEDURE CorridorMap ;
+BEGIN
+   CreateCorridors ;
+   NoOfCorridorBoxes := NoOfBoxes
+END CorridorMap ;
+
+
+(*
+   CleanUpStack - cleans up the temporary stack where alternative rooms were
+                  stored but are no longer needed.
+*)
+
+PROCEDURE CleanUpStack ;
+BEGIN
+   WHILE StackPtr>0 DO
+      WITH Stack[StackPtr] DO
+         KillBoxes(BoxIndex) ;
+         KillCoords(PerimeterIndex) ;
+         KillRandom(OrientationIndex)
+      END ;
+      DEC(StackPtr)
+   END
+END CleanUpStack ;
+
+
+(*
+   RoomMap - creates the rooms on the map which fill in space left by the
+             corridors.
+*)
+
+PROCEDURE RoomMap ;
+BEGIN
+   IF isVerbose ()
+   THEN
+      WriteString('Starting Room building') ; WriteLn
+   END ;
+   CreateRooms
+END RoomMap ;
+
+
+(*
+   CreateCorridors - creates a length of corridor on the map.
+*)
+
+PROCEDURE CreateCorridors ;
+VAR
+   Length,
+   LengthLeft: CARDINAL ;
+BEGIN
+   LengthLeft := userTotalCorridorLength ;
+   InitBoxCorridor ;  (* Place new Box on the stack *)
+   REPEAT
+      IF MakeCorridor()
+      THEN
+         WITH Boxes[NoOfBoxes] DO
+            Length := Max(Abs(x1, x2), Abs(y1, y2))
+         END ;
+         IF LengthLeft>Length
+         THEN
+            DEC(LengthLeft, Length) ;
+            InitBoxCorridor   (* Place new corridors on the stack *)
+         ELSE
+            LengthLeft := 0   (* All done *)
+         END
+      ELSE
+         IF StackPtr>0
+         THEN
+            (* Retract last corridor and try another *)
+            WriteString('backtracking, cannot place corridors onto an empty map') ; WriteLn ;
+            WriteString('halting - quicker than backtracking') ; WriteLn ;
+            HALT ;
+            WITH Boxes[NoOfBoxes] DO
+               INC(LengthLeft, Max(Abs(x1, x2), Abs(y1, y2)))
+            END ;
+            KillBox ;
+            UnMakeBox
+         ELSE
+            WriteString('run out of ideas! userMaxCorridorLength is too large!') ;
+            WriteLn ;
+            LengthLeft := 0    (* Fail safe exit *)
+         END
+      END
+   UNTIL LengthLeft=0
+END CreateCorridors ;
+
+
+(*
+   CreateRooms - places rooms inbetween the corridors on the map.
+*)
+
+PROCEDURE CreateRooms ;
+VAR
+   Finished: BOOLEAN ;
+BEGIN
+   InitBoxRoom ;
+   Finished := FALSE ;
+   REPEAT
+      IF MakeRoom()
+      THEN
+         InitBoxRoom ;
+         Finished := NOT CoordsExist(Stack[StackPtr].PerimeterIndex)
+      ELSE
+         Finished := TRUE ;
+(*
+         IF StackPtr>0
+         THEN
+            (* Retract last room and try another *)
+            WriteString('Backtracking room') ; WriteLn ;
+            KillBox ;
+            UnMakeBox
+         ELSE
+            WriteString('Run out of ideas! Trying to create rooms!') ;
+            WriteLn ;
+         END
+*)
+      END
+   UNTIL Finished ;
+END CreateRooms ;
+
+
+(*
+   MakeCorridor - returns true if a corridor was legally placed
+                  onto the map.
+*)
+
+PROCEDURE MakeCorridor () : BOOLEAN ;
+VAR
+   Success   : BOOLEAN ;
+   x, y      : CARDINAL ;
+BEGIN
+   WITH Stack[StackPtr] DO
+      (*
+         Perimeter has been previously pushed.
+         We now try to place a piece of corridor
+         on a selected perimeter coordinate.
+      *)
+      Success := FALSE ;
+      REPEAT
+         GetAndDeleteRandomCoord(PerimeterIndex, x, y) ;
+         x := Min(x, userX) ;
+         y := Min(y, userY) ;
+         IF x#0  (* x=0 means no more coordinates to fetch *)
+         THEN
+            Success := PutCorridorOntoMap(x, y)
+         END
+      UNTIL Success OR (x=0)    (* x=0 and y=0 means no coordinates left *)
+                                (* when x=0  y is also 0.                *)
+   END ;
+   RETURN( Success )
+END MakeCorridor ;
+
+
+(*
+   MakeRoom - returns true if a room was legally placed
+              onto the map.
+*)
+
+PROCEDURE MakeRoom () : BOOLEAN ;
+VAR
+   Success   : BOOLEAN ;
+   x, y      : CARDINAL ;
+BEGIN
+   WITH Stack[StackPtr] DO
+      (*
+         Perimeter has been previously pushed.
+         We now try to place a piece of corridor
+         on a selected perimeter coordinate.
+      *)
+      Success := FALSE ;
+      REPEAT
+         GetAndDeleteRandomCoord(PerimeterIndex, x, y) ;
+         IF x#0  (* x=0 means no more coordinates to fetch *)
+         THEN
+            Success := PutRoomOntoMap(x, y)
+         END
+      UNTIL Success OR (x=0)    (* x=0 and y=0 means no coordinates left *)
+                                (* when x=0  y is also 0.                *)
+   END ;
+   RETURN( Success )
+END MakeRoom ;
+
+
+(*
+   UnMakeBox - deletes the last box placed in the Box list.
+*)
+
+PROCEDURE UnMakeBox ;
+BEGIN
+(*
+   IF NoOfCorridorBoxes>0
+   THEN
+      FindSpaceNextToRoom
+   END ;
+*)
+   DEC(NoOfBoxes)
+END UnMakeBox ;
+
+
+(*
+   KillSurroundingBoxes - finds a pocket of space on the map and deletes
+                          all neighbouring boxes.
+*)
+
+(*
+PROCEDURE KillSurroundingBoxes ;
+VAR
+   x, y,
+   i, j,
+   Swap, b: CARDINAL ;
+BEGIN
+   GetFreeSpace(x, y) ;
+   i := x ;
+   j := y ;
+   Swap := NoOfBoxes ;
+   REPEAT
+      b := 1 ;
+      WHILE b<=Swap DO
+         IF IsPointOnBox(b, i, j)
+         THEN
+            SwapBox(b, Swap) ;
+            DEC(Swap)
+         END ;
+         INC(b)
+      END ;
+      WalkClockWise(i, j)
+   UNTIL (x=i) AND (y=j) ;
+   RenewBoxes(Swap, Swap)
+END KillSurroundingBoxes ;
+*)
+
+
+(*
+   SwapBox - swaps two boxes, i and j, arround on the stack.
+*)
+
+PROCEDURE SwapBox (i, j: CARDINAL) ;
+VAR
+   s: StackEntity ;
+   b: Box ;
+BEGIN
+   b := Boxes[i] ;
+   Boxes[i] := Boxes[j] ;
+   Boxes[j] := b ;
+   s := Stack[i] ;
+   Stack[i] := Stack[j] ;
+   Stack[j] := s
+END SwapBox ;
+
+
+(*
+   FindSpaceNextToRoom - finds a pocket of space on the map and places
+                         a room near this onto the top of the box stack.
+*)
+
+PROCEDURE FindSpaceNextToRoom ;
+VAR
+   t: Box ;
+   x, y, b, d,
+   Nearest,
+   Distance  : CARDINAL ;
+BEGIN
+   GetSpaceCoord(x, y) ;
+   Nearest := 1 ;
+   Distance := DistanceAppartPoint(1, x, y) ;
+   b := NoOfBoxes-1 ;
+   WHILE b>1 DO
+      d := DistanceAppartPoint(b, x, y) ;
+      IF d<Distance
+      THEN
+         Distance := d ;
+         Nearest := b
+      END ;
+      DEC(b)
+   END ;
+   SwapBox(Nearest, NoOfBoxes)
+END FindSpaceNextToRoom ;
+
+
+(*
+   GetSpaceCoord - Sets x and y to a coordinate which has no room on it.
+*)
+
+PROCEDURE GetSpaceCoord (VAR x, y: CARDINAL) ;
+VAR
+   Space: BOOLEAN ;
+BEGIN
+   Space := FALSE ;
+   x := 1 ;
+   WHILE (NOT Space) AND (x<=userX) DO
+      y := 1 ;
+      WHILE (NOT Space) AND (y<=userY) DO
+         IF NOT IsSpace(x, y)
+         THEN
+            INC(y)
+         ELSE
+            Space := TRUE
+         END
+      END ;
+      IF NOT Space
+      THEN
+         INC(x)
+      END
+   END
+END GetSpaceCoord ;
+
+
+(*
+   Reschedule - reorders boxes on the stack, all boxes that touch the
+                top box are placed n-1 n-2 etc on the stack,
+                efficient recursive backtracking!
+*)
+
+PROCEDURE Reschedule (Lowest: CARDINAL) ;
+VAR
+   b,
+   Swap: CARDINAL ;
+   t   : Box ;
+BEGIN
+   Swap := NoOfBoxes-1 ;
+   b := Lowest+1 ;
+   WITH Boxes[NoOfBoxes] DO
+      WHILE Swap>b DO
+         IF IsTouchingBox(b, x1, y1, x2, y2)
+         THEN
+            SwapBox(b, Swap) ;
+            INC(b)
+         END ;
+         DEC(Swap)
+      END
+   END
+END Reschedule ;
+
+
+(*
+   InitBoxCorridor - initializes a new corridor on the Stack,
+                     the perimeter of the map is also pushed.
+*)
+
+PROCEDURE InitBoxCorridor ;
+BEGIN
+   INC(StackPtr) ;
+   WITH Stack[StackPtr] DO
+      PerimeterIndex := InitCoords() ;
+      PushPerimeterOfBoxes(PerimeterIndex, FALSE) ;
+      OrientationIndex := 0 ;
+      BoxIndex := 0
+   END
+END InitBoxCorridor ;
+
+
+(*
+   InitBoxRoom - initializes a new corridor on the Stack,
+                 the perimeter of the map is also pushed.
+*)
+
+PROCEDURE InitBoxRoom ;
+BEGIN
+   (*
+      This is a really nasty kludge - because of memory space limitations
+      the StoreCoords module is pushed for space when creating large size
+      maps.
+      The kludge to get arround this is to kill all perimeter coordinates of the
+      previous box. This can be done since we never invoke backtracking
+      when creating boxrooms - but we may when we come up with a suitable
+      reliable algorithm, however, until then we can take advantage of
+      no backtracking and delete all perimeter coords of the last box.
+   *)
+   IF StackPtr>1
+   THEN
+      (* Ok delete perimeter coord *)
+      KillCoords(Stack[StackPtr].PerimeterIndex) ;
+      KillBoxes(Stack[StackPtr].BoxIndex)
+   END ;
+   (* All done - kludge over *)
+   INC(StackPtr) ;
+   WITH Stack[StackPtr] DO
+      PerimeterIndex := InitCoords() ;
+      PushPerimeterOfBoxes(PerimeterIndex, TRUE) ;
+      OrientationIndex := 0 ;
+      BoxIndex := 0
+   END
+END InitBoxRoom ;
+
+
+(*
+   KillBox - pops the last Box from the stack.
+*)
+
+PROCEDURE KillBox ;
+BEGIN
+   WITH Stack[StackPtr] DO
+      KillCoords(PerimeterIndex)
+   END ;
+   DEC(StackPtr)
+END KillBox ;
+
+
+(*
+   PutCorridorOntoMap - returns true if it has placed a corridor
+                        onto a map.
+                        Otherwise no corridor has been placed onto
+                        this map.
+*)
+
+PROCEDURE PutCorridorOntoMap (x, y: CARDINAL) : BOOLEAN ;
+VAR
+   LenX,
+   LenY    : CARDINAL ;
+   Success : BOOLEAN ;
+BEGIN
+   CheckInitBoxCorridorIndex ;
+   WITH Stack[StackPtr] DO
+      Success := FALSE ;
+      REPEAT
+         IF GetBox(LenX, LenY)
+         THEN
+            Success := PlaceCorridorBox(x, y, LenX-1, LenY-1)
+         END
+      UNTIL Success OR (LenX=0) ;
+   END ;
+   CheckKillBoxIndex(LenX=0) ;
+   RETURN( Success )
+END PutCorridorOntoMap ;
+
+
+(*
+   PutRoomOntoMap - returns true if it has placed a room
+                    onto a map.
+                    Otherwise no room has been placed onto
+                    this map.
+*)
+
+PROCEDURE PutRoomOntoMap (x, y: CARDINAL) : BOOLEAN ;
+VAR
+   LenX,
+   LenY    : CARDINAL ;
+   Success : BOOLEAN ;
+BEGIN
+   CheckInitBoxRoomIndex ;
+   WITH Stack[StackPtr] DO
+      Success := FALSE ;
+      REPEAT
+         IF GetBox(LenX, LenY)
+         THEN
+            Success := PlaceRoomBox(x, y, LenX-1, LenY-1)
+         END
+      UNTIL Success OR (LenX=0) ;
+   END ;
+   CheckKillBoxIndex(LenX=0) ;
+   RETURN( Success )
+END PutRoomOntoMap ;
+
+
+(*
+   GetBox - returns true if a box can be returned.
+            It chooses one box from the box index,
+            from the stack.
+            The lengths of the Box are returned
+            in LengthX and LengthY.
+*)
+
+PROCEDURE GetBox (VAR LengthX, LengthY: CARDINAL) : BOOLEAN ;
+BEGIN
+   WITH Stack[StackPtr] DO
+      GetAndDeleteRandomBox(BoxIndex, LengthX, LengthY)
+   END ;
+   RETURN(LengthX#0)        (* LengthX#0 means found legal size box *)
+END GetBox ;
+
+
+(*
+   CheckInitBoxCorridorIndex - checks to see whether the current
+                               stacked box needs
+                               a list of legal corridor sizes stacked.
+*)
+
+PROCEDURE CheckInitBoxCorridorIndex ;
+BEGIN
+   WITH Stack[StackPtr] DO
+      IF BoxIndex=0
+      THEN
+         (* Without stacked box list of legal sized corridors *)
+         BoxIndex := InitBoxes() ;
+         AddBoxes(BoxIndex, userMinCorridorLength, CorridorWidth,
+                            userMaxCorridorLength, CorridorWidth) ;
+         AddBoxes(BoxIndex, CorridorWidth, userMinCorridorLength,
+                            CorridorWidth, userMaxCorridorLength)
+      END
+   END
+END CheckInitBoxCorridorIndex ;
+
+
+(*
+   CheckInitBoxRoomIndex - checks to see whether the current stack box
+                           needs a list of legal corridor sizes stacked.
+*)
+
+PROCEDURE CheckInitBoxRoomIndex ;
+BEGIN
+   WITH Stack[StackPtr] DO
+      IF BoxIndex=0
+      THEN
+         (* Without stacked box list of legal sized rooms *)
+         BoxIndex := InitBoxes() ;
+         AddBoxes(BoxIndex,
+                  userMinRoomLength, userMinRoomLength,
+                  userMaxRoomLength, userMaxRoomLength)
+      END
+   END
+END CheckInitBoxRoomIndex ;
+
+
+(*
+   CheckKillBoxIndex - if NeedToKill is set then the list of boxes
+                       on the stack is killed.
+                       Ideally this procedure should be a macro.
+*)
+
+PROCEDURE CheckKillBoxIndex (NeedToKill: BOOLEAN) ;
+BEGIN
+   IF NeedToKill
+   THEN
+      WITH Stack[StackPtr] DO
+         KillBoxes(BoxIndex) ;
+         BoxIndex := 0
+      END
+   END
+END CheckKillBoxIndex ;
+
+
+(*
+   PlaceCorridorBox - returns true if a box can make a corridor at
+                      position x, y.
+                      All 4 orientations are tried.
+
+
+                              2  1
+                              4  3
+
+                      Ie  1:  (x, y) (x+LenX, y+LenY)
+                          2:  (x, y) (x-LenX, y+LenY)
+                          3:  (x, y) (x+LenX, y-LenY)
+                          4:  (x, y) (x-LenX, y-LenY)
+*)
+
+PROCEDURE PlaceCorridorBox (x, y: CARDINAL; LenX, LenY: CARDINAL) : BOOLEAN ;
+VAR
+   Success: BOOLEAN ;
+   i      : CARDINAL ;
+BEGIN
+   CheckInitOrientationIndex ;
+   WITH Stack[StackPtr] DO
+      Success := FALSE ;
+      REPEAT
+         i := GetAndDeleteRandom(OrientationIndex) ;
+         CASE i OF
+
+         1:  Success := AttemptToPlaceCorridor(x, y, x+LenX, y+LenY) |
+
+         2:  IF x>LenX
+             THEN
+                Success := AttemptToPlaceCorridor(x-LenX, y, x, y+LenY)
+             END |
+
+         3:  IF y>LenY
+             THEN
+                Success := AttemptToPlaceCorridor(x, y-LenY, x+LenX, y)
+             END |
+
+         4:  IF (x>LenX) AND (y>LenY)
+             THEN
+                Success := AttemptToPlaceCorridor(x-LenX, y-LenY, x, y)
+             END
+
+         ELSE
+         END
+      UNTIL Success OR (i=0) ;
+   END ;
+   CheckKillOrientationIndex(i=0) ;
+   RETURN( Success )
+END PlaceCorridorBox ;
+
+
+(*
+   PlaceRoomBox - returns true if a box can make a corridor at
+                  position x, y.
+                  All 4 orientations are tried.
+
+
+                          2  1
+                          4  3
+
+                  Ie  1:  (x, y) (x+LenX, y+LenY)
+                      2:  (x, y) (x-LenX, y+LenY)
+                      3:  (x, y) (x+LenX, y-LenY)
+                      4:  (x, y) (x-LenX, y-LenY)
+*)
+
+PROCEDURE PlaceRoomBox (x, y: CARDINAL; LenX, LenY: CARDINAL) : BOOLEAN ;
+VAR
+   Success: BOOLEAN ;
+   i      : CARDINAL ;
+BEGIN
+   CheckInitOrientationIndex ;
+   WITH Stack[StackPtr] DO
+      Success := FALSE ;
+      REPEAT
+         i := GetAndDeleteRandom(OrientationIndex) ;
+         CASE i OF
+
+         1:  Success := AttemptToPlaceRoom(x, y, x+LenX, y+LenY) |
+
+         2:  IF x>LenX
+             THEN
+                Success := AttemptToPlaceRoom(x-LenX, y, x, y+LenY)
+             END |
+
+         3:  IF y>LenY
+             THEN
+                Success := AttemptToPlaceRoom(x, y-LenY, x+LenX, y)
+             END |
+
+         4:  IF (x>LenX) AND (y>LenY)
+             THEN
+                Success := AttemptToPlaceRoom(x-LenX, y-LenY, x, y)
+             END
+
+         ELSE
+         END
+      UNTIL Success OR (i=0) ;
+   END ;
+   CheckKillOrientationIndex(i=0) ;
+   RETURN( Success )
+END PlaceRoomBox ;
+
+
+(*
+   CheckInitOrientationIndex - checks to see whether the current stacked
+                               entity needs a new orientation index to also
+                               be stacked.
+*)
+
+PROCEDURE CheckInitOrientationIndex ;
+BEGIN
+   WITH Stack[StackPtr] DO
+      IF OrientationIndex=0
+      THEN
+         OrientationIndex := InitRandom() ;
+         AddRandom(OrientationIndex, 4)
+      END
+   END
+END CheckInitOrientationIndex ;
+
+
+(*
+   CheckKillOrientationIndex - checks to see whether the current stacked
+                               entities orientation index needs to be
+                               deleted.
+                               This procedure ideally should be a macro..
+*)
+
+PROCEDURE CheckKillOrientationIndex (NeedToKill: BOOLEAN) ;
+BEGIN
+   IF NeedToKill
+   THEN
+      WITH Stack[StackPtr] DO
+         KillRandom(OrientationIndex) ;
+         OrientationIndex := 0
+      END
+   END
+END CheckKillOrientationIndex ;
+
+
+(*
+   PushPerimeterOfBoxes - pushes all the current perimeter of the box map onto
+                          the perimeter stack.
+*)
+
+PROCEDURE PushPerimeterOfBoxes (CoordIndex: CARDINAL; NoOpt: BOOLEAN) ;
+VAR
+   i: CARDINAL ;
+BEGIN
+   IF NoOfBoxes=0
+   THEN
+      (* Perimeter is center square in map *)
+      AddCoord(CoordIndex, userX DIV 2, userY DIV 2)
+   ELSE
+      i := 1 ;
+      WHILE i<=NoOfBoxes DO
+         PushPerimeterOfWalls(CoordIndex, i, NoOpt) ;
+         INC(i)
+      END
+   END
+END PushPerimeterOfBoxes ;
+
+
+(*
+   PushPerimeterOfWalls - pushes all coordinates of a box wall which are
+                          external to the group of boxes.
+                          Ie any wall which does is not shared by an
+                          adjacent box MUST be external.
+                          NoOpt determines whether optimization should be
+                          applied to the restricting of perimeter coords.
+                          Optimiztion tests for the minimum size of a room
+                          to any wall, if this fails the coord is not added
+                          to the perimeter list.
+                          However this should not be used when pushing the
+                          room perimeter since optimization is too restrictive.
+                          (Corridor restrictions etc).
+*)
+
+PROCEDURE PushPerimeterOfWalls (CoordIndex: CARDINAL; b: CARDINAL;
+                                NoOpt: BOOLEAN) ;
+VAR
+   i, j: CARDINAL ;
+BEGIN
+   WITH Boxes[b] DO
+      FOR i := x1 TO x2 DO
+         IF IsExternalHorizWallPerimeter(b, i, y1) AND
+            (NoOpt OR IsEnoughSpacePointToBox(i, y1))
+         THEN
+            AddCoord(CoordIndex, i, y1)
+         END ;
+         IF IsExternalHorizWallPerimeter(b, i, y2) AND
+            (NoOpt OR IsEnoughSpacePointToBox(i, y2))
+         THEN
+            AddCoord(CoordIndex, i, y2)
+         END
+      END ;
+      FOR j := y1 TO y2 DO
+         IF IsExternalVertWallPerimeter(b, x1, j) AND
+            (NoOpt OR IsEnoughSpacePointToBox(x1, j))
+         THEN
+            AddCoord(CoordIndex, x1, j)
+         END ;
+         IF IsExternalVertWallPerimeter(b, x2, j) AND
+            (NoOpt OR IsEnoughSpacePointToBox(x2, j))
+         THEN
+            AddCoord(CoordIndex, x2, j)
+         END
+      END
+   END
+END PushPerimeterOfWalls ;
+
+
+(*
+   IsExternalHorizWallPerimeter - returns true if coordinates,
+                                  x and y are not on any Horiz
+                                  wall of any box except b.
+                                  This routine allows point z, y to be
+                                  on a Vertical wall, but NOT on another
+                                  Horizontal wall.
+*)
+
+PROCEDURE IsExternalHorizWallPerimeter (b: CARDINAL;
+                                        x, y: CARDINAL) : BOOLEAN ;
+VAR
+   i    : CARDINAL ;
+   Found: BOOLEAN ;
+BEGIN
+   Found := FALSE ;
+   IF NOT IsCornerPerimeter(b, x, y)
+   THEN
+      i := 0 ;
+      WHILE (i<=NoOfBoxes) AND (NOT Found) DO
+         IF i#b
+         THEN
+            WITH Boxes[i] DO
+               IF IsPointOnLine(x, y, x1, y1, x2, y1)
+               THEN
+                  Found := TRUE
+               ELSIF IsPointOnLine(x, y, x1, y2, x2, y2)
+               THEN
+                  Found := TRUE
+               END
+            END
+         END ;
+         INC(i)
+      END
+   END ;
+   RETURN( NOT Found )
+END IsExternalHorizWallPerimeter ;
+
+
+(*
+   IsExternalVertWallPerimeter - returns true if coordinates,
+                                 x and y are not on any Vertical
+                                 wall of any box except b.
+                                 This routine allows point z, y to be
+                                 on a Horizontal wall, but NOT on another
+                                 Vertical wall.
+*)
+
+PROCEDURE IsExternalVertWallPerimeter (b: CARDINAL;
+                                       x, y: CARDINAL) : BOOLEAN ;
+VAR
+   i    : CARDINAL ;
+   Found: BOOLEAN ;
+BEGIN
+   Found := FALSE ;
+   IF NOT IsCornerPerimeter(b, x, y)
+   THEN
+      i := 0 ;
+      WHILE (i<=NoOfBoxes) AND (NOT Found) DO
+         IF i#b
+         THEN
+            WITH Boxes[i] DO
+               IF IsPointOnLine(x, y, x1, y1, x1, y2)
+               THEN
+                  Found := TRUE
+               ELSIF IsPointOnLine(x, y, x2, y1, x2, y2)
+               THEN
+                  Found := TRUE
+               END
+            END
+         END ;
+         INC(i)
+      END
+   END ;
+   RETURN( NOT Found )
+END IsExternalVertWallPerimeter ;
+
+
+(*
+   AttemptToPlaceCorridor - attempts to place a corridor x1, y1  x2, y2
+                            onto the map.
+                            If it succeeds it returns true
+                            otherwise false
+*)
+
+PROCEDURE AttemptToPlaceCorridor (x1, y1, x2, y2: CARDINAL) : BOOLEAN ;
+VAR
+   Success: BOOLEAN ;
+BEGIN
+   IF IsCorridorSatisfied(x1, y1, x2, y2)
+   THEN
+      AddBox(x1, y1, x2, y2) ;
+      Success := TRUE
+   ELSE
+      Success := FALSE
+   END ;
+   RETURN( Success )
+END AttemptToPlaceCorridor ;
+
+
+(*
+   AttemptToPlaceRoom - attempts to place a room x1, y1  x2, y2
+                        onto the map.
+                        If it succeeds it returns true
+                        otherwise false
+*)
+
+PROCEDURE AttemptToPlaceRoom (x1, y1, x2, y2: CARDINAL) : BOOLEAN ;
+VAR
+   Success: BOOLEAN ;
+BEGIN
+   IF IsRoomSatisfied(x1, y1, x2, y2)
+   THEN
+      AddBox(x1, y1, x2, y2) ;
+      Success := TRUE
+   ELSE
+      Success := FALSE
+   END ;
+   RETURN( Success )
+END AttemptToPlaceRoom ;
+
+
+(*
+   IsCorridorSatisfied - returns true if a Corridor x1, y1  x2, y2
+                         may be placed onto the map without
+                         contraveining the various rules.
+*)
+
+PROCEDURE IsCorridorSatisfied (x1, y1, x2, y2: CARDINAL) : BOOLEAN ;
+VAR
+   Success: BOOLEAN ;
+BEGIN
+   (* Put(x1, y1, x2, y2) ; *)
+   IF (x2>userX) OR (y2>userY)
+   THEN
+      (* WriteString('Failed SIZE') ; WriteLn *)
+      Success := FALSE
+   ELSIF NOT DistanceAppartEdge(x1, y1, x2, y2)
+   THEN
+      Success := FALSE
+   ELSIF IsOverLappingBox(x1, y1, x2, y2)
+   THEN
+      (* WriteString('Failed OVERLAP') ; *)
+      Success := FALSE
+   ELSIF NOT IsCorridorJoin(x1, y1, x2, y2)
+   THEN
+      (* WriteString('Failed CORRIDOR JOIN') ; *)
+      Success := FALSE
+   ELSIF NOT IsEnoughSpaceBetweenCorridors(x1, y1, x2, y2)
+   THEN
+      (* WriteString('Failed SPACE') ; *)
+      Success := FALSE
+   ELSE
+      Success := TRUE
+   END ;
+   RETURN( Success )
+END IsCorridorSatisfied ;
+
+
+(*
+   IsRoomSatisfied - returns true if a box x1, y1  x2, y2
+[...]

[diff truncated at 524288 bytes]


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-07-29 10:41 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-29 10:41 [gcc/devel/modula-2] Topological sort implemented for -fscaffold-static Gaius Mulley

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).