From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gaius@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1499)
 id 44F953857804; Fri,  8 Oct 2021 14:03:24 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 44F953857804
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Gaius Mulley <gaius@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc/devel/modula-2] M2GenGCC.mod huge tidyup and removal of unused
 parameters and variables.
X-Act-Checkin: gcc
X-Git-Author: Gaius Mulley <gaius.mulley@southwales.ac.uk>
X-Git-Refname: refs/heads/devel/modula-2
X-Git-Oldrev: 12ab545439382fb5f42dd36be97e62c295878872
X-Git-Newrev: 5e2c046e06734e64c442924aea3ed197d0d68eb4
Message-Id: <20211008140324.44F953857804@sourceware.org>
Date: Fri,  8 Oct 2021 14:03:24 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Oct 2021 14:03:24 -0000

https://gcc.gnu.org/g:5e2c046e06734e64c442924aea3ed197d0d68eb4

commit 5e2c046e06734e64c442924aea3ed197d0d68eb4
Author: Gaius Mulley <gaius.mulley@southwales.ac.uk>
Date:   Fri Oct 8 11:52:48 2021 +0100

    M2GenGCC.mod huge tidyup and removal of unused parameters and variables.
    
    2021-09-26  Gaius Mulley  <gaius.mulley@southwales.ac.uk>
    
    ChangeLog:
    
            * Makefile.in: Regenerated.
    
    gcc/m2/ChangeLog:
    
            * gm2-compiler/M2GenGCC.mod (m2statement): Import list inserted
            identifier BuildFunctionCallTree.
            (ConvertQuadsToTree): Delete variable Prev.  Reformatted.
            (IsCompilingMainModule):  Reformatted.
            (CodeStatement): Remove unused parameters for many of the Code
            procedures.
            (ResolveConstantExpressions): Remove unused parameters for many of
            the Fold procedures.
            (CodeSaveException): replace variables exceptionCall and functValue.
            Use BuildFunctionCallTree to avoid an unused return result.
            (CodeRestoreException): Replace variables exceptionCall and
            functValue.  Use BuildFunctionCallTree to avoid an unused return result.
            (PopScope): Check return result.
            (CodeRange): Remove unused parameters.
            (CodeError): Remove unused parameters.
            (CodeStartModFile): Remove unused parameters.
            (CodeStartDefFile): Remove unused parameters and renamed existing
            parameters.
            (CodeEndFile): Remove unused parameters.
            (CodeInitStart): Remove unused parameters.
            (CodeInitStart): Reformatted.
            (CodeInitEnd): replace variables t and moduleTree.
            (CodeInitEnd): Reformatted.
            (CodeFinallyStart): Rewritten to remove unused parameters and
            renamed remaining parameters.
            (CodeFinallyEnd): replace variables t and moduleTree.
            (CodeFinallyEnd): Rewritten to remove unused parameters and
            renamed remaining parameters.
            (GetHighFromUnbounded): Commented out unused variable remainingDim.
            (MakeCopyUse): Insert variables Type and NewArray.  Reformatted.
            (BuildCascadedIfThenElsif): Reformatted.
            (CheckUnboundedNonVarParameter): Reformatted.
            (IsParameterWritten): Removed usused variable i.
            (AutoInitVariable): Removed usused variable i.
            (CodeNewLocalVar): Reformatted.
            (CodeKillLocalVar): Reformatted.
            (CodeProcedureScope): Reformatted.
            (CodeCall): Reformatted.
            (FoldBuiltin): Renamed parameter.
            (CodeFunctValue): Removed unused parameter.
            (CodeAddr): Removed unused parameter.
            (FoldBecomes): Delete variable t.  Removed unused parameter.
            (CodeTry): Removed all parameters.
            (CodeThrow): Removed unused parameters.
            (CodeCatchBegin): Reformatted.
            (checkDeclare): Reformatted and renamed parameters.  Removed
            unused parameters.
            (LValueToGenericPtr): Removed unused parameter and reformatted.
            (CodeAddCheck): Renamed parameters.
            (FoldSub): Renamed parameters.
            (CodeAddCheck): Renamed parameters.
            (CodeSubCheck): Renamed parameters.
            (FoldMult): Renamed parameters.
            (CodeSub): Renamed parameters.
            (CodeMultCheck): Rewritten and reformatted.
            (CodeDivM2Checked): Rewritten and reformatted.
            (CodeDivM2Check): Rewritten and reformatted.
            (CodeModM2Checked): Rewritten and reformatted.
            (CodeModM2Check): Rewritten and reformatted.
            (FoldDivM2): Rewritten and reformatted.
            (CodeDivM2): Rewritten and reformatted.
            (FoldModM2): Rewritten and reformatted.
            (FoldDivTrunc): Rewritten and reformatted.
            (FoldDivCeil): Rewritten and reformatted.
            (FoldDivFloor): Rewritten and reformatted.
            (FoldBuiltinConst): Rewritten and reformatted.
            (FoldBuiltinTypeInfo): Rewritten and reformatted.
            (CodeStandardFunction): Rewritten and reformatted.
            (CodeSavePriority): Rewritten and reformatted.
            (CodeRestorePriority): Rewritten and reformatted.
            (CodeUnarySet): Rewritten and reformatted.
            (FoldIfIn): Rewritten and reformatted.
            (GetSetLimits): Rewritten and reformatted.
            (CodeIncl): Rewritten and reformatted.
            (CodeExcl): Rewritten and reformatted.
            (FoldUnary): Rewritten and reformatted.
            (FoldUnarySet): Rewritten and reformatted.
            (CodeUnaryCheck): Rewritten and reformatted.
            (CodeUnary): Rewritten and reformatted.
            (CodeNegateChecked): Rewritten and reformatted.
            (CodeSize): Rewritten and reformatted.
            (FoldRecordField): Delete variables location and t.
            (BuildHighFromArray): Rewritten and reformatted.
            (BuildHighFromStaticArray): Rewritten and reformatted.
            (ResolveHigh): Rewritten and reformatted.
            (FoldHigh): Rewritten and reformatted.
            (CodeArray): Rewritten and reformatted.
            (FoldElementSizeForArray): Rewritten and reformatted.
            (FoldElementSizeForUnbounded): Rewritten and reformatted.
            (FoldConvert): Rewritten and reformatted.
            (CodeIfNotEqu): Rewritten and reformatted.
            (MixTypes3): Rewritten and reformatted.
            (AddQuadInformation): Rewritten and reformatted.
            (UndoReadWriteInfo): Rewritten and reformatted.
            (WriteQuad): Rewritten and reformatted.
            * gm2-gcc/m2statement.c (BuildFunctionCallTree): New function.
            * gm2-gcc/m2statement.def (BuildFunctionCallTree): New function.
            * gm2-gcc/m2statement.h (BuildFunctionCallTree): New function.
    
    Signed-off-by: Gaius Mulley <gaius.mulley@southwales.ac.uk>

Diff:
---
 Makefile.in                      | 2594 +++++++++++++++++++-------------------
 gcc/m2/gm2-compiler/M2GenGCC.mod | 1499 ++++++++++------------
 gcc/m2/gm2-compiler/M2Quads.def  |    2 +-
 gcc/m2/gm2-compiler/M2Quads.mod  |    5 -
 gcc/m2/gm2-gcc/m2statement.c     |   13 +
 gcc/m2/gm2-gcc/m2statement.def   |   13 +
 gcc/m2/gm2-gcc/m2statement.h     |    2 +
 7 files changed, 2006 insertions(+), 2122 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index b455cd07216..2d9c6eb4231 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,12 +10,12 @@
 # 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 this program; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
@@ -2535,7 +2535,7 @@ local-maintainer-clean:
 clean: do-clean local-clean
 mostlyclean: do-mostlyclean local-clean
 distclean: do-distclean local-clean local-distclean
-maintainer-clean: local-maintainer-clean do-maintainer-clean local-clean
+maintainer-clean: local-maintainer-clean do-maintainer-clean local-clean 
 maintainer-clean: local-distclean
 realclean: maintainer-clean
 
@@ -2954,7 +2954,7 @@ dir.info: do-install-info
 
 dist:
 	@echo "Building a full distribution of this tree isn't done"
-	@echo "via 'make dist'.  Check out the etc/ subdirectory"
+	@echo "via 'make dist'.  Check out the etc/ subdirectory" 
 
 etags tags: TAGS
 
@@ -2986,7 +2986,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; \
@@ -3043,7 +3043,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; \
@@ -3100,7 +3100,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; \
@@ -3157,7 +3157,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; \
@@ -3214,7 +3214,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; \
@@ -3271,7 +3271,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; \
@@ -3328,7 +3328,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; \
@@ -3390,7 +3390,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; \
@@ -4177,7 +4177,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; \
@@ -4202,7 +4202,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; \
@@ -4227,7 +4227,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; \
@@ -4252,7 +4252,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; \
@@ -4277,7 +4277,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; \
@@ -4303,7 +4303,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; \
@@ -4329,7 +4329,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; \
@@ -4355,7 +4355,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; \
@@ -4380,7 +4380,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; \
@@ -4404,7 +4404,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; \
@@ -4428,7 +4428,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; \
@@ -4452,7 +4452,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; \
@@ -4476,7 +4476,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; \
@@ -4504,7 +4504,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; \
@@ -5291,7 +5291,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; \
@@ -5316,7 +5316,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; \
@@ -5341,7 +5341,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; \
@@ -5366,7 +5366,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; \
@@ -5391,7 +5391,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; \
@@ -5417,7 +5417,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; \
@@ -5443,7 +5443,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; \
@@ -5469,7 +5469,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; \
@@ -5494,7 +5494,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; \
@@ -5518,7 +5518,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; \
@@ -5542,7 +5542,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; \
@@ -5566,7 +5566,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; \
@@ -5590,7 +5590,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; \
@@ -5618,7 +5618,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; \
@@ -6405,7 +6405,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; \
@@ -6430,7 +6430,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; \
@@ -6455,7 +6455,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; \
@@ -6480,7 +6480,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; \
@@ -6505,7 +6505,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; \
@@ -6531,7 +6531,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; \
@@ -6557,7 +6557,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; \
@@ -6583,7 +6583,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; \
@@ -6608,7 +6608,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; \
@@ -6632,7 +6632,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; \
@@ -6656,7 +6656,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; \
@@ -6680,7 +6680,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; \
@@ -6704,7 +6704,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; \
@@ -6732,7 +6732,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; \
@@ -6836,7 +6836,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; \
@@ -6862,7 +6862,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; \
@@ -6888,7 +6888,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; \
@@ -6914,7 +6914,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; \
@@ -6940,7 +6940,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; \
@@ -6967,7 +6967,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; \
@@ -6994,7 +6994,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; \
@@ -7021,7 +7021,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; \
@@ -7047,7 +7047,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; \
@@ -7072,7 +7072,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; \
@@ -7097,7 +7097,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; \
@@ -7122,7 +7122,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; \
@@ -7147,7 +7147,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; \
@@ -7176,7 +7176,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; \
@@ -7277,7 +7277,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; \
@@ -7303,7 +7303,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; \
@@ -7329,7 +7329,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; \
@@ -7355,7 +7355,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; \
@@ -7381,7 +7381,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; \
@@ -7408,7 +7408,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; \
@@ -7435,7 +7435,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; \
@@ -7462,7 +7462,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; \
@@ -7488,7 +7488,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; \
@@ -7513,7 +7513,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; \
@@ -7538,7 +7538,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; \
@@ -7563,7 +7563,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; \
@@ -7588,7 +7588,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; \
@@ -7617,7 +7617,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; \
@@ -7718,7 +7718,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; \
@@ -7744,7 +7744,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; \
@@ -7770,7 +7770,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; \
@@ -7796,7 +7796,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; \
@@ -7822,7 +7822,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; \
@@ -7849,7 +7849,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; \
@@ -7876,7 +7876,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; \
@@ -7903,7 +7903,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; \
@@ -7929,7 +7929,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; \
@@ -7954,7 +7954,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; \
@@ -7979,7 +7979,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; \
@@ -8004,7 +8004,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; \
@@ -8029,7 +8029,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; \
@@ -8058,7 +8058,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; \
@@ -8159,7 +8159,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; \
@@ -8185,7 +8185,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; \
@@ -8211,7 +8211,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; \
@@ -8237,7 +8237,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; \
@@ -8263,7 +8263,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; \
@@ -8290,7 +8290,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; \
@@ -8317,7 +8317,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; \
@@ -8344,7 +8344,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; \
@@ -8370,7 +8370,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; \
@@ -8395,7 +8395,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; \
@@ -8420,7 +8420,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; \
@@ -8445,7 +8445,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; \
@@ -8470,7 +8470,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; \
@@ -8499,7 +8499,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; \
@@ -8603,7 +8603,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; \
@@ -8629,7 +8629,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; \
@@ -8655,7 +8655,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; \
@@ -8681,7 +8681,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; \
@@ -8707,7 +8707,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; \
@@ -8734,7 +8734,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; \
@@ -8761,7 +8761,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; \
@@ -8788,7 +8788,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; \
@@ -8814,7 +8814,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; \
@@ -8839,7 +8839,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; \
@@ -8864,7 +8864,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; \
@@ -8889,7 +8889,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; \
@@ -8914,7 +8914,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; \
@@ -8943,7 +8943,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; \
@@ -9730,7 +9730,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; \
@@ -9755,7 +9755,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; \
@@ -9780,7 +9780,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; \
@@ -9805,7 +9805,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; \
@@ -9841,7 +9841,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; \
@@ -9867,7 +9867,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; \
@@ -9893,7 +9893,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; \
@@ -9918,7 +9918,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; \
@@ -9942,7 +9942,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; \
@@ -9966,7 +9966,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; \
@@ -9990,7 +9990,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; \
@@ -10014,7 +10014,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; \
@@ -10042,7 +10042,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; \
@@ -10146,7 +10146,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; \
@@ -10172,7 +10172,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; \
@@ -10198,7 +10198,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; \
@@ -10224,7 +10224,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; \
@@ -10250,7 +10250,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; \
@@ -10277,7 +10277,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; \
@@ -10304,7 +10304,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; \
@@ -10331,7 +10331,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; \
@@ -10357,7 +10357,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; \
@@ -10382,7 +10382,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; \
@@ -10407,7 +10407,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; \
@@ -10432,7 +10432,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; \
@@ -10457,7 +10457,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; \
@@ -10486,7 +10486,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; \
@@ -11273,7 +11273,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; \
@@ -11298,7 +11298,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; \
@@ -11323,7 +11323,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; \
@@ -11348,7 +11348,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; \
@@ -11373,7 +11373,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; \
@@ -11399,7 +11399,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; \
@@ -11425,7 +11425,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; \
@@ -11451,7 +11451,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; \
@@ -11476,7 +11476,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; \
@@ -11500,7 +11500,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; \
@@ -11524,7 +11524,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; \
@@ -11548,7 +11548,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; \
@@ -11572,7 +11572,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; \
@@ -11600,7 +11600,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; \
@@ -12387,7 +12387,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; \
@@ -12412,7 +12412,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; \
@@ -12437,7 +12437,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; \
@@ -12462,7 +12462,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; \
@@ -12487,7 +12487,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; \
@@ -12513,7 +12513,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; \
@@ -12539,7 +12539,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; \
@@ -12565,7 +12565,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; \
@@ -12590,7 +12590,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; \
@@ -12614,7 +12614,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; \
@@ -12638,7 +12638,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; \
@@ -12662,7 +12662,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; \
@@ -12686,7 +12686,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; \
@@ -12714,7 +12714,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; \
@@ -13498,7 +13498,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; \
@@ -13523,7 +13523,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; \
@@ -13548,7 +13548,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; \
@@ -13573,7 +13573,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; \
@@ -13598,7 +13598,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; \
@@ -13624,7 +13624,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; \
@@ -13650,7 +13650,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; \
@@ -13676,7 +13676,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; \
@@ -13701,7 +13701,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; \
@@ -13725,7 +13725,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; \
@@ -13749,7 +13749,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; \
@@ -13773,7 +13773,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; \
@@ -13797,7 +13797,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; \
@@ -13825,7 +13825,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; \
@@ -14609,7 +14609,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; \
@@ -14634,7 +14634,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; \
@@ -14659,7 +14659,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; \
@@ -14684,7 +14684,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; \
@@ -14709,7 +14709,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; \
@@ -14735,7 +14735,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; \
@@ -14761,7 +14761,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; \
@@ -14787,7 +14787,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; \
@@ -14812,7 +14812,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; \
@@ -14836,7 +14836,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; \
@@ -14860,7 +14860,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; \
@@ -14884,7 +14884,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; \
@@ -14908,7 +14908,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; \
@@ -14936,7 +14936,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; \
@@ -15720,7 +15720,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; \
@@ -15745,7 +15745,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; \
@@ -15770,7 +15770,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; \
@@ -15795,7 +15795,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; \
@@ -15820,7 +15820,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; \
@@ -15846,7 +15846,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; \
@@ -15872,7 +15872,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; \
@@ -15898,7 +15898,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; \
@@ -15923,7 +15923,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; \
@@ -15947,7 +15947,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; \
@@ -15971,7 +15971,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; \
@@ -15995,7 +15995,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; \
@@ -16019,7 +16019,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; \
@@ -16047,7 +16047,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; \
@@ -16831,7 +16831,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; \
@@ -16856,7 +16856,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; \
@@ -16881,7 +16881,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; \
@@ -16906,7 +16906,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; \
@@ -16931,7 +16931,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; \
@@ -16957,7 +16957,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; \
@@ -16983,7 +16983,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; \
@@ -17009,7 +17009,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; \
@@ -17034,7 +17034,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; \
@@ -17058,7 +17058,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; \
@@ -17082,7 +17082,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; \
@@ -17106,7 +17106,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; \
@@ -17130,7 +17130,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; \
@@ -17158,7 +17158,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; \
@@ -17942,7 +17942,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; \
@@ -17967,7 +17967,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; \
@@ -17992,7 +17992,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; \
@@ -18017,7 +18017,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; \
@@ -18042,7 +18042,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; \
@@ -18068,7 +18068,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; \
@@ -18094,7 +18094,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; \
@@ -18120,7 +18120,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; \
@@ -18145,7 +18145,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; \
@@ -18169,7 +18169,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; \
@@ -18193,7 +18193,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; \
@@ -18217,7 +18217,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; \
@@ -18241,7 +18241,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; \
@@ -18269,7 +18269,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; \
@@ -19056,7 +19056,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; \
@@ -19081,7 +19081,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; \
@@ -19106,7 +19106,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; \
@@ -19131,7 +19131,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; \
@@ -19156,7 +19156,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; \
@@ -19182,7 +19182,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; \
@@ -19208,7 +19208,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; \
@@ -19234,7 +19234,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; \
@@ -19259,7 +19259,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; \
@@ -19283,7 +19283,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; \
@@ -19307,7 +19307,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; \
@@ -19331,7 +19331,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; \
@@ -19355,7 +19355,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; \
@@ -19383,7 +19383,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; \
@@ -19484,7 +19484,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; \
@@ -19510,7 +19510,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; \
@@ -19536,7 +19536,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; \
@@ -19562,7 +19562,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; \
@@ -19588,7 +19588,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; \
@@ -19615,7 +19615,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; \
@@ -19642,7 +19642,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; \
@@ -19669,7 +19669,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; \
@@ -19695,7 +19695,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; \
@@ -19720,7 +19720,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; \
@@ -19745,7 +19745,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; \
@@ -19770,7 +19770,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; \
@@ -19795,7 +19795,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; \
@@ -19824,7 +19824,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; \
@@ -20611,7 +20611,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; \
@@ -20636,7 +20636,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; \
@@ -20661,7 +20661,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; \
@@ -20686,7 +20686,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; \
@@ -20711,7 +20711,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; \
@@ -20737,7 +20737,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; \
@@ -20763,7 +20763,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; \
@@ -20789,7 +20789,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; \
@@ -20814,7 +20814,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; \
@@ -20838,7 +20838,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; \
@@ -20862,7 +20862,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; \
@@ -20886,7 +20886,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; \
@@ -20910,7 +20910,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; \
@@ -20938,7 +20938,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; \
@@ -21039,7 +21039,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; \
@@ -21065,7 +21065,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; \
@@ -21091,7 +21091,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; \
@@ -21117,7 +21117,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; \
@@ -21143,7 +21143,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; \
@@ -21170,7 +21170,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; \
@@ -21197,7 +21197,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; \
@@ -21224,7 +21224,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; \
@@ -21250,7 +21250,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; \
@@ -21285,7 +21285,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; \
@@ -21310,7 +21310,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; \
@@ -21335,7 +21335,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; \
@@ -21364,7 +21364,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; \
@@ -21465,7 +21465,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; \
@@ -21491,7 +21491,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; \
@@ -21517,7 +21517,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; \
@@ -21543,7 +21543,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; \
@@ -21569,7 +21569,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; \
@@ -21596,7 +21596,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; \
@@ -21623,7 +21623,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; \
@@ -21650,7 +21650,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; \
@@ -21676,7 +21676,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; \
@@ -21701,7 +21701,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; \
@@ -21726,7 +21726,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; \
@@ -21751,7 +21751,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; \
@@ -21776,7 +21776,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; \
@@ -21805,7 +21805,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; \
@@ -22592,7 +22592,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; \
@@ -22617,7 +22617,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; \
@@ -22642,7 +22642,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; \
@@ -22667,7 +22667,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; \
@@ -22692,7 +22692,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; \
@@ -22718,7 +22718,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; \
@@ -22744,7 +22744,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; \
@@ -22770,7 +22770,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; \
@@ -22795,7 +22795,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; \
@@ -22819,7 +22819,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; \
@@ -22843,7 +22843,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; \
@@ -22867,7 +22867,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; \
@@ -22891,7 +22891,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; \
@@ -22919,7 +22919,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; \
@@ -23706,7 +23706,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; \
@@ -23731,7 +23731,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; \
@@ -23756,7 +23756,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; \
@@ -23781,7 +23781,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; \
@@ -23806,7 +23806,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; \
@@ -23832,7 +23832,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; \
@@ -23858,7 +23858,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; \
@@ -23884,7 +23884,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; \
@@ -23909,7 +23909,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; \
@@ -23933,7 +23933,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; \
@@ -23957,7 +23957,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; \
@@ -23981,7 +23981,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; \
@@ -24005,7 +24005,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; \
@@ -24033,7 +24033,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; \
@@ -24820,7 +24820,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; \
@@ -24845,7 +24845,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; \
@@ -24870,7 +24870,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; \
@@ -24895,7 +24895,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; \
@@ -24920,7 +24920,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; \
@@ -24946,7 +24946,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; \
@@ -24972,7 +24972,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; \
@@ -24998,7 +24998,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; \
@@ -25023,7 +25023,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; \
@@ -25047,7 +25047,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; \
@@ -25071,7 +25071,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; \
@@ -25095,7 +25095,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; \
@@ -25119,7 +25119,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; \
@@ -25147,7 +25147,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; \
@@ -25932,7 +25932,7 @@ maybe-dvi-libcody:
 maybe-dvi-libcody: dvi-libcody
 
 dvi-libcody: \
-    configure-libcody
+    configure-libcody 
 	@[ -f ./libcody/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25977,7 +25977,7 @@ maybe-TAGS-libcody:
 maybe-TAGS-libcody: TAGS-libcody
 
 TAGS-libcody: \
-    configure-libcody
+    configure-libcody 
 	@[ -f ./libcody/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26032,7 +26032,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; \
@@ -26056,7 +26056,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; \
@@ -26080,7 +26080,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; \
@@ -26104,7 +26104,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; \
@@ -26128,7 +26128,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; \
@@ -26156,7 +26156,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; \
@@ -26943,7 +26943,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; \
@@ -26968,7 +26968,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; \
@@ -26993,7 +26993,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; \
@@ -27018,7 +27018,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; \
@@ -27043,7 +27043,7 @@ maybe-TAGS-libdecnumber:
 maybe-TAGS-libdecnumber: TAGS-libdecnumber
 
 TAGS-libdecnumber: \
-    configure-libdecnumber
+    configure-libdecnumber 
 	@[ -f ./libdecnumber/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27069,7 +27069,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; \
@@ -27095,7 +27095,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; \
@@ -27121,7 +27121,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; \
@@ -27146,7 +27146,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; \
@@ -27170,7 +27170,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; \
@@ -27194,7 +27194,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; \
@@ -27218,7 +27218,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; \
@@ -27242,7 +27242,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; \
@@ -27270,7 +27270,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; \
@@ -27371,7 +27371,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; \
@@ -27397,7 +27397,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; \
@@ -27423,7 +27423,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; \
@@ -27449,7 +27449,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; \
@@ -27475,7 +27475,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; \
@@ -27502,7 +27502,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; \
@@ -27529,7 +27529,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; \
@@ -27556,7 +27556,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; \
@@ -27582,7 +27582,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; \
@@ -27607,7 +27607,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; \
@@ -27632,7 +27632,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; \
@@ -27657,7 +27657,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; \
@@ -27682,7 +27682,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; \
@@ -27711,7 +27711,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; \
@@ -28507,7 +28507,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; \
@@ -28532,7 +28532,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; \
@@ -28557,7 +28557,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; \
@@ -28582,7 +28582,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; \
@@ -28607,7 +28607,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; \
@@ -28633,7 +28633,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; \
@@ -28659,7 +28659,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; \
@@ -28685,7 +28685,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; \
@@ -28710,7 +28710,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; \
@@ -28734,7 +28734,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; \
@@ -28758,7 +28758,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; \
@@ -28782,7 +28782,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; \
@@ -28806,7 +28806,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; \
@@ -28834,7 +28834,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; \
@@ -29630,7 +29630,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; \
@@ -29655,7 +29655,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; \
@@ -29680,7 +29680,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; \
@@ -29705,7 +29705,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; \
@@ -29730,7 +29730,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; \
@@ -29756,7 +29756,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; \
@@ -29782,7 +29782,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; \
@@ -29808,7 +29808,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; \
@@ -29833,7 +29833,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; \
@@ -29857,7 +29857,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; \
@@ -29881,7 +29881,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; \
@@ -29905,7 +29905,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; \
@@ -29929,7 +29929,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; \
@@ -29957,7 +29957,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; \
@@ -30751,7 +30751,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; \
@@ -30796,7 +30796,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; \
@@ -30851,7 +30851,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; \
@@ -30875,7 +30875,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; \
@@ -30899,7 +30899,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; \
@@ -30923,7 +30923,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; \
@@ -30947,7 +30947,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; \
@@ -30975,7 +30975,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; \
@@ -31076,7 +31076,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; \
@@ -31102,7 +31102,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; \
@@ -31128,7 +31128,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; \
@@ -31154,7 +31154,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; \
@@ -31180,7 +31180,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; \
@@ -31207,7 +31207,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; \
@@ -31234,7 +31234,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; \
@@ -31261,7 +31261,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; \
@@ -31287,7 +31287,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; \
@@ -31312,7 +31312,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; \
@@ -31337,7 +31337,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; \
@@ -31362,7 +31362,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; \
@@ -31387,7 +31387,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; \
@@ -31416,7 +31416,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; \
@@ -31517,7 +31517,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; \
@@ -31543,7 +31543,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; \
@@ -31569,7 +31569,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; \
@@ -31595,7 +31595,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; \
@@ -31621,7 +31621,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; \
@@ -31648,7 +31648,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; \
@@ -31675,7 +31675,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; \
@@ -31702,7 +31702,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; \
@@ -31728,7 +31728,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; \
@@ -31753,7 +31753,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; \
@@ -31778,7 +31778,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; \
@@ -31803,7 +31803,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; \
@@ -31828,7 +31828,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; \
@@ -31857,7 +31857,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; \
@@ -31958,7 +31958,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; \
@@ -31984,7 +31984,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; \
@@ -32010,7 +32010,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; \
@@ -32036,7 +32036,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; \
@@ -32062,7 +32062,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; \
@@ -32089,7 +32089,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; \
@@ -32116,7 +32116,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; \
@@ -32143,7 +32143,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; \
@@ -32169,7 +32169,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; \
@@ -32194,7 +32194,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; \
@@ -32219,7 +32219,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; \
@@ -32244,7 +32244,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; \
@@ -32269,7 +32269,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; \
@@ -32298,7 +32298,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; \
@@ -32399,7 +32399,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; \
@@ -32425,7 +32425,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; \
@@ -32451,7 +32451,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; \
@@ -32477,7 +32477,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; \
@@ -32503,7 +32503,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; \
@@ -32530,7 +32530,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; \
@@ -32557,7 +32557,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; \
@@ -32584,7 +32584,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; \
@@ -32610,7 +32610,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; \
@@ -32635,7 +32635,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; \
@@ -32660,7 +32660,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; \
@@ -32685,7 +32685,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; \
@@ -32710,7 +32710,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; \
@@ -32739,7 +32739,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; \
@@ -32828,7 +32828,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; \
@@ -32854,7 +32854,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; \
@@ -32880,7 +32880,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; \
@@ -32906,7 +32906,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; \
@@ -32932,7 +32932,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; \
@@ -32959,7 +32959,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; \
@@ -32986,7 +32986,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; \
@@ -33013,7 +33013,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; \
@@ -33039,7 +33039,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; \
@@ -33064,7 +33064,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; \
@@ -33089,7 +33089,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; \
@@ -33114,7 +33114,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; \
@@ -33139,7 +33139,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; \
@@ -33168,7 +33168,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; \
@@ -33946,7 +33946,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; \
@@ -33971,7 +33971,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; \
@@ -33996,7 +33996,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; \
@@ -34021,7 +34021,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; \
@@ -34046,7 +34046,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; \
@@ -34072,7 +34072,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; \
@@ -34098,7 +34098,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; \
@@ -34124,7 +34124,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; \
@@ -34149,7 +34149,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; \
@@ -34173,7 +34173,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; \
@@ -34197,7 +34197,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; \
@@ -34221,7 +34221,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; \
@@ -34245,7 +34245,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; \
@@ -34273,7 +34273,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; \
@@ -34374,7 +34374,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; \
@@ -34400,7 +34400,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; \
@@ -34426,7 +34426,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; \
@@ -34452,7 +34452,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; \
@@ -34478,7 +34478,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; \
@@ -34505,7 +34505,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; \
@@ -34532,7 +34532,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; \
@@ -34559,7 +34559,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; \
@@ -34585,7 +34585,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; \
@@ -34610,7 +34610,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; \
@@ -34635,7 +34635,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; \
@@ -34660,7 +34660,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; \
@@ -34685,7 +34685,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; \
@@ -34714,7 +34714,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; \
@@ -34815,7 +34815,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; \
@@ -34841,7 +34841,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; \
@@ -34867,7 +34867,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; \
@@ -34893,7 +34893,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; \
@@ -34919,7 +34919,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; \
@@ -34946,7 +34946,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; \
@@ -34973,7 +34973,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; \
@@ -35000,7 +35000,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; \
@@ -35026,7 +35026,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; \
@@ -35051,7 +35051,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; \
@@ -35076,7 +35076,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; \
@@ -35101,7 +35101,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; \
@@ -35126,7 +35126,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; \
@@ -35155,7 +35155,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; \
@@ -35256,7 +35256,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; \
@@ -35282,7 +35282,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; \
@@ -35308,7 +35308,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; \
@@ -35334,7 +35334,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; \
@@ -35360,7 +35360,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; \
@@ -35387,7 +35387,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; \
@@ -35414,7 +35414,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; \
@@ -35441,7 +35441,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; \
@@ -35467,7 +35467,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; \
@@ -35492,7 +35492,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; \
@@ -35517,7 +35517,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; \
@@ -35542,7 +35542,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; \
@@ -35567,7 +35567,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; \
@@ -35596,7 +35596,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; \
@@ -35697,7 +35697,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; \
@@ -35723,7 +35723,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; \
@@ -35749,7 +35749,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; \
@@ -35775,7 +35775,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; \
@@ -35801,7 +35801,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; \
@@ -35828,7 +35828,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; \
@@ -35855,7 +35855,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; \
@@ -35882,7 +35882,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; \
@@ -35908,7 +35908,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; \
@@ -35933,7 +35933,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; \
@@ -35958,7 +35958,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; \
@@ -35983,7 +35983,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; \
@@ -36008,7 +36008,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; \
@@ -36037,7 +36037,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; \
@@ -36138,7 +36138,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; \
@@ -36164,7 +36164,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; \
@@ -36190,7 +36190,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; \
@@ -36216,7 +36216,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; \
@@ -36242,7 +36242,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; \
@@ -36269,7 +36269,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; \
@@ -36296,7 +36296,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; \
@@ -36323,7 +36323,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; \
@@ -36349,7 +36349,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; \
@@ -36374,7 +36374,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; \
@@ -36399,7 +36399,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; \
@@ -36424,7 +36424,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; \
@@ -36449,7 +36449,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; \
@@ -36478,7 +36478,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; \
@@ -36579,7 +36579,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; \
@@ -36605,7 +36605,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; \
@@ -36631,7 +36631,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; \
@@ -36657,7 +36657,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; \
@@ -36683,7 +36683,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; \
@@ -36710,7 +36710,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; \
@@ -36737,7 +36737,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; \
@@ -36764,7 +36764,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; \
@@ -36790,7 +36790,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; \
@@ -36815,7 +36815,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; \
@@ -36840,7 +36840,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; \
@@ -36865,7 +36865,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; \
@@ -36890,7 +36890,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; \
@@ -36919,7 +36919,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; \
@@ -37020,7 +37020,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; \
@@ -37046,7 +37046,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; \
@@ -37072,7 +37072,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; \
@@ -37098,7 +37098,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; \
@@ -37124,7 +37124,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; \
@@ -37151,7 +37151,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; \
@@ -37178,7 +37178,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; \
@@ -37205,7 +37205,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; \
@@ -37231,7 +37231,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; \
@@ -37256,7 +37256,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; \
@@ -37281,7 +37281,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; \
@@ -37306,7 +37306,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; \
@@ -37331,7 +37331,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; \
@@ -37360,7 +37360,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; \
@@ -37455,7 +37455,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; \
@@ -37481,7 +37481,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; \
@@ -37507,7 +37507,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; \
@@ -37533,7 +37533,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; \
@@ -37559,7 +37559,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; \
@@ -37586,7 +37586,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; \
@@ -37613,7 +37613,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; \
@@ -37640,7 +37640,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; \
@@ -37666,7 +37666,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; \
@@ -37735,7 +37735,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; \
@@ -37830,7 +37830,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; \
@@ -37856,7 +37856,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; \
@@ -37882,7 +37882,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; \
@@ -37908,7 +37908,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; \
@@ -37934,7 +37934,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; \
@@ -37961,7 +37961,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; \
@@ -37988,7 +37988,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; \
@@ -38015,7 +38015,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; \
@@ -38041,7 +38041,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; \
@@ -38066,7 +38066,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; \
@@ -38091,7 +38091,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; \
@@ -38116,7 +38116,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; \
@@ -38141,7 +38141,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; \
@@ -38170,7 +38170,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; \
@@ -38271,7 +38271,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; \
@@ -38297,7 +38297,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; \
@@ -38323,7 +38323,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; \
@@ -38349,7 +38349,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; \
@@ -38375,7 +38375,7 @@ maybe-TAGS-c++tools:
 maybe-TAGS-c++tools: TAGS-c++tools
 
 TAGS-c++tools: \
-    configure-c++tools
+    configure-c++tools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./c++tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -38402,7 +38402,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; \
@@ -38429,7 +38429,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; \
@@ -38456,7 +38456,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; \
@@ -38482,7 +38482,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; \
@@ -38507,7 +38507,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; \
@@ -38532,7 +38532,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; \
@@ -38557,7 +38557,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; \
@@ -38582,7 +38582,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; \
@@ -38611,7 +38611,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; \
@@ -38712,7 +38712,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; \
@@ -38738,7 +38738,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; \
@@ -38764,7 +38764,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; \
@@ -38790,7 +38790,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; \
@@ -38816,7 +38816,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; \
@@ -38843,7 +38843,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; \
@@ -38870,7 +38870,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; \
@@ -38897,7 +38897,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; \
@@ -38923,7 +38923,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; \
@@ -38948,7 +38948,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; \
@@ -38973,7 +38973,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; \
@@ -38998,7 +38998,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; \
@@ -39023,7 +39023,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; \
@@ -39052,7 +39052,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; \
@@ -39848,7 +39848,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; \
@@ -39873,7 +39873,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; \
@@ -39898,7 +39898,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; \
@@ -39923,7 +39923,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; \
@@ -39948,7 +39948,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; \
@@ -39974,7 +39974,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; \
@@ -40000,7 +40000,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; \
@@ -40026,7 +40026,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; \
@@ -40051,7 +40051,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; \
@@ -40075,7 +40075,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; \
@@ -40099,7 +40099,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; \
@@ -40123,7 +40123,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; \
@@ -40147,7 +40147,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; \
@@ -40175,7 +40175,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; \
@@ -40276,7 +40276,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; \
@@ -40302,7 +40302,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; \
@@ -40328,7 +40328,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; \
@@ -40354,7 +40354,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; \
@@ -40380,7 +40380,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; \
@@ -40407,7 +40407,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; \
@@ -40434,7 +40434,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; \
@@ -40461,7 +40461,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; \
@@ -40487,7 +40487,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; \
@@ -40512,7 +40512,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; \
@@ -40537,7 +40537,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; \
@@ -40562,7 +40562,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; \
@@ -40587,7 +40587,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; \
@@ -40616,7 +40616,7 @@ configure-gm2tools: stage_current
 @endif gcc-bootstrap
 @if gm2tools
 maybe-configure-gm2tools: configure-gm2tools
-configure-gm2tools:
+configure-gm2tools: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -40717,7 +40717,7 @@ maybe-info-gm2tools:
 maybe-info-gm2tools: info-gm2tools
 
 info-gm2tools: \
-    configure-gm2tools
+    configure-gm2tools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gm2tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40743,7 +40743,7 @@ maybe-dvi-gm2tools:
 maybe-dvi-gm2tools: dvi-gm2tools
 
 dvi-gm2tools: \
-    configure-gm2tools
+    configure-gm2tools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gm2tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40769,7 +40769,7 @@ maybe-pdf-gm2tools:
 maybe-pdf-gm2tools: pdf-gm2tools
 
 pdf-gm2tools: \
-    configure-gm2tools
+    configure-gm2tools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gm2tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40795,7 +40795,7 @@ maybe-html-gm2tools:
 maybe-html-gm2tools: html-gm2tools
 
 html-gm2tools: \
-    configure-gm2tools
+    configure-gm2tools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gm2tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40821,7 +40821,7 @@ maybe-TAGS-gm2tools:
 maybe-TAGS-gm2tools: TAGS-gm2tools
 
 TAGS-gm2tools: \
-    configure-gm2tools
+    configure-gm2tools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gm2tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40848,7 +40848,7 @@ maybe-install-info-gm2tools: install-info-gm2tools
 
 install-info-gm2tools: \
     configure-gm2tools \
-    info-gm2tools
+    info-gm2tools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gm2tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40875,7 +40875,7 @@ maybe-install-pdf-gm2tools: install-pdf-gm2tools
 
 install-pdf-gm2tools: \
     configure-gm2tools \
-    pdf-gm2tools
+    pdf-gm2tools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gm2tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40902,7 +40902,7 @@ maybe-install-html-gm2tools: install-html-gm2tools
 
 install-html-gm2tools: \
     configure-gm2tools \
-    html-gm2tools
+    html-gm2tools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gm2tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40928,7 +40928,7 @@ maybe-installcheck-gm2tools:
 maybe-installcheck-gm2tools: installcheck-gm2tools
 
 installcheck-gm2tools: \
-    configure-gm2tools
+    configure-gm2tools 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gm2tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40953,7 +40953,7 @@ maybe-mostlyclean-gm2tools:
 @if gm2tools
 maybe-mostlyclean-gm2tools: mostlyclean-gm2tools
 
-mostlyclean-gm2tools:
+mostlyclean-gm2tools: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gm2tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -40978,7 +40978,7 @@ maybe-clean-gm2tools:
 @if gm2tools
 maybe-clean-gm2tools: clean-gm2tools
 
-clean-gm2tools:
+clean-gm2tools: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gm2tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -41003,7 +41003,7 @@ maybe-distclean-gm2tools:
 @if gm2tools
 maybe-distclean-gm2tools: distclean-gm2tools
 
-distclean-gm2tools:
+distclean-gm2tools: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gm2tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -41028,7 +41028,7 @@ maybe-maintainer-clean-gm2tools:
 @if gm2tools
 maybe-maintainer-clean-gm2tools: maintainer-clean-gm2tools
 
-maintainer-clean-gm2tools:
+maintainer-clean-gm2tools: 
 	@: $(MAKE); $(unstage)
 	@[ -f ./gm2tools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -41057,7 +41057,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; \
@@ -41158,7 +41158,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; \
@@ -41184,7 +41184,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; \
@@ -41210,7 +41210,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; \
@@ -41236,7 +41236,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; \
@@ -41262,7 +41262,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; \
@@ -41289,7 +41289,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; \
@@ -41316,7 +41316,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; \
@@ -41343,7 +41343,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; \
@@ -41369,7 +41369,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; \
@@ -41394,7 +41394,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; \
@@ -41419,7 +41419,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; \
@@ -41444,7 +41444,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; \
@@ -41469,7 +41469,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; \
@@ -41498,7 +41498,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; \
@@ -42285,7 +42285,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; \
@@ -42310,7 +42310,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; \
@@ -42335,7 +42335,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; \
@@ -42360,7 +42360,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; \
@@ -42385,7 +42385,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; \
@@ -42411,7 +42411,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; \
@@ -42437,7 +42437,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; \
@@ -42463,7 +42463,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; \
@@ -42488,7 +42488,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; \
@@ -42512,7 +42512,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; \
@@ -42536,7 +42536,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; \
@@ -42560,7 +42560,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; \
@@ -42584,7 +42584,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; \
@@ -42619,7 +42619,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..."; \
@@ -43520,7 +43520,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; \
@@ -43546,7 +43546,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; \
@@ -43572,7 +43572,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; \
@@ -43598,7 +43598,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; \
@@ -43624,7 +43624,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; \
@@ -43651,7 +43651,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; \
@@ -43678,7 +43678,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; \
@@ -43705,7 +43705,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; \
@@ -43731,7 +43731,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; \
@@ -43756,7 +43756,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; \
@@ -43781,7 +43781,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; \
@@ -43806,7 +43806,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; \
@@ -43831,7 +43831,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; \
@@ -43862,7 +43862,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..."; \
@@ -44763,7 +44763,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; \
@@ -44789,7 +44789,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; \
@@ -44815,7 +44815,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; \
@@ -44841,7 +44841,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; \
@@ -44867,7 +44867,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; \
@@ -44894,7 +44894,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; \
@@ -44921,7 +44921,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; \
@@ -44948,7 +44948,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; \
@@ -44974,7 +44974,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; \
@@ -44999,7 +44999,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; \
@@ -45024,7 +45024,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; \
@@ -45049,7 +45049,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; \
@@ -45074,7 +45074,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; \
@@ -45105,7 +45105,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..."; \
@@ -46006,7 +46006,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; \
@@ -46032,7 +46032,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; \
@@ -46058,7 +46058,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; \
@@ -46084,7 +46084,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; \
@@ -46110,7 +46110,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; \
@@ -46137,7 +46137,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; \
@@ -46164,7 +46164,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; \
@@ -46191,7 +46191,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; \
@@ -46217,7 +46217,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; \
@@ -46242,7 +46242,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; \
@@ -46267,7 +46267,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; \
@@ -46292,7 +46292,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; \
@@ -46317,7 +46317,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; \
@@ -46348,7 +46348,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; \
@@ -46464,7 +46464,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; \
@@ -46490,7 +46490,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; \
@@ -46516,7 +46516,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; \
@@ -46542,7 +46542,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; \
@@ -46568,7 +46568,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; \
@@ -46595,7 +46595,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; \
@@ -46622,7 +46622,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; \
@@ -46649,7 +46649,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; \
@@ -46675,7 +46675,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; \
@@ -46700,7 +46700,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; \
@@ -46725,7 +46725,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; \
@@ -46750,7 +46750,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; \
@@ -46775,7 +46775,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; \
@@ -46806,7 +46806,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; \
@@ -46922,7 +46922,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; \
@@ -46948,7 +46948,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; \
@@ -46974,7 +46974,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; \
@@ -47000,7 +47000,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; \
@@ -47026,7 +47026,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; \
@@ -47053,7 +47053,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; \
@@ -47080,7 +47080,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; \
@@ -47107,7 +47107,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; \
@@ -47133,7 +47133,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; \
@@ -47158,7 +47158,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; \
@@ -47183,7 +47183,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; \
@@ -47208,7 +47208,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; \
@@ -47233,7 +47233,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; \
@@ -47264,7 +47264,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; \
@@ -47380,7 +47380,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; \
@@ -47406,7 +47406,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; \
@@ -47432,7 +47432,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; \
@@ -47458,7 +47458,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; \
@@ -47484,7 +47484,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; \
@@ -47511,7 +47511,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; \
@@ -47538,7 +47538,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; \
@@ -47565,7 +47565,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; \
@@ -47591,7 +47591,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; \
@@ -47616,7 +47616,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; \
@@ -47641,7 +47641,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; \
@@ -47666,7 +47666,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; \
@@ -47691,7 +47691,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; \
@@ -47722,7 +47722,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..."; \
@@ -48618,7 +48618,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; \
@@ -48644,7 +48644,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; \
@@ -48670,7 +48670,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; \
@@ -48696,7 +48696,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; \
@@ -48722,7 +48722,7 @@ maybe-TAGS-target-libgcc:
 maybe-TAGS-target-libgcc: TAGS-target-libgcc
 
 TAGS-target-libgcc: \
-    configure-target-libgcc
+    configure-target-libgcc 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -48749,7 +48749,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; \
@@ -48776,7 +48776,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; \
@@ -48803,7 +48803,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; \
@@ -48829,7 +48829,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; \
@@ -48854,7 +48854,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; \
@@ -48879,7 +48879,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; \
@@ -48904,7 +48904,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; \
@@ -48929,7 +48929,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; \
@@ -48960,7 +48960,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: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -49076,7 +49076,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; \
@@ -49102,7 +49102,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; \
@@ -49128,7 +49128,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; \
@@ -49154,7 +49154,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; \
@@ -49180,7 +49180,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; \
@@ -49207,7 +49207,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; \
@@ -49234,7 +49234,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; \
@@ -49261,7 +49261,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; \
@@ -49287,7 +49287,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; \
@@ -49312,7 +49312,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; \
@@ -49337,7 +49337,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; \
@@ -49362,7 +49362,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; \
@@ -49387,7 +49387,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; \
@@ -49418,7 +49418,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; \
@@ -49534,7 +49534,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; \
@@ -49560,7 +49560,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; \
@@ -49586,7 +49586,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; \
@@ -49612,7 +49612,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; \
@@ -49638,7 +49638,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; \
@@ -49665,7 +49665,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; \
@@ -49692,7 +49692,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; \
@@ -49719,7 +49719,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; \
@@ -49745,7 +49745,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; \
@@ -49770,7 +49770,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; \
@@ -49795,7 +49795,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; \
@@ -49820,7 +49820,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; \
@@ -49845,7 +49845,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; \
@@ -49876,7 +49876,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; \
@@ -49992,7 +49992,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; \
@@ -50018,7 +50018,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; \
@@ -50044,7 +50044,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; \
@@ -50070,7 +50070,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; \
@@ -50096,7 +50096,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; \
@@ -50123,7 +50123,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; \
@@ -50150,7 +50150,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; \
@@ -50177,7 +50177,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; \
@@ -50203,7 +50203,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; \
@@ -50228,7 +50228,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; \
@@ -50253,7 +50253,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; \
@@ -50278,7 +50278,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; \
@@ -50303,7 +50303,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; \
@@ -50334,7 +50334,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; \
@@ -50450,7 +50450,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; \
@@ -50476,7 +50476,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; \
@@ -50502,7 +50502,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; \
@@ -50528,7 +50528,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; \
@@ -50554,7 +50554,7 @@ maybe-TAGS-target-libobjc:
 maybe-TAGS-target-libobjc: TAGS-target-libobjc
 
 TAGS-target-libobjc: \
-    configure-target-libobjc
+    configure-target-libobjc 
 	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
@@ -50581,7 +50581,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; \
@@ -50608,7 +50608,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; \
@@ -50635,7 +50635,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; \
@@ -50661,7 +50661,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; \
@@ -50686,7 +50686,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; \
@@ -50711,7 +50711,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; \
@@ -50736,7 +50736,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; \
@@ -50761,7 +50761,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; \
@@ -50792,7 +50792,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; \
@@ -50908,7 +50908,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; \
@@ -50934,7 +50934,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; \
@@ -50960,7 +50960,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; \
@@ -50986,7 +50986,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; \
@@ -51012,7 +51012,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; \
@@ -51039,7 +51039,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; \
@@ -51066,7 +51066,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; \
@@ -51093,7 +51093,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; \
@@ -51119,7 +51119,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; \
@@ -51144,7 +51144,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; \
@@ -51169,7 +51169,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; \
@@ -51194,7 +51194,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; \
@@ -51219,7 +51219,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; \
@@ -51250,7 +51250,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: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -51366,7 +51366,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; \
@@ -51392,7 +51392,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; \
@@ -51418,7 +51418,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; \
@@ -51444,7 +51444,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; \
@@ -51470,7 +51470,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; \
@@ -51497,7 +51497,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; \
@@ -51524,7 +51524,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; \
@@ -51551,7 +51551,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; \
@@ -51577,7 +51577,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; \
@@ -51602,7 +51602,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; \
@@ -51627,7 +51627,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; \
@@ -51652,7 +51652,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; \
@@ -51677,7 +51677,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; \
@@ -51708,7 +51708,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; \
@@ -51819,7 +51819,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; \
@@ -51845,7 +51845,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; \
@@ -51871,7 +51871,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; \
@@ -51897,7 +51897,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; \
@@ -51923,7 +51923,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; \
@@ -51950,7 +51950,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; \
@@ -51977,7 +51977,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; \
@@ -52004,7 +52004,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; \
@@ -52030,7 +52030,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; \
@@ -52101,7 +52101,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; \
@@ -52217,7 +52217,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; \
@@ -52243,7 +52243,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; \
@@ -52269,7 +52269,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; \
@@ -52295,7 +52295,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; \
@@ -52321,7 +52321,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; \
@@ -52348,7 +52348,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; \
@@ -52375,7 +52375,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; \
@@ -52402,7 +52402,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; \
@@ -52428,7 +52428,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; \
@@ -52453,7 +52453,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; \
@@ -52478,7 +52478,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; \
@@ -52503,7 +52503,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; \
@@ -52528,7 +52528,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; \
@@ -52559,7 +52559,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; \
@@ -52670,7 +52670,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; \
@@ -52696,7 +52696,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; \
@@ -52722,7 +52722,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; \
@@ -52748,7 +52748,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; \
@@ -52774,7 +52774,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; \
@@ -52801,7 +52801,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; \
@@ -52828,7 +52828,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; \
@@ -52855,7 +52855,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; \
@@ -52881,7 +52881,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; \
@@ -52906,7 +52906,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; \
@@ -52931,7 +52931,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; \
@@ -52956,7 +52956,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; \
@@ -52981,7 +52981,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; \
@@ -53012,7 +53012,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; \
@@ -53118,7 +53118,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; \
@@ -53144,7 +53144,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; \
@@ -53170,7 +53170,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; \
@@ -53196,7 +53196,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; \
@@ -53222,7 +53222,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; \
@@ -53249,7 +53249,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; \
@@ -53276,7 +53276,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; \
@@ -53303,7 +53303,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; \
@@ -53329,7 +53329,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; \
@@ -53354,7 +53354,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; \
@@ -53379,7 +53379,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; \
@@ -53404,7 +53404,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; \
@@ -53429,7 +53429,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; \
@@ -53460,7 +53460,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: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -53576,7 +53576,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; \
@@ -53602,7 +53602,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; \
@@ -53628,7 +53628,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; \
@@ -53654,7 +53654,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; \
@@ -53680,7 +53680,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; \
@@ -53707,7 +53707,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; \
@@ -53734,7 +53734,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; \
@@ -53761,7 +53761,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; \
@@ -53787,7 +53787,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; \
@@ -53812,7 +53812,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; \
@@ -53837,7 +53837,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; \
@@ -53862,7 +53862,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; \
@@ -53887,7 +53887,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; \
@@ -53918,7 +53918,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; \
@@ -54034,7 +54034,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; \
@@ -54060,7 +54060,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; \
@@ -54086,7 +54086,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; \
@@ -54112,7 +54112,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; \
@@ -54138,7 +54138,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; \
@@ -54165,7 +54165,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; \
@@ -54192,7 +54192,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; \
@@ -54219,7 +54219,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; \
@@ -54245,7 +54245,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; \
@@ -54270,7 +54270,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; \
@@ -54295,7 +54295,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; \
@@ -54320,7 +54320,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; \
@@ -54345,7 +54345,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; \
@@ -54376,7 +54376,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; \
@@ -54492,7 +54492,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; \
@@ -54518,7 +54518,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; \
@@ -54544,7 +54544,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; \
@@ -54570,7 +54570,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; \
@@ -54596,7 +54596,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; \
@@ -54623,7 +54623,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; \
@@ -54650,7 +54650,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; \
@@ -54677,7 +54677,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; \
@@ -54703,7 +54703,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; \
@@ -54728,7 +54728,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; \
@@ -54753,7 +54753,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; \
@@ -54778,7 +54778,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; \
@@ -54803,7 +54803,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; \
@@ -54834,7 +54834,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; \
@@ -54950,7 +54950,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; \
@@ -54976,7 +54976,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; \
@@ -55002,7 +55002,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; \
@@ -55028,7 +55028,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; \
@@ -55054,7 +55054,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; \
@@ -55081,7 +55081,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; \
@@ -55108,7 +55108,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; \
@@ -55135,7 +55135,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; \
@@ -55161,7 +55161,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; \
@@ -55186,7 +55186,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; \
@@ -55211,7 +55211,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; \
@@ -55236,7 +55236,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; \
@@ -55261,7 +55261,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; \
@@ -55292,7 +55292,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..."; \
@@ -56193,7 +56193,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; \
@@ -56219,7 +56219,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; \
@@ -56245,7 +56245,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; \
@@ -56271,7 +56271,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; \
@@ -56297,7 +56297,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; \
@@ -56324,7 +56324,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; \
@@ -56351,7 +56351,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; \
@@ -56378,7 +56378,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; \
@@ -56404,7 +56404,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; \
@@ -56429,7 +56429,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; \
@@ -56454,7 +56454,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; \
@@ -56479,7 +56479,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; \
@@ -56504,7 +56504,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; \
@@ -56535,7 +56535,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; \
@@ -56651,7 +56651,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; \
@@ -56677,7 +56677,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; \
@@ -56703,7 +56703,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; \
@@ -56729,7 +56729,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; \
@@ -56755,7 +56755,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; \
@@ -56782,7 +56782,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; \
@@ -56809,7 +56809,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; \
@@ -56836,7 +56836,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; \
@@ -56862,7 +56862,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; \
@@ -56887,7 +56887,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; \
@@ -56912,7 +56912,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; \
@@ -56937,7 +56937,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; \
@@ -56962,7 +56962,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; \
@@ -56993,7 +56993,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: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -57109,7 +57109,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; \
@@ -57135,7 +57135,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; \
@@ -57161,7 +57161,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; \
@@ -57187,7 +57187,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; \
@@ -57213,7 +57213,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; \
@@ -57240,7 +57240,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; \
@@ -57267,7 +57267,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; \
@@ -57294,7 +57294,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; \
@@ -57320,7 +57320,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; \
@@ -57345,7 +57345,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; \
@@ -57370,7 +57370,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; \
@@ -57395,7 +57395,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; \
@@ -57420,7 +57420,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; \
@@ -57619,7 +57619,7 @@ LEAN = false
 # reliable.
 
 # 'touch' doesn't work right on some platforms.
-STAMP = echo timestamp >
+STAMP = echo timestamp > 
 
 # We only want to compare .o files, so set this!
 objext = .o
@@ -57756,7 +57756,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; \
@@ -57886,7 +57886,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 \
@@ -57912,7 +57912,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
@@ -57929,152 +57929,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; \
@@ -58273,12 +58273,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
@@ -58295,152 +58295,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; \
@@ -58683,12 +58683,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
@@ -58717,152 +58717,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; \
@@ -59105,12 +59105,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
@@ -59127,152 +59127,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; \
@@ -59448,12 +59448,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
@@ -59470,152 +59470,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; \
@@ -59791,12 +59791,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
@@ -59813,152 +59813,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; \
@@ -60157,12 +60157,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
@@ -60179,152 +60179,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; \
@@ -60500,12 +60500,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
@@ -60522,152 +60522,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; \
@@ -60866,12 +60866,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
@@ -62237,8 +62237,8 @@ all-bison: maybe-all-intl
 all-flex: maybe-all-intl
 all-m4: maybe-all-intl
 configure-target-libgo: maybe-all-target-libstdc++-v3
-configure-target-libgm2: maybe-all-target-libstdc++-v3
 configure-target-libffi: maybe-all-target-libstdc++-v3
+configure-target-libgm2: maybe-all-target-libstdc++-v3
 configure-target-liboffloadmic: maybe-configure-target-libgomp
 all-target-liboffloadmic: maybe-all-target-libgomp
 configure-target-newlib: maybe-all-binutils
@@ -62373,7 +62373,7 @@ all-gdb: $(gdbnlmrequirements) $(GDB_TK)
 install-gdb: $(INSTALL_GDB_TK)
 
 # Serialization dependencies.  Host configures don't work well in parallel to
-# each other, due to contention over config.cache.  Target configures and
+# each other, due to contention over config.cache.  Target configures and 
 # build configures are similar.
 @serialization_dependencies@
 
diff --git a/gcc/m2/gm2-compiler/M2GenGCC.mod b/gcc/m2/gm2-compiler/M2GenGCC.mod
index b49eda3a34e..b917bc03891 100644
--- a/gcc/m2/gm2-compiler/M2GenGCC.mod
+++ b/gcc/m2/gm2-compiler/M2GenGCC.mod
@@ -207,6 +207,7 @@ FROM m2statement IMPORT BuildAsm, BuildProcedureCallTree, BuildParam, BuildFunct
                         DoJump, BuildUnaryForeachWordDo, BuildGoto, BuildCall2, BuildCall3,
                         BuildStart, BuildEnd, BuildCallInner, BuildStartFunctionCode,
                         BuildEndFunctionCode, BuildAssignmentTree, DeclareLabel,
+                        BuildFunctionCallTree,
                         BuildAssignmentStatement,
                         BuildIndirectProcedureCallTree,
                         BuildPushFunctionContext, BuildPopFunctionContext,
@@ -391,14 +392,11 @@ END IsExportedGcc ;
 *)
 
 PROCEDURE ConvertQuadsToTree (Start, End: CARDINAL) ;
-VAR
-   Prev: CARDINAL ;
 BEGIN
    REPEAT
       CodeStatement(Start) ;
-      Prev := Start ;
-      Start := GetNextQuad(Start)
-   UNTIL (Start>End) OR (Start=0)
+      Start := GetNextQuad (Start)
+   UNTIL (Start > End) OR (Start = 0)
 END ConvertQuadsToTree ;
 
 
@@ -408,10 +406,10 @@ END ConvertQuadsToTree ;
 
 PROCEDURE IsCompilingMainModule (sym: CARDINAL) : BOOLEAN ;
 BEGIN
-   WHILE (sym#NulSym) AND (GetMainModule()#sym) DO
-      sym := GetModuleScope(sym)
+   WHILE (sym # NulSym) AND (GetMainModule () # sym) DO
+      sym := GetModuleScope (sym)
    END ;
-   RETURN( sym#NulSym )
+   RETURN sym # NulSym
 END IsCompilingMainModule ;
 
 
@@ -443,75 +441,74 @@ BEGIN
 
    CASE op OF
 
-   StartDefFileOp     : CodeStartDefFile(q, op1, op2, op3) |
-   StartModFileOp     : CodeStartModFile(q, op1, op2, op3) |
-   ModuleScopeOp      : CodeModuleScope(q, op1, op2, op3) |
-   EndFileOp          : CodeEndFile(q, op1, op2, op3) |
-   InitStartOp        : CodeInitStart(q, op1, op2, op3, IsCompilingMainModule(op3)) |
-   InitEndOp          : CodeInitEnd(q, op1, op2, op3, IsCompilingMainModule(op3)) |
-   FinallyStartOp     : CodeFinallyStart(q, op1, op2, op3, IsCompilingMainModule(op3)) |
-   FinallyEndOp       : CodeFinallyEnd(q, op1, op2, op3, IsCompilingMainModule(op3)) |
-   NewLocalVarOp      : CodeNewLocalVar(q, op1, op2, op3) |
-   KillLocalVarOp     : CodeKillLocalVar(q, op1, op2, op3) |
-   ProcedureScopeOp   : CodeProcedureScope(q, op1, op2, op3) |
-   ReturnOp           : CodeReturn(q, op1, op2, op3) |
-   ReturnValueOp      : CodeReturnValue(q, op1, op3) |
-   TryOp              : CodeTry(q, op1, op2, op3) |
-   ThrowOp            : CodeThrow(q, op1, op2, op3) |
-   CatchBeginOp       : CodeCatchBegin(q, op1, op2, op3) |
-   CatchEndOp         : CodeCatchEnd(q, op1, op2, op3) |
-   RetryOp            : CodeRetry(q, op1, op2, op3) |
+   StartDefFileOp     : CodeStartDefFile (op3) |
+   StartModFileOp     : CodeStartModFile (op3) |
+   ModuleScopeOp      : CodeModuleScope (op3) |
+   EndFileOp          : CodeEndFile |
+   InitStartOp        : CodeInitStart (op2, op3, IsCompilingMainModule (op3)) |
+   InitEndOp          : CodeInitEnd (op3, IsCompilingMainModule(op3)) |
+   FinallyStartOp     : CodeFinallyStart (op2, op3, IsCompilingMainModule (op3)) |
+   FinallyEndOp       : CodeFinallyEnd (op3, IsCompilingMainModule(op3)) |
+   NewLocalVarOp      : CodeNewLocalVar (op1, op3) |
+   KillLocalVarOp     : CodeKillLocalVar (op3) |
+   ProcedureScopeOp   : CodeProcedureScope (op3) |
+   ReturnOp           : (* not used as return is achieved by KillLocalVar.  *)  |
+   ReturnValueOp      : CodeReturnValue (op1, op3) |
+   TryOp              : CodeTry |
+   ThrowOp            : CodeThrow (op3) |
+   CatchBeginOp       : CodeCatchBegin |
+   CatchEndOp         : CodeCatchEnd |
+   RetryOp            : CodeRetry (op3) |
    DummyOp            : |
    InitAddressOp      : CodeInitAddress(q, op1, op2, op3) |
    BecomesOp          : CodeBecomes(q) |
-   AddOp              : CodeAddChecked (q, op1, op2, op3) |
-   SubOp              : CodeSubChecked (q, op1, op2, op3) |
-   MultOp             : CodeMultChecked (q, op1, op2, op3) |
-   DivM2Op            : CodeDivM2Checked (q, op1, op2, op3) |
-   ModM2Op            : CodeModM2Checked (q, op1, op2, op3) |
-   DivTruncOp         : CodeDivTrunc(q, op1, op2, op3) |
-   ModTruncOp         : CodeModTrunc(q, op1, op2, op3) |
-   DivCeilOp          : CodeDivCeil(q, op1, op2, op3) |
-   ModCeilOp          : CodeModCeil(q, op1, op2, op3) |
-   DivFloorOp         : CodeDivFloor(q, op1, op2, op3) |
-   ModFloorOp         : CodeModFloor(q, op1, op2, op3) |
+   AddOp              : CodeAddChecked (q, op2, op3) |
+   SubOp              : CodeSubChecked (q, op2, op3) |
+   MultOp             : CodeMultChecked (q, op2, op3) |
+   DivM2Op            : CodeDivM2Checked (q, op2, op3) |
+   ModM2Op            : CodeModM2Checked (q, op2, op3) |
+   DivTruncOp         : CodeDivTrunc (q, op2, op3) |
+   ModTruncOp         : CodeModTrunc (q, op2, op3) |
+   DivCeilOp          : CodeDivCeil (q, op2, op3) |
+   ModCeilOp          : CodeModCeil (q, op2, op3) |
+   DivFloorOp         : CodeDivFloor (q, op2, op3) |
+   ModFloorOp         : CodeModFloor (q, op2, op3) |
    GotoOp             : CodeGoto (op3) |
-   InclOp             : CodeIncl(q, op1, op2, op3) |
-   ExclOp             : CodeExcl(q, op1, op2, op3) |
-   NegateOp           : CodeNegateChecked(q, op1, op2, op3) |
-   LogicalShiftOp     : CodeSetShift(q, op1, op2, op3) |
-   LogicalRotateOp    : CodeSetRotate(q, op1, op2, op3) |
-   LogicalOrOp        : CodeSetOr(q, op1, op2, op3) |
-   LogicalAndOp       : CodeSetAnd(q, op1, op2, op3) |
-   LogicalXorOp       : CodeSetSymmetricDifference(q, op1, op2, op3) |
-   LogicalDiffOp      : CodeSetLogicalDifference(q, op1, op2, op3) |
-   IfLessOp           : CodeIfLess(q, op1, op2, op3) |
-   IfEquOp            : CodeIfEqu(q, op1, op2, op3) |
-   IfNotEquOp         : CodeIfNotEqu(q, op1, op2, op3) |
-   IfGreEquOp         : CodeIfGreEqu(q, op1, op2, op3) |
-   IfLessEquOp        : CodeIfLessEqu(q, op1, op2, op3) |
-   IfGreOp            : CodeIfGre(q, op1, op2, op3) |
-   IfInOp             : CodeIfIn(q, op1, op2, op3) |
-   IfNotInOp          : CodeIfNotIn(q, op1, op2, op3) |
-   IndrXOp            : CodeIndrX(q, op1, op2, op3) |
-   XIndrOp            : CodeXIndr(q, op1, op2, op3) |
-   CallOp             : CodeCall(CurrentQuadToken, op1, op2, op3) |
-   ParamOp            : CodeParam(q, op1, op2, op3) |
-   FunctValueOp       : CodeFunctValue(location, op1, op2, op3) |
-   AddrOp             : CodeAddr(q, op1, op2, op3) |
-   SizeOp             : CodeSize(q, op1, op2, op3) |
-   UnboundedOp        : CodeUnbounded(q, op1, op2, op3) |
-   RecordFieldOp      : CodeRecordField(q, op1, op2, op3) |
-   OffsetOp           : CodeOffset(q, op1, op2, op3) |
-   HighOp             : CodeHigh(q, op1, op2, op3) |
-   ArrayOp            : CodeArray(q, op1, op2, op3) |
-   ElementSizeOp      : CodeElementSize(q, op1, op2, op3) |
-   ConvertOp          : CodeConvert(q, op1, op2, op3) |
-   CoerceOp           : CodeCoerce(q, op1, op2, op3) |
-   CastOp             : CodeCast(q, op1, op2, op3) |
-   StandardFunctionOp : CodeStandardFunction(q, op1, op2, op3) |
-   SavePriorityOp     : CodeSavePriority(q, op1, op2, op3) |
-   RestorePriorityOp  : CodeRestorePriority(q, op1, op2, op3) |
+   InclOp             : CodeIncl (op1, op3) |
+   ExclOp             : CodeExcl (op1, op3) |
+   NegateOp           : CodeNegateChecked (q, op1, op3) |
+   LogicalShiftOp     : CodeSetShift (q, op1, op2, op3) |
+   LogicalRotateOp    : CodeSetRotate (q, op1, op2, op3) |
+   LogicalOrOp        : CodeSetOr (q, op1, op2, op3) |
+   LogicalAndOp       : CodeSetAnd (q, op1, op2, op3) |
+   LogicalXorOp       : CodeSetSymmetricDifference (q, op1, op2, op3) |
+   LogicalDiffOp      : CodeSetLogicalDifference (q, op1, op2, op3) |
+   IfLessOp           : CodeIfLess (q, op1, op2, op3) |
+   IfEquOp            : CodeIfEqu (q, op1, op2, op3) |
+   IfNotEquOp         : CodeIfNotEqu (q, op1, op2, op3) |
+   IfGreEquOp         : CodeIfGreEqu (q, op1, op2, op3) |
+   IfLessEquOp        : CodeIfLessEqu (q, op1, op2, op3) |
+   IfGreOp            : CodeIfGre (q, op1, op2, op3) |
+   IfInOp             : CodeIfIn (q, op1, op2, op3) |
+   IfNotInOp          : CodeIfNotIn (q, op1, op2, op3) |
+   IndrXOp            : CodeIndrX (q, op1, op2, op3) |
+   XIndrOp            : CodeXIndr (q, op1, op2, op3) |
+   CallOp             : CodeCall (CurrentQuadToken, op3) |
+   ParamOp            : CodeParam (q, op1, op2, op3) |
+   FunctValueOp       : CodeFunctValue (location, op1) |
+   AddrOp             : CodeAddr (q, op1, op3) |
+   SizeOp             : CodeSize (op1, op3) |
+   UnboundedOp        : CodeUnbounded (op1, op3) |
+   RecordFieldOp      : CodeRecordField (op1, op2, op3) |
+   HighOp             : CodeHigh (op1, op2, op3) |
+   ArrayOp            : CodeArray (op1, op2, op3) |
+   ElementSizeOp      : InternalError ('ElementSizeOp is expected to have been folded via constant evaluation') |
+   ConvertOp          : CodeConvert (q, op1, op2, op3) |
+   CoerceOp           : CodeCoerce (q, op1, op2, op3) |
+   CastOp             : CodeCast (q, op1, op2, op3) |
+   StandardFunctionOp : CodeStandardFunction (q, op1, op2, op3) |
+   SavePriorityOp     : CodeSavePriority (op1, op2, op3) |
+   RestorePriorityOp  : CodeRestorePriority (op1, op2, op3) |
 
    InlineOp           : CodeInline (location, CurrentQuadToken, op3) |
    StatementNoteOp    : CodeStatementNote (op3) |
@@ -521,8 +518,8 @@ BEGIN
    ProfileOffOp       : |
    OptimizeOnOp       : |
    OptimizeOffOp      : |
-   RangeCheckOp       : CodeRange(q, op1, op2, op3) |
-   ErrorOp            : CodeError(q, op1, op2, op3) |
+   RangeCheckOp       : CodeRange (op3) |
+   ErrorOp            : CodeError (op3) |
    SaveExceptionOp    : CodeSaveException (op1, op3) |
    RestoreExceptionOp : CodeRestoreException (op1, op3)
 
@@ -566,12 +563,12 @@ BEGIN
          CASE op OF
 
          StandardFunctionOp : FoldStandardFunction(tokenno, p, quad, op1, op2, op3) |
-         BuiltinConstOp     : FoldBuiltinConst(tokenno, p, quad, op1, op2, op3) |
+         BuiltinConstOp     : FoldBuiltinConst (tokenno, p, quad, op1, op3) |
          BuiltinTypeInfoOp  : FoldBuiltinTypeInfo(tokenno, p, quad, op1, op2, op3) |
          LogicalOrOp        : FoldSetOr(tokenno, p, quad, op1, op2, op3) |
          LogicalAndOp       : FoldSetAnd(tokenno, p, quad, op1, op2, op3) |
          LogicalXorOp       : FoldSymmetricDifference(tokenno, p, quad, op1, op2, op3) |
-         BecomesOp          : FoldBecomes(tokenno, p, quad, op1, op2, op3) |
+         BecomesOp          : FoldBecomes (tokenno, p, quad, op1, op3) |
          AddOp              : FoldAdd(tokenno, p, quad, op1, op2, op3) |
          SubOp              : FoldSub(tokenno, p, quad, op1, op2, op3) |
          MultOp             : FoldMult(tokenno, p, quad, op1, op2, op3) |
@@ -583,20 +580,19 @@ BEGIN
          ModCeilOp          : FoldModCeil(tokenno, p, quad, op1, op2, op3) |
          DivFloorOp         : FoldDivFloor(tokenno, p, quad, op1, op2, op3) |
          ModFloorOp         : FoldModFloor(tokenno, p, quad, op1, op2, op3) |
-         NegateOp           : FoldNegate(tokenno, p, quad, op1, op2, op3) |
+         NegateOp           : FoldNegate (tokenno, p, quad, op1, op3) |
          SizeOp             : FoldSize(tokenno, p, quad, op1, op2, op3) |
          RecordFieldOp      : FoldRecordField(tokenno, p, quad, op1, op2, op3) |
-         OffsetOp           : FoldOffset(tokenno, p, quad, op1, op2, op3) |
          HighOp             : FoldHigh(tokenno, p, quad, op1, op2, op3) |
-         ElementSizeOp      : FoldElementSize(tokenno, p, quad, op1, op2, op3) |
+         ElementSizeOp      : FoldElementSize (tokenno, p, quad, op1, op2) |
          ConvertOp          : FoldConvert(tokenno, p, quad, op1, op2, op3) |
          CoerceOp           : FoldCoerce(tokenno, p, quad, op1, op2, op3) |
          CastOp             : FoldCast(tokenno, p, quad, op1, op2, op3) |
-         InclOp             : FoldIncl(tokenno, p, quad, op1, op2, op3) |
-         ExclOp             : FoldExcl(tokenno, p, quad, op1, op2, op3) |
-         IfLessOp           : FoldIfLess(tokenno, p, quad, op1, op2, op3) |
-         IfInOp             : FoldIfIn(tokenno, p, quad, op1, op2, op3) |
-         IfNotInOp          : FoldIfNotIn(tokenno, p, quad, op1, op2, op3) |
+         InclOp             : FoldIncl (tokenno, p, quad, op1, op3) |
+         ExclOp             : FoldExcl (tokenno, p, quad, op1, op3) |
+         IfLessOp           : FoldIfLess (tokenno, quad, op1, op2, op3) |
+         IfInOp             : FoldIfIn (tokenno, quad, op1, op2, op3) |
+         IfNotInOp          : FoldIfNotIn (tokenno, quad, op1, op2, op3) |
          LogicalShiftOp     : FoldSetShift(tokenno, p, quad, op1, op2, op3) |
          LogicalRotateOp    : FoldSetRotate(tokenno, p, quad, op1, op2, op3) |
          ParamOp            : FoldBuiltinFunction(tokenno, p, quad, op1, op2, op3) |
@@ -833,15 +829,14 @@ END FoldRange ;
 
 PROCEDURE CodeSaveException (des, exceptionProcedure: CARDINAL) ;
 VAR
-   functValue,
-   exceptionCall: Tree ;
-   location     : location_t;
+   functValue: Tree ;
+   location  : location_t;
 BEGIN
    location := TokenToLocation (CurrentQuadToken) ;
    BuildParam (location, Mod2Gcc (True)) ;
-   exceptionCall := BuildProcedureCallTree (location,
-                                            Mod2Gcc (exceptionProcedure),
-                                            Mod2Gcc (GetType (exceptionProcedure))) ;
+   BuildFunctionCallTree (location,
+                          Mod2Gcc (exceptionProcedure),
+                          Mod2Gcc (GetType (exceptionProcedure))) ;
    functValue := BuildFunctValue (location, Mod2Gcc (des)) ;
    AddStatement (location, functValue)
 END CodeSaveException ;
@@ -853,15 +848,14 @@ END CodeSaveException ;
 
 PROCEDURE CodeRestoreException (des, exceptionProcedure: CARDINAL) ;
 VAR
-   functValue,
-   exceptionCall: Tree ;
-   location     : location_t;
+   functValue: Tree ;
+   location  : location_t;
 BEGIN
    location := TokenToLocation (CurrentQuadToken) ;
    BuildParam (location, Mod2Gcc (des)) ;
-   exceptionCall := BuildProcedureCallTree (location,
-                                            Mod2Gcc (exceptionProcedure),
-                                            Mod2Gcc (GetType (exceptionProcedure))) ;
+   BuildFunctionCallTree (location,
+                          Mod2Gcc (exceptionProcedure),
+                          Mod2Gcc (GetType (exceptionProcedure))) ;
    functValue := BuildFunctValue (location, Mod2Gcc (des)) ;
    AddStatement (location, functValue)
 END CodeRestoreException ;
@@ -885,7 +879,8 @@ PROCEDURE PopScope ;
 VAR
    sym: CARDINAL ;
 BEGIN
-   sym := PopWord (ScopeStack)
+   sym := PopWord (ScopeStack) ;
+   Assert (sym # NulSym)
 END PopScope ;
 
 
@@ -934,9 +929,9 @@ END GetCurrentScopeDescription ;
    CodeRange - encode the range test associated with op3.
 *)
 
-PROCEDURE CodeRange (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeRange (rangeId: CARDINAL) ;
 BEGIN
-   CodeRangeCheck(op3, GetCurrentScopeDescription())
+   CodeRangeCheck (rangeId, GetCurrentScopeDescription ())
 END CodeRange ;
 
 
@@ -944,13 +939,13 @@ END CodeRange ;
    CodeError - encode the error test associated with op3.
 *)
 
-PROCEDURE CodeError (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeError (errorId: CARDINAL) ;
 BEGIN
    (* would like to test whether this position is in the same basicblock
       as any known entry point.  If so we could emit an error message.
    *)
-   AddStatement(TokenToLocation(CurrentQuadToken),
-                CodeErrorCheck(op3, GetCurrentScopeDescription(), NIL))
+   AddStatement (TokenToLocation (CurrentQuadToken),
+                 CodeErrorCheck (errorId, GetCurrentScopeDescription (), NIL))
 END CodeError ;
 
 
@@ -958,23 +953,16 @@ END CodeError ;
    CodeModuleScope - ModuleScopeOp is a quadruple which has the following
                      format:
 
-                     ModuleScopeOp  _  _  ModuleSym
+                     ModuleScopeOp  _  _  moduleSym
 
                      Its purpose is to reset the source file to another
                      file, hence all line numbers emitted with the
                      generated code will be relative to this source file.
 *)
 
-PROCEDURE CodeModuleScope (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeModuleScope (moduleSym: CARDINAL) ;
 BEGIN
-   PushScope(op3)
-(*
-   ModuleName := KillString(ModuleName) ;
-   ModuleName := InitStringCharStar(KeyToCharStar(GetSymName(op3))) ;
-
-   SetFileNameAndLineNo(KeyToCharStar(Name(op2)), op1) ;
-   EmitLineNote(KeyToCharStar(Name(op2)), op1)
-*)
+   PushScope (moduleSym)
 END CodeModuleScope ;
 
 
@@ -982,18 +970,18 @@ END CodeModuleScope ;
    CodeStartModFile - StartModFileOp is a quadruple which has the following
                       format:
 
-                      StartModFileOp  _  _  ModuleSym
+                      StartModFileOp  _  _  moduleSym
 
                       Its function is to reset the source file to another
                       file, hence all line numbers emitted with the
                       generated code will be relative to this source file.
 *)
 
-PROCEDURE CodeStartModFile (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeStartModFile (moduleSym: CARDINAL) ;
 BEGIN
    pushGlobalScope ;
    LastLine := 1 ;
-   PushScope(op3)
+   PushScope (moduleSym)
 END CodeStartModFile ;
 
 
@@ -1001,17 +989,17 @@ END CodeStartModFile ;
    CodeStartDefFile - StartDefFileOp is a quadruple which has the following
                       format:
 
-                      StartDefFileOp  _  _  ModuleSym
+                      StartDefFileOp  _  _  moduleSym
 
                       Its function is to reset the source file to another
                       file, hence all line numbers emitted with the
                       generated code will be relative to this source file.
 *)
 
-PROCEDURE CodeStartDefFile (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeStartDefFile (moduleSym: CARDINAL) ;
 BEGIN
    pushGlobalScope ;
-   PushScope(op3) ;
+   PushScope (moduleSym) ;
    LastLine := 1
 END CodeStartDefFile ;
 
@@ -1019,14 +1007,14 @@ END CodeStartDefFile ;
 (*
    CodeEndFile - FileOp is a quadruple which has the following format:
 
-                 EndFileOp  _  _  ModuleSym
+                 EndFileOp
 
                  Its function is to reset the source file to another
                  file, hence all line numbers emitted with the
                  generated code will be relative to this source file.
 *)
 
-PROCEDURE CodeEndFile (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeEndFile ;
 BEGIN
    popGlobalScope
 END CodeEndFile ;
@@ -1063,7 +1051,7 @@ END CallInnerFinally ;
                    current module.
 *)
 
-PROCEDURE CodeInitStart (quad: CARDINAL; op1, op2, op3: CARDINAL;
+PROCEDURE CodeInitStart (currentScope, moduleSym: CARDINAL;
                          CompilingMainModule: BOOLEAN) ;
 VAR
    CurrentModuleInitFunction: Tree ;
@@ -1072,17 +1060,17 @@ BEGIN
    IF CompilingMainModule OR WholeProgram
    THEN
       (* SetFileNameAndLineNo(string(FileName), op1) ; *)
-      location := TokenToLocation(CurrentQuadToken) ;
-      IF IsModuleWithinProcedure(op3)
+      location := TokenToLocation (CurrentQuadToken) ;
+      IF IsModuleWithinProcedure (moduleSym)
       THEN
-         CurrentModuleInitFunction := Mod2Gcc(op3) ;
-         BuildStartFunctionCode(location, CurrentModuleInitFunction, FALSE, FALSE)
+         CurrentModuleInitFunction := Mod2Gcc (moduleSym) ;
+         BuildStartFunctionCode (location, CurrentModuleInitFunction, FALSE, FALSE)
       ELSE
-         CurrentModuleInitFunction := BuildStart(location, KeyToCharStar(GetModuleInitName(op3)), op2#op3) ;
-         AddModGcc(op3, CurrentModuleInitFunction)
+         CurrentModuleInitFunction := BuildStart (location, KeyToCharStar (GetModuleInitName (moduleSym)), currentScope#moduleSym) ;
+         AddModGcc (moduleSym, CurrentModuleInitFunction)
       END ;
       (* EmitLineNote(string(FileName), op1) ; *)
-      ForeachInnerModuleDo(op3, CallInnerInit)
+      ForeachInnerModuleDo (moduleSym, CallInnerInit)
    END
 END CodeInitStart ;
 
@@ -1112,11 +1100,11 @@ END BuildTerminationCall ;
                  current module.
 *)
 
-PROCEDURE CodeInitEnd (quad: CARDINAL; op1, op2, op3: CARDINAL;
+PROCEDURE CodeInitEnd (moduleSym: CARDINAL;
                        CompilingMainModule: BOOLEAN) ;
 VAR
-   t       : Tree ;
-   location: location_t ;
+   moduleTree: Tree ;
+   location  : location_t ;
 BEGIN
    IF CompilingMainModule OR WholeProgram
    THEN
@@ -1125,15 +1113,15 @@ BEGIN
          EmitLineNote(string(FileName), op1) ;
       *)
 
-      location := TokenToLocation(GetDeclaredMod(op3)) ;
-      t := Mod2Gcc(op3) ;
-      finishFunctionDecl(location, t) ;
+      location := TokenToLocation (GetDeclaredMod (moduleSym)) ;
+      moduleTree := Mod2Gcc (moduleSym) ;
+      finishFunctionDecl (location, moduleTree) ;
 
-      IF IsModuleWithinProcedure(op3)
+      IF IsModuleWithinProcedure (moduleSym)
       THEN
-         BuildEndFunctionCode(location, t, TRUE)
+         BuildEndFunctionCode (location, moduleTree, TRUE)
       ELSE
-         BuildEnd(location, t, FALSE)
+         BuildEnd (location, moduleTree, FALSE)
       END
    END
 END CodeInitEnd ;
@@ -1144,7 +1132,7 @@ END CodeInitEnd ;
                       current module.
 *)
 
-PROCEDURE CodeFinallyStart (quad: CARDINAL; op1, op2, op3: CARDINAL;
+PROCEDURE CodeFinallyStart (outerModule, moduleSym: CARDINAL;
                             CompilingMainModule: BOOLEAN) ;
 VAR
    CurrentModuleFinallyFunction: Tree ;
@@ -1153,18 +1141,18 @@ BEGIN
    IF CompilingMainModule OR WholeProgram
    THEN
       (* SetFileNameAndLineNo(string(FileName), op1) ; *)
-      location := TokenToLocation(CurrentQuadToken) ;
-      IF IsModuleWithinProcedure(op3)
+      location := TokenToLocation (CurrentQuadToken) ;
+      IF IsModuleWithinProcedure (moduleSym)
       THEN
-         CurrentModuleFinallyFunction := GetModuleFinallyFunction(op3) ;
-         BuildStartFunctionCode(location, CurrentModuleFinallyFunction, FALSE, FALSE)
+         CurrentModuleFinallyFunction := GetModuleFinallyFunction (moduleSym) ;
+         BuildStartFunctionCode (location, CurrentModuleFinallyFunction, FALSE, FALSE)
       ELSE
-         CurrentModuleFinallyFunction := BuildStart(location,
-                                                    KeyToCharStar(GetModuleFinallyName(op3)), op2#op3) ;
-         PutModuleFinallyFunction(op3, CurrentModuleFinallyFunction)
+         CurrentModuleFinallyFunction := BuildStart (location,
+                                                     KeyToCharStar(GetModuleFinallyName (moduleSym)), outerModule#moduleSym) ;
+         PutModuleFinallyFunction (moduleSym, CurrentModuleFinallyFunction)
       END ;
       (* EmitLineNote(string(FileName), op1) ; *)
-      ForeachInnerModuleDo(op3, CallInnerFinally)
+      ForeachInnerModuleDo (moduleSym, CallInnerFinally)
    END
 END CodeFinallyStart ;
 
@@ -1174,11 +1162,11 @@ END CodeFinallyStart ;
                     current module.
 *)
 
-PROCEDURE CodeFinallyEnd (quad: CARDINAL; op1, op2, op3: CARDINAL;
+PROCEDURE CodeFinallyEnd (moduleSym: CARDINAL;
                           CompilingMainModule: BOOLEAN) ;
 VAR
-   t       : Tree ;
-   location: location_t ;
+   moduleTree: Tree ;
+   location  : location_t ;
 BEGIN
    IF CompilingMainModule OR WholeProgram
    THEN
@@ -1187,15 +1175,15 @@ BEGIN
          EmitLineNote(string(FileName), op1) ;
       *)
 
-      location := TokenToLocation(GetDeclaredMod(op3)) ;
-      t := GetModuleFinallyFunction(op3) ;
-      finishFunctionDecl(TokenToLocation(GetDeclaredMod(op3)), t) ;
+      location := TokenToLocation (GetDeclaredMod (moduleSym)) ;
+      moduleTree := GetModuleFinallyFunction (moduleSym) ;
+      finishFunctionDecl (TokenToLocation (GetDeclaredMod (moduleSym)), moduleTree) ;
 
-      IF IsModuleWithinProcedure(op3)
+      IF IsModuleWithinProcedure (moduleSym)
       THEN
-         BuildEndFunctionCode(location, t, TRUE)
+         BuildEndFunctionCode (location, moduleTree, TRUE)
       ELSE
-         BuildEnd(location, t, FALSE)
+         BuildEnd (location, moduleTree, FALSE)
       END
    END
 END CodeFinallyEnd ;
@@ -1230,8 +1218,8 @@ VAR
    ArrayType,
    HighField    : CARDINAL ;
    HighTree     : Tree ;
-   accessibleDim,
-   remainingDim : CARDINAL ;
+   accessibleDim: CARDINAL ;
+   (* remainingDim : CARDINAL ;  *)
 BEGIN
    UnboundedType := GetType (param) ;
    Assert (IsUnbounded (UnboundedType)) ;
@@ -1250,8 +1238,8 @@ BEGIN
       THEN
          MetaError1 ('{%EkHIGH} dimension number {%1N} for array does not exist', dim)
       ELSE
-         remainingDim := dim - accessibleDim ;
-         HighTree := BuildHighFromStaticArray (location, remainingDim, ArrayType) ;
+         (* remainingDim := dim - accessibleDim ;  --fixme-- write tests to stress this code.  *)
+         HighTree := BuildHighFromStaticArray (location, (* remainingDim, *) ArrayType) ;
          IF HighTree = NIL
          THEN
             MetaError1 ('{%EkHIGH} dimension number {%1N} for array does not exist', dim)
@@ -1350,45 +1338,43 @@ END MaybeDebugBuiltinMemcpy ;
 
 
 (*
-   MakeCopyAndUse - make a copy of the unbounded array and alter all references
-                    from the old unbounded array to the new unbounded array.
-                    The parameter, param, contains a RECORD
-                                                        ArrayAddress: ADDRESS ;
-                                                        ArrayHigh   : CARDINAL ;
-                                                     END
-                    we simply declare a new array of size, ArrayHigh
-                    and set ArrayAddress to the address of the copy.
+   MakeCopyUse - make a copy of the unbounded array and alter all references
+                 from the old unbounded array to the new unbounded array.
+                 The parameter, param, contains a RECORD
+                                                     ArrayAddress: ADDRESS ;
+                                                     ArrayHigh   : CARDINAL ;
+                                                  END
+                 we simply declare a new array of size, ArrayHigh
+                 and set ArrayAddress to the address of the copy.
 
-                    Remember ArrayHigh == sizeof(Array)-sizeof(typeof(array))
-                             so we add 1 for the size and add 1 for a possible <nul>
+                 Remember ArrayHigh == sizeof(Array)-sizeof(typeof(array))
+                          so we add 1 for the size and add 1 for a possible <nul>
 *)
 
-PROCEDURE MakeCopyAndUse (tokenno: CARDINAL; proc, param, i: CARDINAL) ;
+PROCEDURE MakeCopyUse (tokenno: CARDINAL; param: CARDINAL) ;
 VAR
    location     : location_t;
    UnboundedType: CARDINAL ;
    Addr,
    High,
-   NewArray,
-   Type         : Tree ;
+   NewArray     : Tree ;
 BEGIN
    location := TokenToLocation(tokenno) ;
-   UnboundedType := GetType(param) ;
-   Assert(IsUnbounded(UnboundedType)) ;
+   UnboundedType := GetType (param) ;
+   Assert (IsUnbounded (UnboundedType)) ;
 
-   High := GetSizeOfHighFromUnbounded(tokenno, param) ;
-   Addr := GetAddressOfUnbounded(location, param) ;
-   Type := Mod2Gcc(GetType(param)) ;
+   High := GetSizeOfHighFromUnbounded (tokenno, param) ;
+   Addr := GetAddressOfUnbounded (location, param) ;
 
-   NewArray := MaybeDebugBuiltinAlloca(location, tokenno, High) ;
-   NewArray := MaybeDebugBuiltinMemcpy(location, tokenno, NewArray, Addr, High) ;
+   NewArray := MaybeDebugBuiltinAlloca (location, tokenno, High) ;
+   NewArray := MaybeDebugBuiltinMemcpy (location, tokenno, NewArray, Addr, High) ;
 
    (* now assign  param.Addr := ADR(NewArray) *)
 
    BuildAssignmentStatement (location,
                              BuildComponentRef (location, Mod2Gcc (param), Mod2Gcc (GetUnboundedAddressOffset (UnboundedType))),
                              NewArray)
-END MakeCopyAndUse ;
+END MakeCopyUse ;
 
 
 (*
@@ -1505,12 +1491,12 @@ END DoIsIntersection ;
    BuildCascadedIfThenElsif - mustCheck contains a list of variables which
                               must be checked against the address of (proc, param, i).
                               If the address matches we make a copy of the unbounded
-                              parameter (proc, param, i) and quit further checking.
+                              parameter (proc, param) and quit further checking.
 *)
 
 PROCEDURE BuildCascadedIfThenElsif (tokenno: CARDINAL;
                                     mustCheck: List;
-                                    proc, param, i: CARDINAL) ;
+                                    proc, param: CARDINAL) ;
 VAR
    ta, tb,
    tc, td  : Tree ;
@@ -1554,8 +1540,8 @@ BEGIN
          THEN
             printf1('label declared %s\n', tLabel)
          END ;
-         DeclareLabel(location, string(tLabel)) ;
-         MakeCopyAndUse(tokenno, proc, param, i) ;
+         DeclareLabel (location, string (tLabel)) ;
+         MakeCopyUse (tokenno, param) ;
          IF j<n
          THEN
             nLabel := CreateLabelProcedureN(proc, "n", UnboundedLabelNo, n+1) ;
@@ -1600,7 +1586,7 @@ END BuildCascadedIfThenElsif ;
 
 PROCEDURE CheckUnboundedNonVarParameter (tokenno: CARDINAL;
                                          trashed: List;
-                                         proc, param, i: CARDINAL) ;
+                                         proc, param: CARDINAL) ;
 VAR
    mustCheck   : List ;
    paramTrashed,
@@ -1611,7 +1597,7 @@ VAR
 BEGIN
    IF IsUnboundedWrittenTo(proc, param)
    THEN
-      MakeCopyAndUse(tokenno, proc, param, i)
+      MakeCopyUse (tokenno, param)
    ELSE
       InitList(mustCheck) ;
       n := NoOfItemsInList(trashed) ;
@@ -1640,7 +1626,7 @@ BEGIN
          INC(j)
       END ;
       (* now we build a sequence of if then { elsif then } end to check addresses *)
-      BuildCascadedIfThenElsif(tokenno, mustCheck, proc, param, i) ;
+      BuildCascadedIfThenElsif (tokenno, mustCheck, proc, param) ;
       KillList(mustCheck)
    END
 END CheckUnboundedNonVarParameter ;
@@ -1725,7 +1711,7 @@ BEGIN
    WHILE i<=p DO
       IF IsUnboundedParam(proc, i) AND (NOT IsVarParam(proc, i))
       THEN
-         CheckUnboundedNonVarParameter(tokenno, trashed, proc, GetNth(proc, i), i)
+         CheckUnboundedNonVarParameter (tokenno, trashed, proc, GetNth (proc, i))
       END ;
       INC(i)
    END ;
@@ -1791,8 +1777,7 @@ END AutoInitialize ;
                      local variables.
 *)
 
-PROCEDURE CodeNewLocalVar (quad: CARDINAL;
-                           tokenno, PreviousScope, CurrentProcedure: CARDINAL) ;
+PROCEDURE CodeNewLocalVar (tokenno, CurrentProcedure: CARDINAL) ;
 VAR
    begin, end: CARDINAL ;
 BEGIN
@@ -1801,8 +1786,8 @@ BEGIN
    BuildPushFunctionContext ;
    GetProcedureBeginEnd (CurrentProcedure, begin, end) ;
    CurrentQuadToken := begin ;
-   SetBeginLocation (TokenToLocation(begin)) ;
-   AutoInitialize (TokenToLocation(begin), CurrentProcedure) ;
+   SetBeginLocation (TokenToLocation (begin)) ;
+   AutoInitialize (TokenToLocation (begin), CurrentProcedure) ;
    ForeachProcedureDo (CurrentProcedure, CodeBlock) ;
    ForeachInnerModuleDo (CurrentProcedure, CodeBlock) ;
    BuildPopFunctionContext ;
@@ -1814,8 +1799,7 @@ END CodeNewLocalVar ;
    CodeKillLocalVar - removes local variables and returns to previous scope.
 *)
 
-PROCEDURE CodeKillLocalVar (quad: CARDINAL;
-                            tokenno, op2, CurrentProcedure: CARDINAL) ;
+PROCEDURE CodeKillLocalVar (CurrentProcedure: CARDINAL) ;
 VAR
    begin, end: CARDINAL ;
 BEGIN
@@ -1834,52 +1818,42 @@ END CodeKillLocalVar ;
    CodeProcedureScope -
 *)
 
-PROCEDURE CodeProcedureScope (quad: CARDINAL;
-                              LineNo, PreviousScope, CurrentProcedure: CARDINAL) ;
+PROCEDURE CodeProcedureScope (CurrentProcedure: CARDINAL) ;
 VAR
    begin, end: CARDINAL ;
 BEGIN
    removeStmtNote () ;
-   GetProcedureBeginEnd(CurrentProcedure, begin, end) ;
-   BuildStartFunctionCode(TokenToLocation(begin),
-                          Mod2Gcc(CurrentProcedure),
-                          IsExportedGcc(CurrentProcedure),
-                          IsProcedureInline(CurrentProcedure)) ;
-   StartDeclareScope(CurrentProcedure) ;
-   PushScope(CurrentProcedure) ;
+   GetProcedureBeginEnd (CurrentProcedure, begin, end) ;
+   BuildStartFunctionCode (TokenToLocation (begin),
+                           Mod2Gcc (CurrentProcedure),
+                           IsExportedGcc (CurrentProcedure),
+                           IsProcedureInline (CurrentProcedure)) ;
+   StartDeclareScope (CurrentProcedure) ;
+   PushScope (CurrentProcedure) ;
    (* DeclareParameters(CurrentProcedure) *)
 END CodeProcedureScope ;
 
 
-(*
-   CodeReturn - does nothing, as the return is done by KillLocalVar.
-*)
-
-PROCEDURE CodeReturn (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
-BEGIN
-END CodeReturn ;
-
-
 (*
    CodeReturnValue - places the operand into the return value space
                      allocated by the function call.
 *)
 
-PROCEDURE CodeReturnValue (quad: CARDINAL; res, Procedure: CARDINAL) ;
+PROCEDURE CodeReturnValue (res, Procedure: CARDINAL) ;
 VAR
    value, length, op3t : Tree ;
    location: location_t ;
 BEGIN
-   location := TokenToLocation(CurrentQuadToken) ;
-   TryDeclareConstant(CurrentQuadToken, res) ;  (* checks to see whether it is a constant and declares it *)
-   TryDeclareConstructor(CurrentQuadToken, res) ;
-   IF IsConstString(res) AND (SkipTypeAndSubrange(GetType(Procedure))#Char)
+   location := TokenToLocation (CurrentQuadToken) ;
+   TryDeclareConstant (CurrentQuadToken, res) ;  (* checks to see whether it is a constant and declares it *)
+   TryDeclareConstructor (CurrentQuadToken, res) ;
+   IF IsConstString (res) AND (SkipTypeAndSubrange (GetType (Procedure)) # Char)
    THEN
       DoCopyString (CurrentQuadToken, length, op3t, GetType (Procedure), res) ;
       value := BuildArrayStringConstructor (location,
-                                            Mod2Gcc(GetType(Procedure)), op3t, length)
+                                            Mod2Gcc (GetType (Procedure)), op3t, length)
    ELSE
-      value := Mod2Gcc(res)
+      value := Mod2Gcc (res)
    END ;
    BuildReturnValueCode (location, Mod2Gcc (Procedure), value)
 END CodeReturnValue ;
@@ -1932,24 +1906,24 @@ END CheckCleanup ;
               or an indirect procedure call.
 *)
 
-PROCEDURE CodeCall (tokenno: CARDINAL; op1, op2, procedure: CARDINAL) ;
+PROCEDURE CodeCall (tokenno: CARDINAL; procedure: CARDINAL) ;
 VAR
    tree    : Tree ;
    location: location_t ;
 BEGIN
-   IF IsProcedure(procedure)
+   IF IsProcedure (procedure)
    THEN
-      DeclareParameters(procedure) ;
-      tree := CodeDirectCall(tokenno, procedure)
-   ELSIF IsProcType(SkipType(GetType(procedure)))
+      DeclareParameters (procedure) ;
+      tree := CodeDirectCall (tokenno, procedure)
+   ELSIF IsProcType (SkipType (GetType (procedure)))
    THEN
-      DeclareParameters(SkipType(GetType(procedure))) ;
-      tree := CodeIndirectCall(tokenno, procedure) ;
-      procedure := SkipType(GetType(procedure))
+      DeclareParameters (SkipType (GetType (procedure))) ;
+      tree := CodeIndirectCall (tokenno, procedure) ;
+      procedure := SkipType (GetType (procedure))
    ELSE
       InternalError ('expecting Procedure or ProcType')
    END ;
-   IF GetType(procedure)=NulSym
+   IF GetType (procedure) = NulSym
    THEN
       location := TokenToLocation (tokenno) ;
       AddStatement (location, tree)
@@ -2452,6 +2426,7 @@ VAR
    location  : location_t ;
 BEGIN
    resolved := TRUE ;
+   procedure := NulSym ;
    n := q ;
    r := op1 ;
    REPEAT
@@ -2611,7 +2586,7 @@ END Replace ;
                     into a variable.
 *)
 
-PROCEDURE CodeFunctValue (location: location_t; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeFunctValue (location: location_t; op1: CARDINAL) ;
 VAR
    call,
    value: Tree ;
@@ -2643,7 +2618,7 @@ END CodeFunctValue ;
    Sym1<X>   Addr   Sym2<X>     meaning     Mem[Sym1<I>] := Sym2<I>
 *)
 
-PROCEDURE CodeAddr (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeAddr (quad: CARDINAL; op1, op3: CARDINAL) ;
 VAR
    value   : Tree ;
    type    : CARDINAL ;
@@ -2687,9 +2662,8 @@ END CheckStop ;
    Sym1<I> := Sym3<I>           := produces a constant
 *)
 
-PROCEDURE FoldBecomes (tokenno: CARDINAL; p: WalkAction; quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE FoldBecomes (tokenno: CARDINAL; p: WalkAction; quad: CARDINAL; op1, op3: CARDINAL) ;
 VAR
-   t: Tree ;
    location: location_t ;
 BEGIN
    TryDeclareConstant(tokenno, op3) ;  (* checks to see whether it is a constant literal and declares it *)
@@ -2771,7 +2745,7 @@ BEGIN
             p (op1) ;
             NoChange := FALSE ;
             SubQuad(quad) ;
-            t := RememberConstant(Mod2Gcc(op1))
+            Assert (RememberConstant(Mod2Gcc (op1)) = Mod2Gcc (op1))
          END
       ELSE
          (* not to worry, we must wait until op3 is known *)
@@ -2789,13 +2763,13 @@ VAR
    CodeTry - starts building a GCC 'try' node.
 *)
 
-PROCEDURE CodeTry (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeTry ;
 VAR
    location: location_t ;
 BEGIN
-   location := TokenToLocation(CurrentQuadToken) ;
+   location := TokenToLocation (CurrentQuadToken) ;
    handlerBlock := NIL ;
-   tryBlock := BuildTryBegin(location)
+   tryBlock := BuildTryBegin (location)
 END CodeTry ;
 
 
@@ -2803,49 +2777,49 @@ END CodeTry ;
    CodeThrow - builds a GCC 'throw' node.
 *)
 
-PROCEDURE CodeThrow (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeThrow (value: CARDINAL) ;
 VAR
    location: location_t ;
 BEGIN
-   location := TokenToLocation(CurrentQuadToken) ;
-   IF op3=NulSym
+   location := TokenToLocation (CurrentQuadToken) ;
+   IF value = NulSym
    THEN
-      AddStatement(location, BuildThrow(location, Tree(NIL)))
+      AddStatement (location, BuildThrow (location, Tree (NIL)))
    ELSE
-      DeclareConstant(CurrentQuadToken, op3) ;  (* checks to see whether it is a constant and declares it *)
-      AddStatement(location, BuildThrow(location, BuildConvert(location,
-                                                               GetIntegerType(),
-                                                               Mod2Gcc(op3), FALSE)))
+      DeclareConstant (CurrentQuadToken, value) ;  (* checks to see whether it is a constant and declares it *)
+      AddStatement (location, BuildThrow (location, BuildConvert (location,
+                                                                  GetIntegerType (),
+                                                                  Mod2Gcc (value), FALSE)))
    END
 END CodeThrow ;
 
 
-PROCEDURE CodeRetry (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeRetry (destQuad: CARDINAL) ;
 VAR
    location: location_t ;
 BEGIN
-   location := TokenToLocation(CurrentQuadToken) ;
-   BuildGoto(location, string(CreateLabelName(op3)))
+   location := TokenToLocation (CurrentQuadToken) ;
+   BuildGoto (location, string (CreateLabelName (destQuad)))
 END CodeRetry ;
 
 
-PROCEDURE CodeCatchBegin (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeCatchBegin ;
 VAR
    location: location_t ;
 BEGIN
-   location := TokenToLocation(CurrentQuadToken) ;
-   BuildTryEnd(tryBlock) ;
-   handlerBlock := BuildCatchBegin(location)
+   location := TokenToLocation (CurrentQuadToken) ;
+   BuildTryEnd (tryBlock) ;
+   handlerBlock := BuildCatchBegin (location)
 END CodeCatchBegin ;
 
 
-PROCEDURE CodeCatchEnd (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeCatchEnd ;
 VAR
    location: location_t ;
 BEGIN
-   location := TokenToLocation(CurrentQuadToken) ;
-   tryBlock := BuildCatchEnd(location, handlerBlock, tryBlock) ;
-   AddStatement(location, tryBlock)
+   location := TokenToLocation (CurrentQuadToken) ;
+   tryBlock := BuildCatchEnd (location, handlerBlock, tryBlock) ;
+   AddStatement (location, tryBlock)
 END CodeCatchEnd ;
 
 
@@ -3127,15 +3101,15 @@ END checkIncorrectMeta ;
    checkBecomes - returns TRUE if the checks pass.
 *)
 
-PROCEDURE checkBecomes (quad: CARDINAL; op1, op2: CARDINAL) : BOOLEAN ;
+PROCEDURE checkBecomes (des, expr: CARDINAL) : BOOLEAN ;
 BEGIN
-   IF (NOT checkArrayElements(op1, op2)) OR
-      (NOT checkRecordTypes(op1, op2)) OR
-      (NOT checkIncorrectMeta(op1, op2))
+   IF (NOT checkArrayElements (des, expr)) OR
+      (NOT checkRecordTypes (des, expr)) OR
+      (NOT checkIncorrectMeta (des, expr))
    THEN
-      RETURN( FALSE )
+      RETURN FALSE
    END ;
-   RETURN( TRUE )
+   RETURN TRUE
 END checkBecomes ;
 
 
@@ -3213,7 +3187,7 @@ BEGIN
                                                 BuildAddr(location, Mod2Gcc (op3), FALSE),
                                                 BuildSize(location, Mod2Gcc (op1), FALSE)))
       ELSE
-         IF checkBecomes (quad, op1, op3)
+         IF checkBecomes (op1, op3)
          THEN
             IF IsVariableSSA (op1)
             THEN
@@ -3624,13 +3598,13 @@ END FoldAdd ;
                     is required.
 *)
 
-PROCEDURE CodeAddChecked (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeAddChecked (quad: CARDINAL; left, right: CARDINAL) ;
 BEGIN
    IF MustCheckOverflow (quad)
    THEN
-      CodeAddCheck (quad, op1, op2, op3)
+      CodeAddCheck (quad, left, right)
    ELSE
-      CodeAdd (quad, op1, op2, op3)
+      CodeAdd (quad, left, right)
    END
 END CodeAddChecked ;
 
@@ -3639,9 +3613,9 @@ END CodeAddChecked ;
    CodeAddCheck - encode addition but check for overflow.
 *)
 
-PROCEDURE CodeAddCheck (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeAddCheck (quad, left, right: CARDINAL) ;
 BEGIN
-   IF BinaryOperands (quad, op2, op3)
+   IF BinaryOperands (quad, left, right)
    THEN
       CodeBinaryCheck (BuildAddCheck, quad)
    END
@@ -3652,9 +3626,9 @@ END CodeAddCheck ;
    CodeAdd - encode addition.
 *)
 
-PROCEDURE CodeAdd (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeAdd (quad: CARDINAL; left, right: CARDINAL) ;
 BEGIN
-   IF BinaryOperands(quad, op2, op3)
+   IF BinaryOperands (quad, left, right)
    THEN
       CodeBinary (BuildAdd, quad)
    END
@@ -3680,13 +3654,13 @@ END FoldSub ;
                     is required.
 *)
 
-PROCEDURE CodeSubChecked (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeSubChecked (quad: CARDINAL; left, right: CARDINAL) ;
 BEGIN
    IF MustCheckOverflow (quad)
    THEN
-      CodeSubCheck (quad, op1, op2, op3)
+      CodeSubCheck (quad, left, right)
    ELSE
-      CodeSub (quad, op1, op2, op3)
+      CodeSub (quad, left, right)
    END
 END CodeSubChecked ;
 
@@ -3695,9 +3669,9 @@ END CodeSubChecked ;
    CodeSubCheck - encode subtraction but check for overflow.
 *)
 
-PROCEDURE CodeSubCheck (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeSubCheck (quad: CARDINAL; left, right: CARDINAL) ;
 BEGIN
-   IF BinaryOperands(quad, op2, op3)
+   IF BinaryOperands(quad, left, right)
    THEN
       CodeBinaryCheck (BuildSubCheck, quad)
    END
@@ -3708,9 +3682,9 @@ END CodeSubCheck ;
    CodeSub - encode subtraction.
 *)
 
-PROCEDURE CodeSub (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeSub (quad: CARDINAL; left, right: CARDINAL) ;
 BEGIN
-   IF BinaryOperands(quad, op2, op3)
+   IF BinaryOperands(quad, left, right)
    THEN
       CodeBinary (BuildSub, quad)
    END
@@ -3736,13 +3710,13 @@ END FoldMult ;
                      is required.
 *)
 
-PROCEDURE CodeMultChecked (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeMultChecked (quad: CARDINAL; left, right: CARDINAL) ;
 BEGIN
    IF MustCheckOverflow (quad)
    THEN
-      CodeMultCheck (quad, op1, op2, op3)
+      CodeMultCheck (quad, left, right)
    ELSE
-      CodeMult (quad, op1, op2, op3)
+      CodeMult (quad, left, right)
    END
 END CodeMultChecked ;
 
@@ -3751,9 +3725,9 @@ END CodeMultChecked ;
    CodeMultCheck - encode multiplication but check for overflow.
 *)
 
-PROCEDURE CodeMultCheck (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeMultCheck (quad: CARDINAL; left, right: CARDINAL) ;
 BEGIN
-   IF BinaryOperands (quad, op2, op3)
+   IF BinaryOperands (quad, left, right)
    THEN
       CodeBinaryCheck (BuildMultCheck, quad)
    END
@@ -3764,9 +3738,9 @@ END CodeMultCheck ;
    CodeMult - encode multiplication.
 *)
 
-PROCEDURE CodeMult (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeMult (quad: CARDINAL; left, right: CARDINAL) ;
 BEGIN
-   IF BinaryOperands(quad, op2, op3)
+   IF BinaryOperands (quad, left, right)
    THEN
       CodeBinary (BuildMult, quad)
    END
@@ -3778,13 +3752,13 @@ END CodeMult ;
                       is required.
 *)
 
-PROCEDURE CodeDivM2Checked (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeDivM2Checked (quad: CARDINAL; left, right: CARDINAL) ;
 BEGIN
    IF MustCheckOverflow (quad)
    THEN
-      CodeDivM2Check (quad, op1, op2, op3)
+      CodeDivM2Check (quad, left, right)
    ELSE
-      CodeDivM2 (quad, op1, op2, op3)
+      CodeDivM2 (quad, left, right)
    END
 END CodeDivM2Checked ;
 
@@ -3793,9 +3767,9 @@ END CodeDivM2Checked ;
    CodeDivM2Check - encode addition but check for overflow.
 *)
 
-PROCEDURE CodeDivM2Check (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeDivM2Check (quad: CARDINAL; left, right: CARDINAL) ;
 BEGIN
-   IF BinaryOperands (quad, op2, op3)
+   IF BinaryOperands (quad, left, right)
    THEN
       CodeBinaryCheck (BuildDivM2Check, quad)
    END
@@ -3807,13 +3781,13 @@ END CodeDivM2Check ;
                       is required.
 *)
 
-PROCEDURE CodeModM2Checked (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeModM2Checked (quad: CARDINAL; left, right: CARDINAL) ;
 BEGIN
    IF MustCheckOverflow (quad)
    THEN
-      CodeModM2Check (quad, op1, op2, op3)
+      CodeModM2Check (quad, left, right)
    ELSE
-      CodeModM2 (quad, op1, op2, op3)
+      CodeModM2 (quad, left, right)
    END
 END CodeModM2Checked ;
 
@@ -3822,9 +3796,9 @@ END CodeModM2Checked ;
    CodeModM2Check - encode addition but check for overflow.
 *)
 
-PROCEDURE CodeModM2Check (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeModM2Check (quad: CARDINAL; left, right: CARDINAL) ;
 BEGIN
-   IF BinaryOperands (quad, op2, op3)
+   IF BinaryOperands (quad, left, right)
    THEN
       CodeBinaryCheck (BuildModM2Check, quad)
    END
@@ -3850,7 +3824,7 @@ END BinaryOperandRealFamily ;
 *)
 
 PROCEDURE FoldDivM2 (tokenno: CARDINAL; p: WalkAction;
-                        quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+                     quad: CARDINAL; op1, op2, op3: CARDINAL) ;
 BEGIN
    IF BinaryOperands(quad, op2, op3)
    THEN
@@ -3868,11 +3842,11 @@ END FoldDivM2 ;
    CodeDivM2 - encode division.
 *)
 
-PROCEDURE CodeDivM2 (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeDivM2 (quad: CARDINAL; left, right: CARDINAL) ;
 BEGIN
-   IF BinaryOperands(quad, op2, op3)
+   IF BinaryOperands (quad, left, right)
    THEN
-      IF BinaryOperandRealFamily(op2) OR BinaryOperandRealFamily(op3)
+      IF BinaryOperandRealFamily (left) OR BinaryOperandRealFamily (right)
       THEN
          CodeBinary (BuildRDiv, quad)
       ELSE
@@ -3900,9 +3874,9 @@ END FoldModM2 ;
    CodeModM2 - encode modulus.
 *)
 
-PROCEDURE CodeModM2 (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeModM2 (quad: CARDINAL; left, right: CARDINAL) ;
 BEGIN
-   IF BinaryOperands(quad, op2, op3)
+   IF BinaryOperands(quad, left, right)
    THEN
       CodeBinary (BuildModM2, quad)
    END
@@ -3932,11 +3906,11 @@ END FoldDivTrunc ;
    CodeDivTrunc - encode multiplication.
 *)
 
-PROCEDURE CodeDivTrunc (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeDivTrunc (quad: CARDINAL; left, right: CARDINAL) ;
 BEGIN
-   IF BinaryOperands(quad, op2, op3)
+   IF BinaryOperands(quad, left, right)
    THEN
-      IF BinaryOperandRealFamily(op2) OR BinaryOperandRealFamily(op3)
+      IF BinaryOperandRealFamily (left) OR BinaryOperandRealFamily (right)
       THEN
          CodeBinary (BuildRDiv, quad)
       ELSE
@@ -3953,7 +3927,7 @@ END CodeDivTrunc ;
 PROCEDURE FoldModTrunc (tokenno: CARDINAL; p: WalkAction;
                         quad: CARDINAL; op1, op2, op3: CARDINAL) ;
 BEGIN
-   IF BinaryOperands(quad, op2, op3)
+   IF BinaryOperands (quad, op2, op3)
    THEN
       FoldBinary(tokenno, p, BuildModTrunc, quad, op1, op2, op3)
    END
@@ -3964,9 +3938,9 @@ END FoldModTrunc ;
    CodeModTrunc - encode modulus.
 *)
 
-PROCEDURE CodeModTrunc (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeModTrunc (quad: CARDINAL; left, right: CARDINAL) ;
 BEGIN
-   IF BinaryOperands(quad, op2, op3)
+   IF BinaryOperands (quad, left, right)
    THEN
       CodeBinary (BuildModTrunc, quad)
    END
@@ -3996,11 +3970,11 @@ END FoldDivCeil ;
    CodeDivCeil - encode multiplication.
 *)
 
-PROCEDURE CodeDivCeil (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeDivCeil (quad: CARDINAL; left, right: CARDINAL) ;
 BEGIN
-   IF BinaryOperands(quad, op2, op3)
+   IF BinaryOperands(quad, left, right)
    THEN
-      IF BinaryOperandRealFamily(op2) OR BinaryOperandRealFamily(op3)
+      IF BinaryOperandRealFamily (left) OR BinaryOperandRealFamily (right)
       THEN
          CodeBinary (BuildRDiv, quad)
       ELSE
@@ -4028,9 +4002,9 @@ END FoldModCeil ;
    CodeModCeil - encode multiplication.
 *)
 
-PROCEDURE CodeModCeil (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeModCeil (quad: CARDINAL; left, right: CARDINAL) ;
 BEGIN
-   IF BinaryOperands(quad, op2, op3)
+   IF BinaryOperands (quad, left, right)
    THEN
       CodeBinary (BuildModCeil, quad)
    END
@@ -4060,11 +4034,11 @@ END FoldDivFloor ;
    CodeDivFloor - encode multiplication.
 *)
 
-PROCEDURE CodeDivFloor (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeDivFloor (quad: CARDINAL; left, right: CARDINAL) ;
 BEGIN
-   IF BinaryOperands(quad, op2, op3)
+   IF BinaryOperands (quad, left, right)
    THEN
-      IF BinaryOperandRealFamily(op2) OR BinaryOperandRealFamily(op3)
+      IF BinaryOperandRealFamily (left) OR BinaryOperandRealFamily (right)
       THEN
          CodeBinary (BuildRDiv, quad)
       ELSE
@@ -4092,9 +4066,9 @@ END FoldModFloor ;
    CodeModFloor - encode modulus.
 *)
 
-PROCEDURE CodeModFloor (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeModFloor (quad: CARDINAL; left, right: CARDINAL) ;
 BEGIN
-   IF BinaryOperands(quad, op2, op3)
+   IF BinaryOperands(quad, left, right)
    THEN
       CodeBinary (BuildModFloor, quad)
    END
@@ -4106,17 +4080,17 @@ END CodeModFloor ;
 *)
 
 PROCEDURE FoldBuiltinConst (tokenno: CARDINAL; p: WalkAction;
-                            quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+                            quad: CARDINAL; result, constDesc: CARDINAL) ;
 VAR
-   t: Tree ;
+   value: Tree ;
 BEGIN
-   t := GetBuiltinConst (KeyToCharStar (Name (op3))) ;
-   IF t=NIL
+   value := GetBuiltinConst (KeyToCharStar (Name (constDesc))) ;
+   IF value = NIL
    THEN
-      MetaErrorT1 (tokenno, 'unknown built in constant {%1Ead}', op3)
+      MetaErrorT1 (tokenno, 'unknown built in constant {%1Ead}', constDesc)
    ELSE
-      AddModGcc (op1, t) ;
-      p (op1) ;
+      AddModGcc (result, value) ;
+      p (result) ;
       NoChange := FALSE ;
       SubQuad (quad)
    END
@@ -4298,79 +4272,79 @@ END FoldStandardFunction ;
    CodeStandardFunction -
 *)
 
-PROCEDURE CodeStandardFunction (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeStandardFunction (quad: CARDINAL; result, function, param: CARDINAL) ;
 VAR
    type    : CARDINAL ;
    location: location_t ;
 BEGIN
-   DeclareConstant(CurrentQuadToken, op3) ;
-   DeclareConstructor(CurrentQuadToken, quad, op3) ;
-   location := TokenToLocation(CurrentQuadToken) ;
+   DeclareConstant (CurrentQuadToken, param) ;
+   DeclareConstructor (CurrentQuadToken, quad, param) ;
+   location := TokenToLocation (CurrentQuadToken) ;
 
-   IF (op2#NulSym) AND (GetSymName(op2)=MakeKey('Length'))
+   IF (function # NulSym) AND (GetSymName (function) = MakeKey ('Length'))
    THEN
-      IF IsConst(op1)
+      IF IsConst (result)
       THEN
          InternalError ('LENGTH function should already have been folded')
       END
-   ELSIF (op2#NulSym) AND (GetSymName(op2)=MakeKey('CAP'))
+   ELSIF (function # NulSym) AND (GetSymName (function) = MakeKey ('CAP'))
    THEN
-      IF IsConst(op1)
+      IF IsConst (result)
       THEN
          InternalError ('CAP function should already have been folded')
       ELSE
-         BuildAssignmentStatement (location, Mod2Gcc(op1), BuildCap(location, Mod2Gcc(op3)))
+         BuildAssignmentStatement (location, Mod2Gcc (result), BuildCap (location, Mod2Gcc (param)))
       END
-   ELSIF (op2#NulSym) AND (GetSymName(op2)=MakeKey('ABS'))
+   ELSIF (function # NulSym) AND (GetSymName (function) = MakeKey('ABS'))
    THEN
-      IF IsConst(op1)
+      IF IsConst (result)
       THEN
          InternalError ('ABS function should already have been folded')
       ELSE
-         BuildAssignmentStatement (location, Mod2Gcc(op1), BuildAbs(location, Mod2Gcc(op3)))
+         BuildAssignmentStatement (location, Mod2Gcc (result), BuildAbs (location, Mod2Gcc (param)))
       END
-   ELSIF op2=Im
+   ELSIF function = Im
    THEN
-      IF IsConst(op1)
+      IF IsConst (result)
       THEN
          InternalError ('IM function should already have been folded')
       ELSE
-         BuildAssignmentStatement (location, Mod2Gcc(op1), BuildIm(Mod2Gcc(op3)))
+         BuildAssignmentStatement (location, Mod2Gcc (result), BuildIm (Mod2Gcc (param)))
       END
-   ELSIF op2=Re
+   ELSIF function = Re
    THEN
-      IF IsConst(op1)
+      IF IsConst (result)
       THEN
          InternalError ('RE function should already have been folded')
       ELSE
-         BuildAssignmentStatement (location, Mod2Gcc(op1), BuildRe(Mod2Gcc(op3)))
+         BuildAssignmentStatement (location, Mod2Gcc (result), BuildRe (Mod2Gcc (param)))
       END
-   ELSIF op2=Cmplx
+   ELSIF function = Cmplx
    THEN
-      IF IsConst(op1)
+      IF IsConst (result)
       THEN
          InternalError ('CMPLX function should already have been folded')
       ELSE
-         type := GetCmplxReturnType(GetType(GetNth(op3, 1)), GetType(GetNth(op3, 2))) ;
-         IF type=NulSym
+         type := GetCmplxReturnType (GetType (GetNth (param, 1)), GetType (GetNth (param, 2))) ;
+         IF type = NulSym
          THEN
             MetaErrorT2 (CurrentQuadToken,
                          'real {%1Eatd} and imaginary {%2atd} types are incompatible',
-                         GetNth(op3, 1), GetNth(op3, 2))
+                         GetNth (param, 1), GetNth (param, 2))
          ELSE
-            BuildAssignmentStatement (location, Mod2Gcc (op1), BuildCmplx(location,
-                                                                          Mod2Gcc (type),
-                                                                          Mod2Gcc (GetNth (op3, 1)),
-                                                                          Mod2Gcc (GetNth (op3, 2))))
+            BuildAssignmentStatement (location, Mod2Gcc (result), BuildCmplx(location,
+                                                                             Mod2Gcc (type),
+                                                                             Mod2Gcc (GetNth (param, 1)),
+                                                                             Mod2Gcc (GetNth (param, 2))))
          END
       END
-   ELSIF op2=TBitSize
+   ELSIF function = TBitSize
    THEN
-      IF IsConst (op1)
+      IF IsConst (result)
       THEN
          InternalError ('TBITSIZE function should already have been folded')
       ELSE
-         BuildAssignmentStatement (location, Mod2Gcc (op1), BuildTBitSize (location, Mod2Gcc (op3)))
+         BuildAssignmentStatement (location, Mod2Gcc (result), BuildTBitSize (location, Mod2Gcc (param)))
       END
    ELSE
       InternalError ('expecting LENGTH, CAP, ABS, IM')
@@ -4387,37 +4361,37 @@ END CodeStandardFunction ;
                       op1 := op3(GetModuleScope(op2))
 *)
 
-PROCEDURE CodeSavePriority (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeSavePriority (oldValue, scopeSym, procedureSym: CARDINAL) ;
 VAR
-   t       : Tree ;
+   funcTree: Tree ;
    mod     : CARDINAL ;
    n       : Name ;
    location: location_t ;
 BEGIN
    location := TokenToLocation(CurrentQuadToken) ;
 
-   IF IsModule(op2) OR IsDefImp(op2) OR
-      (IsProcedure(op2) AND GetNeedSavePriority(op2))
+   IF IsModule (scopeSym) OR IsDefImp (scopeSym) OR
+      (IsProcedure (scopeSym) AND GetNeedSavePriority (scopeSym))
    THEN
-      IF IsProcedure(op2)
+      IF IsProcedure (scopeSym)
       THEN
-         mod := GetModuleScope(op2) ;
+         mod := GetModuleScope (scopeSym) ;
       ELSE
-         Assert(IsModule(op2) OR IsDefImp(op2)) ;
-         mod := op2
+         Assert (IsModule(scopeSym) OR IsDefImp (scopeSym)) ;
+         mod := scopeSym
       END ;
-      IF GetPriority(mod)#NulSym
+      IF GetPriority (mod) # NulSym
       THEN
          IF PriorityDebugging
          THEN
-            n := GetSymName(op2) ;
-            printf1('procedure <%a> needs to save interrupts\n', n)
+            n := GetSymName (scopeSym) ;
+            printf1 ('procedure <%a> needs to save interrupts\n', n)
          END ;
-         DeclareConstant(CurrentQuadToken, GetPriority(mod)) ;
-         BuildParam(location, Mod2Gcc(GetPriority(mod))) ;
-         t := BuildProcedureCallTree(location, Mod2Gcc(op3), Mod2Gcc(GetType(op3))) ;
-         t := BuildFunctValue(location, Mod2Gcc(op1)) ;
-         AddStatement(location, t)
+         DeclareConstant (CurrentQuadToken, GetPriority (mod)) ;
+         BuildParam (location, Mod2Gcc (GetPriority (mod))) ;
+         funcTree := BuildProcedureCallTree (location, Mod2Gcc (procedureSym), Mod2Gcc (GetType (procedureSym))) ;
+         funcTree := BuildFunctValue (location, Mod2Gcc (oldValue)) ;
+         AddStatement (location, funcTree)
       END
    END
 END CodeSavePriority ;
@@ -4431,36 +4405,36 @@ END CodeSavePriority ;
                          op1 := op3(op1)
 *)
 
-PROCEDURE CodeRestorePriority (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeRestorePriority (oldValue, scopeSym, procedureSym: CARDINAL) ;
 VAR
-   t       : Tree ;
+   funcTree: Tree ;
    mod     : CARDINAL ;
    n       : Name ;
    location: location_t ;
 BEGIN
-   location := TokenToLocation(CurrentQuadToken) ;
+   location := TokenToLocation (CurrentQuadToken) ;
 
-   IF IsModule(op2) OR IsDefImp(op2) OR
-      (IsProcedure(op2) AND GetNeedSavePriority(op2))
+   IF IsModule (scopeSym) OR IsDefImp (scopeSym) OR
+      (IsProcedure (scopeSym) AND GetNeedSavePriority (scopeSym))
    THEN
-      IF IsProcedure(op2)
+      IF IsProcedure (scopeSym)
       THEN
-         mod := GetModuleScope(op2) ;
+         mod := GetModuleScope (scopeSym) ;
       ELSE
-         Assert(IsModule(op2) OR IsDefImp(op2)) ;
-         mod := op2
+         Assert (IsModule (scopeSym) OR IsDefImp (scopeSym)) ;
+         mod := scopeSym
       END ;
-      IF GetPriority(mod)#NulSym
+      IF GetPriority (mod) # NulSym
       THEN
          IF PriorityDebugging
          THEN
-            n := GetSymName(op2) ;
-            printf1('procedure <%a> needs to restore interrupts\n', n)
+            n := GetSymName (scopeSym) ;
+            printf1 ('procedure <%a> needs to restore interrupts\n', n)
          END ;
-         BuildParam(location, Mod2Gcc(op1)) ;
-         t := BuildProcedureCallTree(location, Mod2Gcc(op3), Mod2Gcc(GetType(op3))) ;
-         t := BuildFunctValue(location, Mod2Gcc(op1)) ;
-         AddStatement(location, t)
+         BuildParam (location, Mod2Gcc (oldValue)) ;
+         funcTree := BuildProcedureCallTree (location, Mod2Gcc (procedureSym), Mod2Gcc (GetType (procedureSym))) ;
+         funcTree := BuildFunctValue (location, Mod2Gcc (oldValue)) ;
+         AddStatement(location, funcTree)
       END
    END
 END CodeRestorePriority ;
@@ -4729,93 +4703,93 @@ END CodeSetSymmetricDifference ;
 *)
 
 PROCEDURE CodeUnarySet (unop: BuildUnarySetFunction; doOp: DoUnaryProcedure;
-                        quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+                        quad: CARDINAL; result, expr: CARDINAL) ;
 VAR
    location: location_t ;
 BEGIN
    (* firstly ensure that constant literals are declared *)
-   DeclareConstant(CurrentQuadToken, op3) ;
-   DeclareConstructor(CurrentQuadToken, quad, op3) ;
-   location := TokenToLocation(CurrentQuadToken) ;
+   DeclareConstant (CurrentQuadToken, expr) ;
+   DeclareConstructor (CurrentQuadToken, quad, expr) ;
+   location := TokenToLocation (CurrentQuadToken) ;
 
-   IF IsConst(op1)
-   THEN
-      IF IsValueSolved(op3)
-      THEN
-         Assert(FindType(op3)#NulSym) ;
-         PutConst(op1, FindType(op3)) ;
-         PushValue(op3) ;
-         doOp(CurrentQuadToken) ;
-         PopValue(op1) ;
-         PushValue(op1) ;
-         PutConstSet(op1) ;
-         ConstantKnownAndUsed(op1,
-                              DeclareKnownConstant(location,
-                                                   Mod2Gcc(GetType(op3)),
-                                                   PopSetTree(CurrentQuadToken)))
+   IF IsConst (result)
+   THEN
+      IF IsValueSolved (expr)
+      THEN
+         Assert (FindType (expr) # NulSym) ;
+         PutConst (result, FindType (expr)) ;
+         PushValue (expr) ;
+         doOp (CurrentQuadToken) ;
+         PopValue (result) ;
+         PushValue (result) ;
+         PutConstSet (result) ;
+         ConstantKnownAndUsed (result,
+                               DeclareKnownConstant(location,
+                                                    Mod2Gcc (GetType (expr)),
+                                                    PopSetTree (CurrentQuadToken)))
       ELSE
          MetaErrorT0 (CurrentQuadToken,
                       '{%E}constant expression cannot be evaluated')
       END
    ELSE
-      checkDeclare (op1) ;
+      checkDeclare (result) ;
       BuildUnaryForeachWordDo(location,
-                              Mod2Gcc(GetType(op1)), Mod2Gcc(op1), Mod2Gcc(op3), unop,
-                              GetMode(op1)=LeftValue, GetMode(op3)=LeftValue,
-                              IsConst(op1), IsConst(op3))
+                              Mod2Gcc (GetType (result)), Mod2Gcc (result), Mod2Gcc (expr), unop,
+                              GetMode(result) = LeftValue, GetMode(expr) = LeftValue,
+                              IsConst (result), IsConst (expr))
    END
 END CodeUnarySet ;
 
 
 (*
    FoldIncl - check whether we can fold the InclOp.
-              op1 := op1 + (1 << op3)
+              result := result + (1 << expr)
 *)
 
 PROCEDURE FoldIncl (tokenno: CARDINAL; p: WalkAction;
-                    quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+                    quad: CARDINAL; result, expr: CARDINAL) ;
 BEGIN
    (* firstly ensure that constant literals are declared *)
-   TryDeclareConstant(tokenno, op3) ;
-   IF IsConst(op1) AND IsConst(op3)
+   TryDeclareConstant (tokenno, expr) ;
+   IF IsConst (result) AND IsConst (expr)
    THEN
-      IF GccKnowsAbout(op3) AND IsValueSolved(op1)
+      IF GccKnowsAbout (expr) AND IsValueSolved (result)
       THEN
          (* fine, we can take advantage of this and fold constants *)
-         PushValue(op1) ;
-         AddBit(tokenno, op3) ;
-         AddModGcc(op1, PopSetTree(tokenno)) ;
-         p(op1) ;
+         PushValue (result) ;
+         AddBit (tokenno, expr) ;
+         AddModGcc (result, PopSetTree(tokenno)) ;
+         p (result) ;
          NoChange := FALSE ;
-         SubQuad(quad)
+         SubQuad (quad)
       END
    END
 END FoldIncl ;
 
 
 (*
-   FoldIfIn - check whether we can fold the IfInOp
-              if op1 in op2 then goto op3
+   FoldIfLess - check to see if it is possible to evaluate
+                if op1 < op2 then goto op3.
 *)
 
-PROCEDURE FoldIfLess (tokenno: CARDINAL; p: WalkAction;
-                      quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE FoldIfLess (tokenno: CARDINAL;
+                      quad: CARDINAL; left, right, destQuad: CARDINAL) ;
 BEGIN
    (* firstly ensure that constant literals are declared *)
-   TryDeclareConstant(tokenno, op1) ;
-   TryDeclareConstant(tokenno, op2) ;
-   IF IsConst(op1) AND IsConst(op2)
+   TryDeclareConstant(tokenno, left) ;
+   TryDeclareConstant(tokenno, right) ;
+   IF IsConst (left) AND IsConst (right)
    THEN
-      IF IsValueSolved(op1) AND IsValueSolved(op2)
+      IF IsValueSolved (left) AND IsValueSolved (right)
       THEN
          (* fine, we can take advantage of this and evaluate the condition *)
-         PushValue(op1) ;
-         PushValue(op2) ;
-         IF Less(tokenno)
+         PushValue (left) ;
+         PushValue (right) ;
+         IF Less (tokenno)
          THEN
-            PutQuad(quad, GotoOp, NulSym, NulSym, op3)
+            PutQuad (quad, GotoOp, NulSym, NulSym, destQuad)
          ELSE
-            SubQuad(quad)
+            SubQuad (quad)
          END
       END
    END
@@ -4827,23 +4801,23 @@ END FoldIfLess ;
               if op1 in op2 then goto op3
 *)
 
-PROCEDURE FoldIfIn (tokenno: CARDINAL; p: WalkAction;
-                    quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE FoldIfIn (tokenno: CARDINAL;
+                    quad: CARDINAL; left, right, destQuad: CARDINAL) ;
 BEGIN
    (* firstly ensure that constant literals are declared *)
-   TryDeclareConstant(tokenno, op1) ;
-   TryDeclareConstant(tokenno, op2) ;
-   IF IsConst(op1) AND IsConst(op2)
+   TryDeclareConstant (tokenno, left) ;
+   TryDeclareConstant (tokenno, right) ;
+   IF IsConst (left) AND IsConst (right)
    THEN
-      IF IsValueSolved(op1) AND IsValueSolved(op2)
+      IF IsValueSolved (left) AND IsValueSolved (right)
       THEN
          (* fine, we can take advantage of this and evaluate the condition *)
-         PushValue(op2) ;
-         IF SetIn(tokenno, op1)
+         PushValue (right) ;
+         IF SetIn (tokenno, left)
          THEN
-            PutQuad(quad, GotoOp, NulSym, NulSym, op3)
+            PutQuad (quad, GotoOp, NulSym, NulSym, destQuad)
          ELSE
-            SubQuad(quad)
+            SubQuad (quad)
          END
       END
    END
@@ -4855,23 +4829,23 @@ END FoldIfIn ;
                  if not (op1 in op2) then goto op3
 *)
 
-PROCEDURE FoldIfNotIn (tokenno: CARDINAL; p: WalkAction;
-                       quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE FoldIfNotIn (tokenno: CARDINAL;
+                       quad: CARDINAL; left, right, destQuad: CARDINAL) ;
 BEGIN
    (* firstly ensure that constant literals are declared *)
-   TryDeclareConstant(tokenno, op1) ;
-   TryDeclareConstant(tokenno, op2) ;
-   IF IsConst(op1) AND IsConst(op2)
+   TryDeclareConstant (tokenno, left) ;
+   TryDeclareConstant (tokenno, right) ;
+   IF IsConst (left) AND IsConst (right)
    THEN
-      IF IsValueSolved(op1) AND IsValueSolved(op2)
+      IF IsValueSolved (left) AND IsValueSolved (right)
       THEN
          (* fine, we can take advantage of this and evaluate the condition *)
-         PushValue(op2) ;
-         IF NOT SetIn(tokenno, op1)
+         PushValue (right) ;
+         IF NOT SetIn (tokenno, left)
          THEN
-            PutQuad(quad, GotoOp, NulSym, NulSym, op3)
+            PutQuad (quad, GotoOp, NulSym, NulSym, destQuad)
          ELSE
-            SubQuad(quad)
+            SubQuad (quad)
          END
       END
    END
@@ -4959,10 +4933,10 @@ END GetFieldNo ;
 
 (*
    CodeIncl - encode an InclOp:
-              op1 := op1 + (1 << op3)
+              result := result + (1 << expr)
 *)
 
-PROCEDURE CodeIncl (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeIncl (result, expr: CARDINAL) ;
 VAR
    low,
    high    : CARDINAL ;
@@ -4971,39 +4945,39 @@ VAR
    location: location_t ;
 BEGIN
    (* firstly ensure that constant literals are declared *)
-   DeclareConstant(CurrentQuadToken, op3) ;
-   location := TokenToLocation(CurrentQuadToken) ;
+   DeclareConstant (CurrentQuadToken, expr) ;
+   location := TokenToLocation (CurrentQuadToken) ;
 
-   IF IsConst(op1)
+   IF IsConst (result)
    THEN
-      IF IsConst(op3)
+      IF IsConst (expr)
       THEN
          InternalError ('this quadruple should have been removed by FoldIncl')
       ELSE
          InternalError ('should not get to here (why are we generating <incl const, var> ?)')
       END
    ELSE
-      IF IsConst(op3)
+      IF IsConst (expr)
       THEN
-         fieldno := GetFieldNo(CurrentQuadToken, op3, GetType(op1), offset) ;
-         IF fieldno>=0
+         fieldno := GetFieldNo (CurrentQuadToken, expr, GetType (result), offset) ;
+         IF fieldno >= 0
          THEN
-            PushValue(op3) ;
-            PushIntegerTree(offset) ;
+            PushValue (expr) ;
+            PushIntegerTree (offset) ;
             Sub ;
-            BuildIncludeVarConst(location,
-                                 Mod2Gcc(GetType(op1)),
-                                 Mod2Gcc(op1),
-                                 PopIntegerTree(),
-                                 GetMode(op1)=LeftValue, fieldno)
+            BuildIncludeVarConst (location,
+                                  Mod2Gcc (GetType (result)),
+                                  Mod2Gcc (result),
+                                  PopIntegerTree (),
+                                  GetMode (result) = LeftValue, fieldno)
          ELSE
-            MetaErrorT1 (CurrentQuadToken, 'bit exceeded the range of set {%1Eatd}', op1)
+            MetaErrorT1 (CurrentQuadToken, 'bit exceeded the range of set {%1Eatd}', result)
          END
       ELSE
-         GetSetLimits(GetType(op1), low, high) ;
-         BuildIncludeVarVar(location,
-                            Mod2Gcc(GetType(op1)),
-                            Mod2Gcc(op1), Mod2Gcc(op3), GetMode(op1)=LeftValue, Mod2Gcc(low))
+         GetSetLimits (GetType (result), low, high) ;
+         BuildIncludeVarVar (location,
+                             Mod2Gcc (GetType(result)),
+                             Mod2Gcc (result), Mod2Gcc(expr), GetMode(result) = LeftValue, Mod2Gcc (low))
       END
    END
 END CodeIncl ;
@@ -5015,18 +4989,18 @@ END CodeIncl ;
 *)
 
 PROCEDURE FoldExcl (tokenno: CARDINAL; p: WalkAction;
-                    quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+                    quad: CARDINAL; result, expr: CARDINAL) ;
 BEGIN
    (* firstly ensure that constant literals are declared *)
-   TryDeclareConstant(tokenno, op3) ;
-   IF IsConst(op1) AND IsConst(op3)
+   TryDeclareConstant (tokenno, expr) ;
+   IF IsConst (result) AND IsConst (expr)
    THEN
-      IF GccKnowsAbout(op3) AND IsValueSolved(op1)
+      IF GccKnowsAbout (expr) AND IsValueSolved (result)
       THEN
-         PushValue(op1) ;
-         SubBit(tokenno, op3) ;
-         AddModGcc(op1, PopSetTree(tokenno)) ;
-         p(op1) ;
+         PushValue (result) ;
+         SubBit (tokenno, expr) ;
+         AddModGcc (result, PopSetTree (tokenno)) ;
+         p (result) ;
          NoChange := FALSE ;
          SubQuad(quad)
       END
@@ -5036,10 +5010,10 @@ END FoldExcl ;
 
 (*
    CodeExcl - encode an ExclOp:
-                op1 := op1 - (1 << op3)
+              result := result - (1 << expr)
 *)
 
-PROCEDURE CodeExcl (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeExcl (result, expr: CARDINAL) ;
 VAR
    low,
    high    : CARDINAL ;
@@ -5048,33 +5022,33 @@ VAR
    location: location_t ;
 BEGIN
    (* firstly ensure that constant literals are declared *)
-   DeclareConstant(CurrentQuadToken, op3) ;
+   DeclareConstant (CurrentQuadToken, expr) ;
    location := TokenToLocation(CurrentQuadToken) ;
 
-   IF IsConst(op1)
+   IF IsConst (result)
    THEN
       InternalError ('should not get to here (if we do we should consider calling FoldInclOp)')
    ELSE
-      IF IsConst(op3)
+      IF IsConst (expr)
       THEN
-         fieldno := GetFieldNo(CurrentQuadToken, op3, GetType(op1), offset) ;
-         IF fieldno>=0
+         fieldno := GetFieldNo (CurrentQuadToken, expr, GetType (result), offset) ;
+         IF fieldno >= 0
          THEN
-            PushValue(op3) ;
-            PushIntegerTree(offset) ;
+            PushValue (expr) ;
+            PushIntegerTree (offset) ;
             Sub ;
-            BuildExcludeVarConst(location,
-                                 Mod2Gcc(GetType(op1)),
-                                 Mod2Gcc(op1), PopIntegerTree(),
-                                 GetMode(op1)=LeftValue, fieldno)
+            BuildExcludeVarConst (location,
+                                  Mod2Gcc (GetType (result)),
+                                  Mod2Gcc (result), PopIntegerTree (),
+                                  GetMode (result)=LeftValue, fieldno)
          ELSE
-            MetaErrorT1 (CurrentQuadToken, 'bit exceeded the range of set {%1Eatd}', op1)
+            MetaErrorT1 (CurrentQuadToken, 'bit exceeded the range of set {%1Eatd}', result)
          END
       ELSE
-         GetSetLimits(GetType(op1), low, high) ;
-         BuildExcludeVarVar(location,
-                            Mod2Gcc(GetType(op1)),
-                            Mod2Gcc(op1), Mod2Gcc(op3), GetMode(op1)=LeftValue, Mod2Gcc(low))
+         GetSetLimits (GetType (result), low, high) ;
+         BuildExcludeVarVar (location,
+                             Mod2Gcc (GetType(result)),
+                             Mod2Gcc (result), Mod2Gcc(expr), GetMode(result) = LeftValue, Mod2Gcc (low))
       END
    END
 END CodeExcl ;
@@ -5086,47 +5060,47 @@ END CodeExcl ;
 
 PROCEDURE FoldUnary (tokenno: CARDINAL; p: WalkAction;
                      unop: BuildUnaryProcedure; ZConstToTypedConst: Tree;
-                     quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+                     quad: CARDINAL; result, expr: CARDINAL) ;
 VAR
    tv      : Tree ;
    location: location_t ;
 BEGIN
    (* firstly ensure that any constant literal is declared *)
-   TryDeclareConstant(tokenno, op3) ;
-   location := TokenToLocation(tokenno) ;
+   TryDeclareConstant (tokenno, expr) ;
+   location := TokenToLocation (tokenno) ;
 
-   IF IsConst(op3)
+   IF IsConst (expr)
    THEN
-      IF GccKnowsAbout(op3)
+      IF GccKnowsAbout (expr)
       THEN
          (* fine, we can take advantage of this and fold constants *)
-         IF IsConst(op1)
+         IF IsConst (result)
          THEN
-            IF ZConstToTypedConst=Tree(NIL)
+            IF ZConstToTypedConst = Tree(NIL)
             THEN
-               IF (GetType(op3)=NulSym) OR IsOrdinalType(SkipType(GetType(op3)))
+               IF (GetType (expr) = NulSym) OR IsOrdinalType (SkipType (GetType (expr)))
                THEN
-                  ZConstToTypedConst := GetM2ZType()
-               ELSIF IsRealType(SkipType(GetType(op3))) OR IsRealN(SkipType(GetType(op3)))
+                  ZConstToTypedConst := GetM2ZType ()
+               ELSIF IsRealType (SkipType (GetType (expr))) OR IsRealN (SkipType (GetType (expr)))
                THEN
-                  ZConstToTypedConst := GetM2RType()
-               ELSIF IsComplexType(SkipType(GetType(op3))) OR
-                     IsComplexN(SkipType(GetType(op3)))
+                  ZConstToTypedConst := GetM2RType ()
+               ELSIF IsComplexType (SkipType (GetType (expr))) OR
+                     IsComplexN (SkipType (GetType (expr)))
                THEN
-                  ZConstToTypedConst := GetM2CType()
+                  ZConstToTypedConst := GetM2CType ()
                END
             END ;
-            IF GetType(op1)=NulSym
+            IF GetType(result) = NulSym
             THEN
-               PutConst (op1, NegateType (GetType (op3) (* , tokenno *) ))
+               PutConst (result, NegateType (GetType (expr) (* , tokenno *) ))
             END ;
-            tv := unop(location, LValueToGenericPtrOrConvert(op3, ZConstToTypedConst), FALSE) ;
-            CheckOrResetOverflow(tokenno, tv, MustCheckOverflow(quad)) ;
+            tv := unop (location, LValueToGenericPtrOrConvert (expr, ZConstToTypedConst), FALSE) ;
+            CheckOrResetOverflow (tokenno, tv, MustCheckOverflow (quad)) ;
 
-            AddModGcc(op1, DeclareKnownConstant(location, ZConstToTypedConst, tv)) ;
-            p(op1) ;
+            AddModGcc (result, DeclareKnownConstant (location, ZConstToTypedConst, tv)) ;
+            p (result) ;
             NoChange := FALSE ;
-            SubQuad(quad)
+            SubQuad (quad)
          ELSE
             (* we can still fold the expression, but not the assignment, however, we will
                not do this here but in CodeUnary
@@ -5142,32 +5116,32 @@ END FoldUnary ;
 *)
 
 PROCEDURE FoldUnarySet (tokenno: CARDINAL; p: WalkAction; doOp: DoUnaryProcedure;
-                        quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+                        quad: CARDINAL; result, expr: CARDINAL) ;
 VAR
    location: location_t ;
 BEGIN
    (* firstly try and ensure that constants are declared *)
-   TryDeclareConstant(tokenno, op3) ;
-   location := TokenToLocation(tokenno) ;
+   TryDeclareConstant (tokenno, expr) ;
+   location := TokenToLocation (tokenno) ;
 
-   IF IsConst(op3) AND IsConstSet(op3) AND
-      IsConst(op1)
-   THEN
-      IF IsValueSolved(op3) AND (GetType(op3)#NulSym)
-      THEN
-         PutConst(op1, FindType(op3)) ;
-         PushValue(op3) ;
-         doOp(tokenno) ;
-         PopValue(op1) ;
-         PushValue(op1) ;
-         PutConstSet(op1) ;
-         AddModGcc(op1,
-                   DeclareKnownConstant(location,
-                                        Mod2Gcc(GetType(op3)),
-                                        PopSetTree(tokenno))) ;
-         p(op1) ;
+   IF IsConst (expr) AND IsConstSet (expr) AND
+      IsConst (result)
+   THEN
+      IF IsValueSolved (expr) AND (GetType (expr) # NulSym)
+      THEN
+         PutConst (result, FindType (expr)) ;
+         PushValue (expr) ;
+         doOp (tokenno) ;
+         PopValue (result) ;
+         PushValue (result) ;
+         PutConstSet (result) ;
+         AddModGcc (result,
+                    DeclareKnownConstant (location,
+                                          Mod2Gcc (GetType (expr)),
+                                          PopSetTree (tokenno))) ;
+         p (result) ;
          NoChange := FALSE ;
-         SubQuad(quad)
+         SubQuad (quad)
       END
    END
 END FoldUnarySet ;
@@ -5178,7 +5152,7 @@ END FoldUnarySet ;
 *)
 
 PROCEDURE CodeUnaryCheck (unop: BuildUnaryCheckProcedure; ZConstToTypedConst: Tree;
-                          quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+                          quad: CARDINAL; result, expr: CARDINAL) ;
 VAR
    lowestType: CARDINAL ;
    min, max,
@@ -5187,11 +5161,11 @@ VAR
    location  : location_t ;
 BEGIN
    (* firstly ensure that any constant literal is declared *)
-   DeclareConstant(CurrentQuadToken, op3) ;
-   DeclareConstructor(CurrentQuadToken, quad, op3) ;
+   DeclareConstant(CurrentQuadToken, expr) ;
+   DeclareConstructor(CurrentQuadToken, quad, expr) ;
    location := TokenToLocation(CurrentQuadToken) ;
 
-   lowestType := GetLType (op1) ;
+   lowestType := GetLType (result) ;
    IF lowestType=NulSym
    THEN
       lowest := NIL ;
@@ -5200,26 +5174,26 @@ BEGIN
    END ;
    IF GetMinMax (CurrentQuadToken, lowestType, min, max)
    THEN
-      tv := unop (location, LValueToGenericPtr(location, op3), lowest, min, max)
+      tv := unop (location, LValueToGenericPtr (location, expr), lowest, min, max)
    ELSE
-      tv := unop (location, LValueToGenericPtr(location, op3), NIL, NIL, NIL)
+      tv := unop (location, LValueToGenericPtr (location, expr), NIL, NIL, NIL)
    END ;
-   CheckOrResetOverflow(CurrentQuadToken, tv, MustCheckOverflow(quad)) ;
-   IF IsConst(op1)
+   CheckOrResetOverflow (CurrentQuadToken, tv, MustCheckOverflow(quad)) ;
+   IF IsConst (result)
    THEN
-      IF ZConstToTypedConst=Tree(NIL)
+      IF ZConstToTypedConst = Tree (NIL)
       THEN
-         ZConstToTypedConst := Tree(Mod2Gcc(GetType(op3)))
+         ZConstToTypedConst := Tree (Mod2Gcc( GetType (expr)))
       END ;
       (* still have a constant which was not resolved, pass it to gcc *)
-      PutConst(op1, FindType(op3)) ;
-      ConstantKnownAndUsed(op1, DeclareKnownConstant(location, ZConstToTypedConst, tv))
+      PutConst (result, FindType (expr)) ;
+      ConstantKnownAndUsed (result, DeclareKnownConstant (location, ZConstToTypedConst, tv))
    ELSE
-      IF EnableSSA AND IsVariableSSA (op1)
+      IF EnableSSA AND IsVariableSSA (result)
       THEN
-         Replace (op1, tv)
+         Replace (result, tv)
       ELSE
-         BuildAssignmentStatement (location, Mod2Gcc(op1), tv)
+         BuildAssignmentStatement (location, Mod2Gcc (result), tv)
       END
    END
 END CodeUnaryCheck ;
@@ -5230,33 +5204,33 @@ END CodeUnaryCheck ;
 *)
 
 PROCEDURE CodeUnary (unop: BuildUnaryProcedure; ZConstToTypedConst: Tree;
-                     quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+                     quad: CARDINAL; result, expr: CARDINAL) ;
 VAR
    tv      : Tree ;
    location: location_t ;
 BEGIN
    (* firstly ensure that any constant literal is declared *)
-   DeclareConstant(CurrentQuadToken, op3) ;
-   DeclareConstructor(CurrentQuadToken, quad, op3) ;
-   location := TokenToLocation(CurrentQuadToken) ;
+   DeclareConstant (CurrentQuadToken, expr) ;
+   DeclareConstructor (CurrentQuadToken, quad, expr) ;
+   location := TokenToLocation (CurrentQuadToken) ;
 
-   tv := unop(location, LValueToGenericPtr(location, op3), FALSE) ;
-   CheckOrResetOverflow(CurrentQuadToken, tv, MustCheckOverflow(quad)) ;
-   IF IsConst(op1)
+   tv := unop(location, LValueToGenericPtr (location, expr), FALSE) ;
+   CheckOrResetOverflow (CurrentQuadToken, tv, MustCheckOverflow (quad)) ;
+   IF IsConst(result)
    THEN
       IF ZConstToTypedConst=Tree(NIL)
       THEN
-         ZConstToTypedConst := Tree(Mod2Gcc(GetType(op3)))
+         ZConstToTypedConst := Tree(Mod2Gcc(GetType(expr)))
       END ;
       (* still have a constant which was not resolved, pass it to gcc *)
-      PutConst(op1, FindType(op3)) ;
-      ConstantKnownAndUsed(op1, DeclareKnownConstant(location, ZConstToTypedConst, tv))
+      PutConst (result, FindType (expr)) ;
+      ConstantKnownAndUsed (result, DeclareKnownConstant (location, ZConstToTypedConst, tv))
    ELSE
-      IF EnableSSA AND IsVariableSSA (op1)
+      IF EnableSSA AND IsVariableSSA (result)
       THEN
-         Replace (op1, tv)
+         Replace (result, tv)
       ELSE
-         BuildAssignmentStatement (location, Mod2Gcc (op1), tv)
+         BuildAssignmentStatement (location, Mod2Gcc (result), tv)
       END
    END
 END CodeUnary ;
@@ -5267,13 +5241,13 @@ END CodeUnary ;
 *)
 
 PROCEDURE FoldNegate (tokenno: CARDINAL; p: WalkAction;
-                      quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+                      quad: CARDINAL; result, expr: CARDINAL) ;
 BEGIN
-   IF IsConstSet(op3)
+   IF IsConstSet (expr)
    THEN
-      FoldUnarySet(tokenno, p, SetNegate, quad, op1, op2, op3)
+      FoldUnarySet(tokenno, p, SetNegate, quad, result, expr)
    ELSE
-      FoldUnary(tokenno, p, BuildNegate, NIL, quad, op1, op2, op3)
+      FoldUnary (tokenno, p, BuildNegate, NIL, quad, result, expr)
    END
 END FoldNegate ;
 
@@ -5283,16 +5257,16 @@ END FoldNegate ;
                        is required.
 *)
 
-PROCEDURE CodeNegateChecked (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeNegateChecked (quad: CARDINAL; op1, op3: CARDINAL) ;
 BEGIN
    IF IsConstSet (op3) OR IsSet (GetType (op3))
    THEN
-      CodeUnarySet (BuildSetNegate, SetNegate, quad, op1, op2, op3)
+      CodeUnarySet (BuildSetNegate, SetNegate, quad, op1, op3)
    ELSIF MustCheckOverflow (quad)
    THEN
-      CodeUnaryCheck (BuildNegateCheck, NIL, quad, op1, op2, op3)
+      CodeUnaryCheck (BuildNegateCheck, NIL, quad, op1, op3)
    ELSE
-      CodeUnary (BuildNegate, NIL, quad, op1, op2, op3)
+      CodeUnary (BuildNegate, NIL, quad, op1, op3)
    END
 END CodeNegateChecked ;
 
@@ -5340,31 +5314,24 @@ END FoldSize ;
    CodeSize - encode the inbuilt SIZE function.
 *)
 
-PROCEDURE CodeSize (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeSize (result, sym: CARDINAL) ;
 VAR
    location: location_t ;
-   t       : Tree ;
 BEGIN
    location := TokenToLocation(CurrentQuadToken) ;
 
-   IF op2=NulSym
+   PushIntegerTree (BuildSize (location, Mod2Gcc (sym), FALSE)) ;
+   IF IsConst (result)
    THEN
-      PushIntegerTree(BuildSize(location, Mod2Gcc(op3), FALSE))
-   ELSE
-      (* ignore the chosen varients as we implement it as a C union *)
-      t := BuildSize(location, Mod2Gcc(op3), FALSE)
-   END ;
-   IF IsConst(op1)
-   THEN
-      PopValue(op1) ;
-      PutConst(op1, Cardinal) ;
-      PushValue(op1) ;
-      ConstantKnownAndUsed(op1,
-                           DeclareKnownConstant(location,
-                                                GetIntegerType(),
-                                                PopIntegerTree()))
+      PopValue (result) ;
+      PutConst (result, Cardinal) ;
+      PushValue (result) ;
+      ConstantKnownAndUsed (result,
+                            DeclareKnownConstant (location,
+                                                  GetIntegerType (),
+                                                  PopIntegerTree ()))
    ELSE
-      BuildAssignmentStatement (location, Mod2Gcc(op1), PopIntegerTree())
+      BuildAssignmentStatement (location, Mod2Gcc (result), PopIntegerTree ())
    END
 END CodeSize ;
 
@@ -5423,97 +5390,6 @@ END DetermineFieldOf ;
 *)
 
 
-(*
-   FoldOffset - check whether we can fold an OffsetOp quadruple.
-                Very similar to FoldUnary, except that we need to hard code
-                a few parameters to the gcc backend.
-*)
-
-PROCEDURE FoldOffset (tokenno: CARDINAL; p: WalkAction;
-                      quad: CARDINAL; op1, op2, op3: CARDINAL) ;
-VAR
-   t       : Tree ;
-   location: location_t ;
-BEGIN
-   (* firstly ensure that any constant literal is declared *)
-   TryDeclareConstant(tokenno, op3) ;
-   location := TokenToLocation(tokenno) ;
-
-   IF IsRecordField(op3) OR IsFieldVarient(op3)
-   THEN
-      IF GccKnowsAbout(op2) AND GccKnowsAbout(op3) AND
-         CompletelyResolved(op2) AND CompletelyResolved(op3)
-      THEN
-         (* fine, we can take advantage of this and fold constants *)
-         IF IsConst(op1)
-         THEN
-            t := BuildOffset(location, Mod2Gcc(op2), Mod2Gcc(op3), FALSE) ;
-            IF NOT IsValueSolved(op1)
-            THEN
-               PushIntegerTree(t) ;
-               PopValue(op1)
-            END ;
-            PutConst(op1, Address) ;
-            AddModGcc(op1,
-                      DeclareKnownConstant(location, GetPointerType(), t)) ;
-            p(op1) ;
-            NoChange := FALSE ;
-            SubQuad(quad)
-         ELSE
-            (* we can still fold the expression, but not the assignment, however, we will
-               not do this here but in CodeOffset
-             *)
-         END
-      END
-   END
-END FoldOffset ;
-
-
-(*
-   CodeOffset - encode an OffsetOp quadruple. Very similar to CodeUnary, except that
-                we need to hard code a few parameters to the gcc backend.
-                op1 is set to contain the offset (in bytes) of field op3
-                from its parent record.
-*)
-
-PROCEDURE CodeOffset (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
-VAR
-   offset  : Tree ;
-   location: location_t ;
-BEGIN
-   location := TokenToLocation(CurrentQuadToken) ;
-
-   (* firstly ensure that any constant literal is declared *)
-   IF IsRecordField (op3) OR IsFieldVarient (op3)
-   THEN
-      IF GccKnowsAbout (op2) AND GccKnowsAbout (op3) AND
-         CompletelyResolved (op2) AND CompletelyResolved (op3)
-      THEN
-         offset := BuildOffset (location, Mod2Gcc (op2), Mod2Gcc (op3), FALSE) ;
-         IF IsConst (op1)
-         THEN
-            (* fine, we can take advantage of this and fold constants *)
-            IF NOT IsValueSolved (op1)
-            THEN
-               PushIntegerTree (offset) ;
-               PopValue (op1)
-            END ;
-            PutConst (op1, Address) ;
-            ConstantKnownAndUsed (op1,
-                                  DeclareKnownConstant (location, GetPointerType (), offset))
-         ELSE
-            (* ok, use assignment *)
-            BuildAssignmentStatement (location, Mod2Gcc (op1), offset)
-         END
-      ELSE
-         InternalError ('symbol type should have been declared by now')
-      END
-   ELSE
-      InternalError ('not expecting this type of symbol')
-   END
-END CodeOffset ;
-
-
 (*
    FoldRecordField - check whether we can fold an RecordFieldOp quadruple.
                      Very similar to FoldBinary, except that we need to
@@ -5521,7 +5397,7 @@ END CodeOffset ;
 *)
 
 PROCEDURE FoldRecordField (tokenno: CARDINAL; p: WalkAction;
-                           quad: CARDINAL; op1, record, field: CARDINAL) ;
+                           quad: CARDINAL; result, record, field: CARDINAL) ;
 VAR
    recordType,
    fieldType : CARDINAL ;
@@ -5535,24 +5411,24 @@ BEGIN
    TryDeclareConstant(tokenno, record) ;
    IF IsRecordField(record) OR IsFieldVarient(record)
    THEN
-      recordType := GetType(record) ;
-      fieldType := GetType(field) ;
-      IF GccKnowsAbout(record) AND GccKnowsAbout(field) AND
-         GccKnowsAbout(recordType) AND GccKnowsAbout(fieldType) AND
-         CompletelyResolved(recordType) AND CompletelyResolved(fieldType)
+      recordType := GetType (record) ;
+      fieldType := GetType (field) ;
+      IF GccKnowsAbout (record) AND GccKnowsAbout (field) AND
+         GccKnowsAbout (recordType) AND GccKnowsAbout (fieldType) AND
+         CompletelyResolved (recordType) AND CompletelyResolved (fieldType)
       THEN
          (* fine, we can take advantage of this and fold constants *)
-         IF IsConst(op1)
+         IF IsConst (result)
          THEN
-            ptr := BuildComponentRef(location, Mod2Gcc(record), Mod2Gcc(field)) ;
-            IF NOT IsValueSolved(op1)
+            ptr := BuildComponentRef (location, Mod2Gcc (record), Mod2Gcc (field)) ;
+            IF NOT IsValueSolved (result)
             THEN
                PushIntegerTree (ptr) ;
-               PopValue (op1)
+               PopValue (result)
             END ;
-            PutConst (op1, fieldType) ;
-            AddModGcc (op1, DeclareKnownConstant(location, Mod2Gcc(fieldType), ptr)) ;
-            p (op1) ;
+            PutConst (result, fieldType) ;
+            AddModGcc (result, DeclareKnownConstant (location, Mod2Gcc (fieldType), ptr)) ;
+            p (result) ;
             NoChange := FALSE ;
             SubQuad (quad)
          ELSE
@@ -5566,12 +5442,10 @@ END FoldRecordField ;
 
 
 (*
-   CodeRecordField - encode an OffsetOp quadruple. Very similar to CodeBinary,
-                     except that we need to hard code a few parameters to the
-                     gcc backend.
+   CodeRecordField - encode a reference to a field within a record.
 *)
 
-PROCEDURE CodeRecordField (quad: CARDINAL; op1, record, field: CARDINAL) ;
+PROCEDURE CodeRecordField (result, record, field: CARDINAL) ;
 VAR
    recordType,
    fieldType : CARDINAL ;
@@ -5596,7 +5470,7 @@ BEGIN
          ELSE
             ptr := BuildComponentRef (location, Mod2Gcc (record), Mod2Gcc (field))
          END ;
-         AddModGcc (op1, ptr)
+         AddModGcc (result, ptr)
       ELSE
          InternalError ('symbol type should have been declared by now')
       END
@@ -5649,8 +5523,8 @@ VAR
    location: location_t ;
 BEGIN
    location := TokenToLocation(tokenno) ;
-   Type := SkipType(GetType(SkipToArray(operand, dim))) ;
-   RETURN BuildHighFromStaticArray (location, dim, Type)
+   Type := SkipType (GetType (SkipToArray (operand, dim))) ;
+   RETURN BuildHighFromStaticArray (location, (* dim, *) Type)
 END BuildHighFromArray ;
 
 
@@ -5658,7 +5532,7 @@ END BuildHighFromArray ;
    BuildHighFromStaticArray -
 *)
 
-PROCEDURE BuildHighFromStaticArray (location: location_t; dim, Type: CARDINAL) : Tree ;
+PROCEDURE BuildHighFromStaticArray (location: location_t; (* dim, *) Type: CARDINAL) : Tree ;
 VAR
    High, Low: CARDINAL ;
    Subscript,
@@ -5788,27 +5662,27 @@ END FoldHigh ;
    CodeHigh - encode a unary arithmetic operation.
 *)
 
-PROCEDURE CodeHigh (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeHigh (result, dim, array: CARDINAL) ;
 VAR
    location: location_t ;
 BEGIN
-   location := TokenToLocation(CurrentQuadToken) ;
+   location := TokenToLocation (CurrentQuadToken) ;
 
    (* firstly ensure that any constant literal is declared *)
-   DeclareConstant (CurrentQuadToken, op3) ;
-   IF IsConst (op1)
+   DeclareConstant (CurrentQuadToken, array) ;
+   IF IsConst (result)
    THEN
       (* still have a constant which was not resolved, pass it to gcc *)
-      ConstantKnownAndUsed (op1,
+      ConstantKnownAndUsed (result,
                             DeclareKnownConstant(location,
                                                  GetM2ZType (),
-                                                 ResolveHigh (CurrentQuadToken, op2, op3)))
+                                                 ResolveHigh (CurrentQuadToken, dim, array)))
    ELSE
       BuildAssignmentStatement (location,
-                                Mod2Gcc (op1),
+                                Mod2Gcc (result),
                                 BuildConvert (location,
-                                              Mod2Gcc (GetType(op1)),
-                                              ResolveHigh (CurrentQuadToken, op2, op3),
+                                              Mod2Gcc (GetType (result)),
+                                              ResolveHigh (CurrentQuadToken, dim, array),
                                               FALSE))
    END
 END CodeHigh ;
@@ -5819,34 +5693,34 @@ END CodeHigh ;
                    places the address of op3 into *op1
 *)
 
-PROCEDURE CodeUnbounded (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeUnbounded (result, array: CARDINAL) ;
 VAR
    Addr    : Tree ;
    location: location_t ;
 BEGIN
-   location := TokenToLocation(CurrentQuadToken) ;
+   location := TokenToLocation (CurrentQuadToken) ;
 
-   DeclareConstant(CurrentQuadToken, op3) ;
-   IF IsConstString(op3)
+   DeclareConstant(CurrentQuadToken, array) ;
+   IF IsConstString(array)
    THEN
-      BuildAssignmentStatement (location, Mod2Gcc(op1), BuildAddr(location, PromoteToString(CurrentQuadToken, op3), FALSE))
-   ELSIF IsConstructor(op3)
+      BuildAssignmentStatement (location, Mod2Gcc (result), BuildAddr (location, PromoteToString (CurrentQuadToken, array), FALSE))
+   ELSIF IsConstructor(array)
    THEN
-      BuildAssignmentStatement (location, Mod2Gcc(op1), BuildAddr(location, Mod2Gcc(op3), TRUE))
-   ELSIF IsUnbounded(GetType(op3))
+      BuildAssignmentStatement (location, Mod2Gcc (result), BuildAddr (location, Mod2Gcc (array), TRUE))
+   ELSIF IsUnbounded (GetType (array))
    THEN
-      IF GetMode(op3)=LeftValue
+      IF GetMode(array) = LeftValue
       THEN
-         Addr := BuildConvert(location, Mod2Gcc(GetType(op1)), Mod2Gcc(op3), FALSE)
+         Addr := BuildConvert (location, Mod2Gcc (GetType (result)), Mod2Gcc (array), FALSE)
       ELSE
-         Addr := BuildComponentRef(location, Mod2Gcc(op3), Mod2Gcc(GetUnboundedAddressOffset(GetType(op3))))
+         Addr := BuildComponentRef (location, Mod2Gcc (array), Mod2Gcc (GetUnboundedAddressOffset (GetType (array))))
       END ;
-      BuildAssignmentStatement (location, Mod2Gcc(op1), Addr)
-   ELSIF GetMode(op3)=RightValue
+      BuildAssignmentStatement (location, Mod2Gcc (result), Addr)
+   ELSIF GetMode(array) = RightValue
    THEN
-      BuildAssignmentStatement (location, Mod2Gcc(op1), BuildAddr(location, Mod2Gcc(op3), FALSE))
+      BuildAssignmentStatement (location, Mod2Gcc (result), BuildAddr (location, Mod2Gcc (array), FALSE))
    ELSE
-      BuildAssignmentStatement (location, Mod2Gcc(op1), Mod2Gcc(op3))
+      BuildAssignmentStatement (location, Mod2Gcc (result), Mod2Gcc (array))
    END
 END CodeUnbounded ;
 
@@ -5883,33 +5757,30 @@ END AreSubrangesKnown ;
    CodeArray - res is an lvalue which will point to the array element.
 *)
 
-PROCEDURE CodeArray (quad: CARDINAL; res, index, array: CARDINAL) ;
+PROCEDURE CodeArray (res, index, array: CARDINAL) ;
 VAR
    resType,
    arrayDecl,
    type,
-   low, high,
+   low,
    subscript  : CARDINAL ;
-   elementSize,
    a, ta,
    ti, tl     : Tree ;
    location   : location_t ;
 BEGIN
-   location := TokenToLocation(CurrentQuadToken) ;
+   location := TokenToLocation (CurrentQuadToken) ;
 
-   arrayDecl := SkipType(GetType(array)) ;
-   IF AreSubrangesKnown(arrayDecl)
+   arrayDecl := SkipType (GetType (array)) ;
+   IF AreSubrangesKnown (arrayDecl)
    THEN
-      subscript := GetArraySubscript(arrayDecl) ;
-      type := SkipType(GetType(subscript)) ;
-      low  := GetTypeMin(type) ;
-      high := GetTypeMax(type) ;
+      subscript := GetArraySubscript (arrayDecl) ;
+      type := SkipType (GetType (subscript)) ;
+      low  := GetTypeMin (type) ;
       resType := GetVarBackEndType(res) ;
       IF resType=NulSym
       THEN
          resType := SkipType(GetType(res))
       END ;
-      elementSize := BuildSize(location, Mod2Gcc(GetType(arrayDecl)), FALSE) ;
       ta := Mod2Gcc(SkipType(GetType(arrayDecl))) ;
       IF GetMode(array)=LeftValue
       THEN
@@ -5949,30 +5820,30 @@ END CodeArray ;
 
 PROCEDURE FoldElementSizeForArray (tokenno: CARDINAL; quad: CARDINAL;
                                    p: WalkAction;
-                                   op1, type, op3: CARDINAL) ;
+                                   result, type: CARDINAL) ;
 VAR
    Subscript: CARDINAL ;
    location : location_t ;
 BEGIN
-   location := TokenToLocation(tokenno) ;
+   location := TokenToLocation (tokenno) ;
 
-   IF IsConst(op1) AND (NOT GccKnowsAbout(op1))
+   IF IsConst (result) AND (NOT GccKnowsAbout (result))
    THEN
-      Subscript := GetArraySubscript(type) ;
-      IF IsSizeSolved(Subscript)
+      Subscript := GetArraySubscript (type) ;
+      IF IsSizeSolved (Subscript)
       THEN
-         PutConst(op1, Integer) ;
-         PushSize(Subscript) ;
-         AddModGcc(op1,
-                   DeclareKnownConstant(location,
-                                        GetCardinalType(),
-                                        BuildConvert(location,
-                                                     GetCardinalType(),
-                                                     PopIntegerTree(),
-                                                     TRUE))) ;
-         p(op1) ;
+         PutConst (result, Integer) ;
+         PushSize (Subscript) ;
+         AddModGcc (result,
+                    DeclareKnownConstant (location,
+                                          GetCardinalType (),
+                                          BuildConvert (location,
+                                                        GetCardinalType (),
+                                                        PopIntegerTree (),
+                                                        TRUE))) ;
+         p (result) ;
          NoChange := FALSE ;
-         SubQuad(quad)
+         SubQuad (quad)
       END
    END
 END FoldElementSizeForArray ;
@@ -5987,34 +5858,34 @@ END FoldElementSizeForArray ;
 
 PROCEDURE FoldElementSizeForUnbounded (tokenno: CARDINAL; quad: CARDINAL;
                                        p: WalkAction;
-                                       op1, ArrayType, op3: CARDINAL) ;
+                                       result, ArrayType: CARDINAL) ;
 VAR
    Type    : CARDINAL ;
    location: location_t ;
 BEGIN
-   location := TokenToLocation(tokenno) ;
+   location := TokenToLocation (tokenno) ;
 
-   IF IsConst(op1)
+   IF IsConst (result)
    THEN
-      IF GccKnowsAbout(op1)
+      IF GccKnowsAbout (result)
       THEN
          InternalError ('cannot assign a value twice to a constant')
       ELSE
-         Assert(IsUnbounded(ArrayType)) ;
-         Type := GetType(ArrayType) ;
-         IF GccKnowsAbout(Type)
+         Assert (IsUnbounded (ArrayType)) ;
+         Type := GetType (ArrayType) ;
+         IF GccKnowsAbout (Type)
          THEN
-            PutConst(op1, Cardinal) ;
-            AddModGcc(op1,
-                      DeclareKnownConstant(location,
-                                           GetCardinalType(),
-                                           BuildConvert(location,
-                                                        GetCardinalType(),
-                                                        FindSize(tokenno, Type),
-                                                        TRUE))) ;
-            p(op1) ;
+            PutConst (result, Cardinal) ;
+            AddModGcc (result,
+                       DeclareKnownConstant (location,
+                                             GetCardinalType (),
+                                             BuildConvert (location,
+                                                           GetCardinalType (),
+                                                           FindSize (tokenno, Type),
+                                                           TRUE))) ;
+            p (result) ;
             NoChange := FALSE ;
-            SubQuad(quad)
+            SubQuad (quad)
          END
       END
    END
@@ -6028,30 +5899,20 @@ END FoldElementSizeForUnbounded ;
 *)
 
 PROCEDURE FoldElementSize (tokenno: CARDINAL; p: WalkAction;
-                           quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+                           quad: CARDINAL; result, type: CARDINAL) ;
 BEGIN
-   IF IsUnbounded(op2)
+   IF IsUnbounded (type)
    THEN
-      FoldElementSizeForUnbounded(tokenno, quad, p, op1, op2, op3)
-   ELSIF IsArray(op2)
+      FoldElementSizeForUnbounded (tokenno, quad, p, result, type)
+   ELSIF IsArray (type)
    THEN
-      FoldElementSizeForArray(tokenno, quad, p, op1, op2, op3)
+      FoldElementSizeForArray (tokenno, quad, p, result, type)
    ELSE
       InternalError ('expecting UnboundedSym or ArraySym')
    END
 END FoldElementSize ;
 
 
-(*
-
-*)
-
-PROCEDURE CodeElementSize (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
-BEGIN
-   InternalError ('ElementSizeOp is expected to have been folded via constant evaluation')
-END CodeElementSize ;
-
-
 (*
    PopKindTree - returns a Tree from M2ALU of the type implied by, op.
 *)
@@ -6060,15 +5921,15 @@ PROCEDURE PopKindTree (op: CARDINAL; tokenno: CARDINAL) : Tree ;
 VAR
    type: CARDINAL ;
 BEGIN
-   type := SkipType(GetType(op)) ;
-   IF IsSet(type)
+   type := SkipType (GetType (op)) ;
+   IF IsSet (type)
    THEN
-      RETURN( PopSetTree(tokenno) )
-   ELSIF IsRealType(type)
+      RETURN( PopSetTree (tokenno) )
+   ELSIF IsRealType (type)
    THEN
-      RETURN( PopRealTree() )
+      RETURN( PopRealTree () )
    ELSE
-      RETURN( PopIntegerTree() )
+      RETURN( PopIntegerTree () )
    END
 END PopKindTree ;
 
@@ -6895,7 +6756,7 @@ END CodeIfSetEqu ;
                      since this will have been evaluated in CodeIfNotEqu.
 *)
 
-PROCEDURE CodeIfSetNotEqu (quad: CARDINAL; op1, op2, op3: CARDINAL) ;
+PROCEDURE CodeIfSetNotEqu (left, right, destQuad: CARDINAL) ;
 VAR
    settype  : CARDINAL ;
    truelabel: ADDRESS ;
@@ -6903,39 +6764,39 @@ VAR
 BEGIN
    location := TokenToLocation(CurrentQuadToken) ;
 
-   IF IsConst(op1) AND IsConst(op2)
+   IF IsConst (left) AND IsConst (right)
    THEN
       InternalError ('this should have been folded in the calling procedure')
-   ELSIF IsConst(op1)
+   ELSIF IsConst (left)
    THEN
-      settype := SkipType(GetType(op2))
+      settype := SkipType (GetType (right))
    ELSE
-      settype := SkipType(GetType(op1))
+      settype := SkipType (GetType (left))
    END ;
-   IF CompareTrees(FindSize(CurrentQuadToken, settype), FindSize(CurrentQuadToken, Word)) <= 0
+   IF CompareTrees (FindSize (CurrentQuadToken, settype), FindSize (CurrentQuadToken, Word)) <= 0
    THEN
       (* word size sets *)
-      DoJump(location,
-             BuildNotEqualTo(location,
-                             BuildConvert(location, GetWordType(), Mod2Gcc(op1), FALSE),
-                             BuildConvert(location, GetWordType(), Mod2Gcc(op2), FALSE)),
-             NIL, string(CreateLabelName(op3)))
-   ELSIF GetSType(op1)=GetSType(op2)
-   THEN
-      truelabel := string(CreateLabelName(op3)) ;
-
-      BuildForeachWordInSetDoIfExpr(location,
-                                    Mod2Gcc(settype),
-                                    Mod2Gcc(op1), Mod2Gcc(op2),
-                                    GetMode(op1)=LeftValue,
-                                    GetMode(op2)=LeftValue,
-                                    IsConst(op1), IsConst(op2),
-                                    BuildNotEqualTo,
-                                    truelabel)
+      DoJump (location,
+              BuildNotEqualTo(location,
+                              BuildConvert (location, GetWordType (), Mod2Gcc (left), FALSE),
+                              BuildConvert (location, GetWordType (), Mod2Gcc (right), FALSE)),
+              NIL, string (CreateLabelName (destQuad)))
+   ELSIF GetSType (left) = GetSType (right)
+   THEN
+      truelabel := string (CreateLabelName (destQuad)) ;
+
+      BuildForeachWordInSetDoIfExpr (location,
+                                     Mod2Gcc (settype),
+                                     Mod2Gcc (left), Mod2Gcc (right),
+                                     GetMode (left) = LeftValue,
+                                     GetMode (right) = LeftValue,
+                                     IsConst (left), IsConst (right),
+                                     BuildNotEqualTo,
+                                     truelabel)
    ELSE
       MetaErrorT2 (CurrentQuadToken,
                    'set comparison is only allowed between the same set type, the set types used by {%1Eatd} and {%2atd} are different',
-                   op1, op2)
+                   left, right)
    END
 END CodeIfSetNotEqu ;
 
@@ -7018,7 +6879,7 @@ BEGIN
    ELSIF IsConstSet(op1) OR (IsVar(op1) AND IsSet(SkipType(GetType(op1)))) OR
          IsConstSet(op2) OR (IsVar(op2) AND IsSet(SkipType(GetType(op2))))
    THEN
-      CodeIfSetNotEqu(quad, op1, op2, op3)
+      CodeIfSetNotEqu (op1, op2, op3)
    ELSE
       IF IsComposite(op1) OR IsComposite(op2)
       THEN
diff --git a/gcc/m2/gm2-compiler/M2Quads.def b/gcc/m2/gm2-compiler/M2Quads.def
index 711f450f181..4d241b08888 100644
--- a/gcc/m2/gm2-compiler/M2Quads.def
+++ b/gcc/m2/gm2-compiler/M2Quads.def
@@ -147,7 +147,7 @@ EXPORT QUALIFIED StartBuildDefFile, StartBuildModFile, EndBuildFile,
 TYPE
    QuadOperator = (BecomesOp, IndrXOp, XIndrOp, ArrayOp, ElementSizeOp,
                    RecordFieldOp,
-                   AddrOp, SizeOp, OffsetOp,
+                   AddrOp, SizeOp,
                    IfEquOp, IfLessEquOp, IfGreEquOp, IfGreOp, IfLessOp,
                    IfNotEquOp, IfInOp, IfNotInOp,
                    CallOp, ParamOp, OptParamOp, ReturnOp, ReturnValueOp, FunctValueOp,
diff --git a/gcc/m2/gm2-compiler/M2Quads.mod b/gcc/m2/gm2-compiler/M2Quads.mod
index ba6f4248070..9560ca1b33e 100644
--- a/gcc/m2/gm2-compiler/M2Quads.mod
+++ b/gcc/m2/gm2-compiler/M2Quads.mod
@@ -822,7 +822,6 @@ BEGIN
    SizeOp,
    AddrOp,
    RecordFieldOp,
-   OffsetOp,
    ArrayOp,
    LogicalShiftOp,
    LogicalRotateOp,
@@ -1207,7 +1206,6 @@ BEGIN
                           CheckAddVariableWrite(Oper3, TRUE, QuadNo)
                        END |
    RecordFieldOp,
-   OffsetOp,
    ArrayOp,
    LogicalShiftOp,
    LogicalRotateOp,
@@ -1355,7 +1353,6 @@ BEGIN
                           CheckRemoveVariableWrite(Oper3, TRUE, QuadNo)
                        END |
    RecordFieldOp,
-   OffsetOp,
    ArrayOp,
    LogicalShiftOp,
    LogicalRotateOp,
@@ -12730,7 +12727,6 @@ BEGIN
                           WriteOperand(Operand3) |
       SizeOp,
       RecordFieldOp,
-      OffsetOp,
       IndrXOp,
       XIndrOp,
       ArrayOp,
@@ -12815,7 +12811,6 @@ BEGIN
    RecordFieldOp            : printf0('RecordField       ') |
    AddrOp                   : printf0('Addr              ') |
    SizeOp                   : printf0('Size              ') |
-   OffsetOp                 : printf0('Offset            ') |
    IfInOp                   : printf0('If IN             ') |
    IfNotInOp                : printf0('If NOT IN         ') |
    IfNotEquOp               : printf0('If <>             ') |
diff --git a/gcc/m2/gm2-gcc/m2statement.c b/gcc/m2/gm2-gcc/m2statement.c
index f2a2765637d..1aeda6fa87b 100644
--- a/gcc/m2/gm2-gcc/m2statement.c
+++ b/gcc/m2/gm2-gcc/m2statement.c
@@ -476,6 +476,19 @@ m2statement_BuildCall3 (location_t location, tree function, tree rettype,
   return m2statement_BuildProcedureCallTree (location, function, rettype);
 }
 
+/* BuildFunctionCallTree - creates a procedure function call from
+   a procedure and parameter list and the return type, rettype.
+   No tree is returned as the tree is held in the last_function global
+   variable.  It is expected the BuildFunctValue is to be called after
+   a call to BuildFunctionCallTree.  */
+
+void
+m2statement_BuildFunctionCallTree (location_t location, tree procedure,
+                                   tree rettype)
+{
+  m2statement_BuildProcedureCallTree (location, procedure, rettype);
+}
+
 /* SetLastFunction - assigns last_function to, t.  */
 
 void
diff --git a/gcc/m2/gm2-gcc/m2statement.def b/gcc/m2/gm2-gcc/m2statement.def
index bb098a8bdc9..da3f4714974 100644
--- a/gcc/m2/gm2-gcc/m2statement.def
+++ b/gcc/m2/gm2-gcc/m2statement.def
@@ -126,6 +126,19 @@ PROCEDURE BuildIfThenElseEnd (condition: Tree; then_block: Tree; else_block: Tre
 PROCEDURE BuildParam (location: location_t; param: Tree) ;
 
 
+(*
+   BuildFunctionCallTree - creates a procedure function call from
+                           a procedure and parameter list and the
+                           return type, rettype.  No tree is returned
+                           as the tree is held in the last_function
+                           global variable.  It is expected the
+                           BuildFunctValue is to be called after
+                           a call to BuildFunctionCallTree.
+*)
+
+PROCEDURE BuildFunctionCallTree (location: location_t; procedure: Tree; rettype: Tree) ;
+
+
 (*
    BuildProcedureCallTree - creates a procedure call from a procedure and
                             parameter list and the return type, rettype.
diff --git a/gcc/m2/gm2-gcc/m2statement.h b/gcc/m2/gm2-gcc/m2statement.h
index fca79d82735..6e9a2fd2992 100644
--- a/gcc/m2/gm2-gcc/m2statement.h
+++ b/gcc/m2/gm2-gcc/m2statement.h
@@ -67,6 +67,8 @@ EXTERN tree m2statement_BuildIndirectProcedureCallTree (location_t location,
                                                         tree rettype);
 EXTERN tree m2statement_BuildProcedureCallTree (location_t location,
                                                 tree procedure, tree rettype);
+EXTERN void m2statement_BuildFunctionCallTree (location_t location,
+					       tree procedure, tree rettype);
 EXTERN void m2statement_BuildParam (location_t location, tree param);
 
 EXTERN tree m2statement_BuildIfThenElseEnd (tree condition, tree then_block,